diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 667f1df9c6..a4f667ac46 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -7,3 +7,7 @@
 # refactor(editor): Apply Prettier (no-changelog) #4920
 
 5ca2148c7ed06c90f999508928b7a51f9ac7a788
+
+# refactor: Run lintfix (no-changelog) (#7537)
+
+62c096710fab2f7e886518abdbded34b55e93f62
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index bd399104db..dfcc0615a7 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 0000000000..f6f762048f
--- /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: gulp, 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 c1c110272c..8e7acc21eb 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/package.json b/.github/scripts/package.json
index 6033dd191c..5798df6321 100644
--- a/.github/scripts/package.json
+++ b/.github/scripts/package.json
@@ -1,9 +1,12 @@
 {
   "dependencies": {
+    "cacheable-lookup": "6.1.0",
     "conventional-changelog": "^4.0.0",
-    "glob": "^10.3.0",
-    "semver": "^7.5.4",
-    "tempfile": "^5.0.0",
+    "debug": "4.3.4",
+    "glob": "10.3.10",
+    "p-limit": "3.1.0",
+    "semver": "7.5.4",
+    "tempfile": "5.0.0",
     "typescript": "*"
   }
 }
diff --git a/scripts/validate-docs-links.js b/.github/scripts/validate-docs-links.js
similarity index 60%
rename from scripts/validate-docs-links.js
rename to .github/scripts/validate-docs-links.js
index aab9a23380..2335b62eed 100644
--- a/scripts/validate-docs-links.js
+++ b/.github/scripts/validate-docs-links.js
@@ -1,11 +1,19 @@
 #!/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('fast-glob');
+const glob = require('glob');
 const pLimit = require('p-limit');
+const Lookup = require('cacheable-lookup').default;
 
-const nodesBaseDir = path.resolve(__dirname, '../packages/nodes-base');
+const agent = new https.Agent({ keepAlive: true, keepAliveMsecs: 5000 });
+new Lookup().install(agent);
+const limiter = pLimit(concurrency);
 
 const validateUrl = async (kind, name, documentationUrl) =>
 	new Promise((resolve, reject) => {
@@ -22,21 +30,26 @@ const validateUrl = async (kind, name, documentationUrl) =>
 					port: 443,
 					path: url.pathname,
 					method: 'HEAD',
+					agent,
+				},
+				(res) => {
+					debug('✓', kind, name);
+					resolve([name, res.statusCode]);
 				},
-				(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`));
+const checkLinks = async (baseDir, kind) => {
+	let types = require(path.join(baseDir, `dist/types/${kind}.json`));
 	if (kind === 'nodes')
 		types = types.filter(({ codex }) => !!codex?.resources?.primaryDocumentation);
-	const limit = pLimit(30);
+	debug(kind, types.length);
+
 	const statuses = await Promise.all(
 		types.map((type) =>
-			limit(() => {
+			limiter(() => {
 				const documentationUrl =
 					kind === 'credentials'
 						? type.documentationUrl
@@ -55,10 +68,13 @@ const checkLinks = async (kind) => {
 
 	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);
+	if (missingDocs.length || invalidUrls.length) exitCode = 1;
 };
 
 (async () => {
-	await checkLinks('credentials');
-	await checkLinks('nodes');
+	for (const packageName of packages) {
+		const baseDir = path.resolve(__dirname, '../../packages', packageName);
+		await Promise.all([checkLinks(baseDir, 'credentials'), checkLinks(baseDir, 'nodes')]);
+		if (exitCode !== 0) process.exit(exitCode);
+	}
 })();
diff --git a/.github/workflows/check-documentation-urls.yml b/.github/workflows/check-documentation-urls.yml
index 4d5da5131e..99bd412105 100644
--- a/.github/workflows/check-documentation-urls.yml
+++ b/.github/workflows/check-documentation-urls.yml
@@ -27,16 +27,18 @@ jobs:
         run: pnpm install --frozen-lockfile
 
       - name: Build nodes-base
-        run: pnpm --filter @n8n/client-oauth2 --filter n8n-workflow --filter n8n-core --filter n8n-nodes-base build
+        run: pnpm --filter @n8n/client-oauth2 --filter n8n-workflow --filter n8n-core --filter n8n-nodes-base --filter @n8n/n8n-nodes-langchain build
 
-      - name: Test URLS
-        run: node scripts/validate-docs-links.js
+      - run: npm install --prefix=.github/scripts --no-package-lock
+
+      - name: Test URLs
+        run: node .github/scripts/validate-docs-links.js
 
       - name: Notify Slack on failure
         uses: act10ns/slack@v2.0.0
         if: failure()
         with:
           status: ${{ job.status }}
-          channel: '#updates-build-alerts'
+          channel: '#mission-docs'
           webhook-url: ${{ secrets.SLACK_WEBHOOK_URL }}
           message: Documentation URLs check failed (${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }})
diff --git a/.github/workflows/check-pr-title.yml b/.github/workflows/check-pr-title.yml
index 516e4b2275..c857fcfdc1 100644
--- a/.github/workflows/check-pr-title.yml
+++ b/.github/workflows/check-pr-title.yml
@@ -30,6 +30,6 @@ jobs:
 
       - name: Validate PR title
         id: validate_pr_title
-        uses: n8n-io/validate-n8n-pull-request-title@v1.1
+        uses: n8n-io/validate-n8n-pull-request-title@v1.3
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/checklist.yml b/.github/workflows/checklist.yml
deleted file mode 100644
index 6262918456..0000000000
--- a/.github/workflows/checklist.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-name: PR Checklist
-
-on:
-  pull_request_target:
-    types:
-      - opened
-      - synchronize
-    branches:
-      - master
-
-jobs:
-  checklist_job:
-    runs-on: ubuntu-latest
-    name: Checklist job
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3.5.3
-      - name: Checklist
-        uses: wyozi/contextual-qa-checklist-action@master
-        with:
-          gh-token: ${{ secrets.GITHUB_TOKEN }}
-          comment-footer: Make sure to check off this list before asking for review.
diff --git a/.github/workflows/ci-master.yml b/.github/workflows/ci-master.yml
index 1c76725066..749ac2f3ea 100644
--- a/.github/workflows/ci-master.yml
+++ b/.github/workflows/ci-master.yml
@@ -13,7 +13,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [18.x, 20.5]
+        node-version: [18.x, 20.x]
 
     steps:
       - uses: actions/checkout@v3.5.3
@@ -44,11 +44,12 @@ jobs:
     needs: install-and-build
     strategy:
       matrix:
-        node-version: [18.x, 20.5]
+        node-version: [18.x, 20.x]
     with:
       ref: ${{ inputs.branch }}
       nodeVersion: ${{ matrix.node-version }}
-      cacheKey:  ${{ github.sha }}-base:${{ matrix.node-version }}-test-lint
+      cacheKey: ${{ github.sha }}-base:${{ matrix.node-version }}-test-lint
+      collectCoverage: true
 
   lint:
     name: Lint changes
@@ -56,7 +57,7 @@ jobs:
     needs: install-and-build
     strategy:
       matrix:
-        node-version: [18.x, 20.5]
+        node-version: [18.x, 20.x]
     steps:
       - uses: actions/checkout@v3.5.3
         with:
@@ -95,6 +96,6 @@ jobs:
         if: failure()
         with:
           status: ${{ job.status }}
-          channel: '#updates-build-alerts'
+          channel: '#alerts-build'
           webhook-url: ${{ secrets.SLACK_WEBHOOK_URL }}
           message: Master branch (build or test or lint) failed (${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }})
diff --git a/.github/workflows/ci-postgres-mysql.yml b/.github/workflows/ci-postgres-mysql.yml
index 2e8465351e..f42afc4937 100644
--- a/.github/workflows/ci-postgres-mysql.yml
+++ b/.github/workflows/ci-postgres-mysql.yml
@@ -6,7 +6,11 @@ on:
   workflow_dispatch:
   pull_request:
     paths:
-      - packages/cli/src/databases/migrations/**
+      - packages/cli/src/databases/**
+
+concurrency:
+  group: db-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
 
 jobs:
   build:
@@ -22,7 +26,7 @@ jobs:
       - run: pnpm install --frozen-lockfile
 
       - name: Build Backend
-        run: pnpm  --filter @n8n/client-oauth2 --filter n8n-workflow --filter n8n-core --filter n8n build
+        run: pnpm build:backend
 
       - name: Cache build artifacts
         uses: actions/cache/save@v3.3.1
@@ -61,7 +65,7 @@ jobs:
 
       - name: Test MySQL
         working-directory: packages/cli
-        run: DB_TABLE_PREFIX=test_ pnpm test:mysql --runInBand
+        run: pnpm test:mysql
 
   postgres:
     name: Postgres
@@ -94,7 +98,7 @@ jobs:
 
       - name: Test Postgres
         working-directory: packages/cli
-        run: DB_POSTGRESDB_SCHEMA=alt_schema DB_TABLE_PREFIX=test_ pnpm test:postgres --runInBand
+        run: pnpm test:postgres
 
   notify-on-failure:
     name: Notify Slack on failure
@@ -106,6 +110,6 @@ jobs:
         if: failure() && github.ref == 'refs/heads/master'
         with:
           status: ${{ job.status }}
-          channel: '#updates-build-alerts'
+          channel: '#alerts-build'
           webhook-url: ${{ secrets.SLACK_WEBHOOK_URL }}
           message: Postgres or MySQL tests failed (${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }})
diff --git a/.github/workflows/docker-images-nightly.yml b/.github/workflows/docker-images-nightly.yml
index 2be6e40617..ce7a651783 100644
--- a/.github/workflows/docker-images-nightly.yml
+++ b/.github/workflows/docker-images-nightly.yml
@@ -35,6 +35,11 @@ on:
         description: 'URL to call after Docker Image got built successfully.'
         required: false
         default: ''
+      include-arm64:
+        description: 'Include ARM64 support'
+        type: boolean
+        required: true
+        default: false
 
 jobs:
   build:
@@ -76,7 +81,7 @@ jobs:
           build-args: |
             N8N_RELEASE_TYPE=nightly
           file: ./docker/images/n8n-custom/Dockerfile
-          platforms: linux/amd64
+          platforms: ${{ github.event.inputs.include-arm64 == 'true' && 'linux/amd64,linux/arm64' || 'linux/amd64' }}
           provenance: false
           push: true
           tags: ${{ secrets.DOCKER_USERNAME }}/n8n:${{ github.event.inputs.tag || 'nightly' }}
diff --git a/.github/workflows/e2e-reusable.yml b/.github/workflows/e2e-reusable.yml
index c7de60e416..597653a5a6 100644
--- a/.github/workflows/e2e-reusable.yml
+++ b/.github/workflows/e2e-reusable.yml
@@ -40,7 +40,7 @@ on:
       containers:
         description: 'Number of containers to run tests in.'
         required: false
-        default: '[1, 2, 3, 4, 5, 6, 7, 8]'
+        default: '[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17]'
         type: string
       pr_number:
         description: 'PR number to run tests for.'
@@ -99,6 +99,8 @@ jobs:
           runTests: false
           install: false
           build: pnpm build
+        env:
+          VUE_APP_MAX_PINNED_DATA_SIZE: 16384
 
       - name: Cypress install
         run: pnpm cypress:install
diff --git a/.github/workflows/e2e-tests-pr.yml b/.github/workflows/e2e-tests-pr.yml
index 3a3328cdb7..cdb3ac0fb7 100644
--- a/.github/workflows/e2e-tests-pr.yml
+++ b/.github/workflows/e2e-tests-pr.yml
@@ -6,6 +6,10 @@ on:
     branch:
       - 'master'
 
+concurrency:
+  group: e2e-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   run-e2e-tests:
     name: E2E [Electron/Node 18]
diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml
index 1d699ca27e..e7400adecb 100644
--- a/.github/workflows/e2e-tests.yml
+++ b/.github/workflows/e2e-tests.yml
@@ -60,7 +60,7 @@ jobs:
         if: failure()
         with:
           status: ${{ job.status }}
-          channel: '#updates-build-alerts'
+          channel: '#alerts-build'
           webhook-url: ${{ secrets.SLACK_WEBHOOK_URL }}
           message: E2E failure for branch `${{ inputs.branch || 'master' }}` deployed by ${{ inputs.user || 'schedule' }} (${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }})
 
diff --git a/.github/workflows/release-publish.yml b/.github/workflows/release-publish.yml
index ae71319d9d..75a6b12400 100644
--- a/.github/workflows/release-publish.yml
+++ b/.github/workflows/release-publish.yml
@@ -36,6 +36,9 @@ jobs:
       - name: Build
         run: pnpm build
 
+      - name: Dry-run publishing
+        run: pnpm publish -r --no-git-checks --dry-run
+
       - name: Publish to NPM
         run: |
           echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > ~/.npmrc
diff --git a/.github/workflows/release-push-to-channel.yml b/.github/workflows/release-push-to-channel.yml
index 5e4100c29a..6b7fdeb17a 100644
--- a/.github/workflows/release-push-to-channel.yml
+++ b/.github/workflows/release-push-to-channel.yml
@@ -39,4 +39,17 @@ jobs:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
-      - run: docker buildx imagetools create -t n8nio/n8n:${{ github.event.inputs.release-channel }} n8nio/n8n:${{ github.event.inputs.version }}
+      - run: docker buildx imagetools create -t ${{ secrets.DOCKER_USERNAME }}/n8n:${{ github.event.inputs.release-channel }} ${{ secrets.DOCKER_USERNAME }}/n8n:${{ github.event.inputs.version }}
+
+  release-to-github-container-registry:
+    name: Release to GitHub Container Registry
+    runs-on: ubuntu-latest
+    timeout-minutes: 5
+    steps:
+      - uses: docker/login-action@v2.2.0
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - run: docker buildx imagetools create -t ghcr.io/${{ github.repository_owner }}/n8n:${{ github.event.inputs.release-channel }} ghcr.io/${{ github.repository_owner }}/n8n:${{ github.event.inputs.version }}
diff --git a/.github/workflows/test-workflows.yml b/.github/workflows/test-workflows.yml
index 9da8c93125..55a232b9c2 100644
--- a/.github/workflows/test-workflows.yml
+++ b/.github/workflows/test-workflows.yml
@@ -45,7 +45,7 @@ jobs:
         working-directory: n8n
         run: |
           pnpm install --frozen-lockfile
-          pnpm  --filter @n8n/client-oauth2 --filter n8n-workflow --filter n8n-core --filter n8n-nodes-base --filter n8n build
+          pnpm build:backend
         shell: bash
 
       - name: Import credentials
@@ -96,7 +96,7 @@ jobs:
         if: failure()
         with:
           status: ${{ job.status }}
-          channel: '#updates-build-alerts'
+          channel: '#alerts-build'
           webhook-url: ${{ secrets.SLACK_WEBHOOK_URL }}
           message: |
             🛑 Workflow test failed 🛑:
diff --git a/.github/workflows/units-tests-reusable.yml b/.github/workflows/units-tests-reusable.yml
index 508ec7d019..af33eec316 100644
--- a/.github/workflows/units-tests-reusable.yml
+++ b/.github/workflows/units-tests-reusable.yml
@@ -18,11 +18,17 @@ on:
         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@v3.5.3
         with:
@@ -51,10 +57,17 @@ jobs:
           path: ./packages/**/dist
           key: ${{ inputs.cacheKey }}
 
-      - name: Test
-        run: pnpm test
+      - 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/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
+          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/CHANGELOG.md b/CHANGELOG.md
index ddaf945357..bc07f55eb2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,444 @@
+# [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)
 
 
diff --git a/CHECKLIST.yml b/CHECKLIST.yml
deleted file mode 100644
index a1c3fa8407..0000000000
--- 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 330fb3096a..f24240b850 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
 
@@ -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,6 +201,16 @@ 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
+
+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:
@@ -220,6 +235,14 @@ 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.
diff --git a/README.md b/README.md
index 85a7058a77..145ecab8c6 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 # 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.
@@ -94,7 +94,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 cdcae02e65..f01672c6f9 100644
--- a/cypress.config.js
+++ b/cypress.config.js
@@ -19,4 +19,9 @@ module.exports = defineConfig({
 		experimentalInteractiveRunEvents: true,
 		experimentalSessionAndOrigin: true,
 	},
+	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/featureFlags.ts b/cypress/composables/featureFlags.ts
new file mode 100644
index 0000000000..ea8e95064e
--- /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 0000000000..268419f3c8
--- /dev/null
+++ b/cypress/composables/modals/chat-modal.ts
@@ -0,0 +1,48 @@
+/**
+ * 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 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 0000000000..bfcbf89251
--- /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 0000000000..88bbd13348
--- /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 0000000000..02edb29d55
--- /dev/null
+++ b/cypress/composables/ndv.ts
@@ -0,0 +1,73 @@
+/**
+ * Getters
+ */
+
+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);
+}
diff --git a/cypress/composables/setup-template-form-step.ts b/cypress/composables/setup-template-form-step.ts
new file mode 100644
index 0000000000..6f01662783
--- /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 0000000000..6b1b9b69d4
--- /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 0000000000..f96ea8152f
--- /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 0000000000..b1810943a3
--- /dev/null
+++ b/cypress/composables/workflow.ts
@@ -0,0 +1,142 @@
+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 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,
+) {
+	getAddInputEndpointByType(parentNodeName, endpointType).click({ force: true });
+	getNodeCreatorItems().contains(nodeName).click();
+	getConnectionBySourceAndTarget(parentNodeName, nodeName).should('exist');
+}
+
+export function addLanguageModelNodeToParent(nodeName: string, parentNodeName: string) {
+	addSupplementalNodeToParent(nodeName, 'ai_languageModel', parentNodeName);
+}
+
+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 352dbb36c3..d37dd37574 100644
--- a/cypress/constants.ts
+++ b/cypress/constants.ts
@@ -12,6 +12,13 @@ export const INSTANCE_OWNER = {
 	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',
@@ -28,12 +35,13 @@ export const INSTANCE_MEMBERS = [
 ];
 
 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 EDIT_FIELDS_SET_NODE_NAME = 'Edit Fields';
-export const IF_NODE_NAME = 'IF';
+export const IF_NODE_NAME = 'If';
 export const MERGE_NODE_NAME = 'Merge';
 export const SWITCH_NODE_NAME = 'Switch';
 export const GMAIL_NODE_NAME = 'Gmail';
@@ -41,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}';
 
@@ -48,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/10-undo-redo.cy.ts b/cypress/e2e/10-undo-redo.cy.ts
index d986fe6577..4182c75507 100644
--- a/cypress/e2e/10-undo-redo.cy.ts
+++ b/cypress/e2e/10-undo-redo.cy.ts
@@ -1,12 +1,14 @@
 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', () => {
@@ -44,7 +46,7 @@ describe('Undo/Redo', () => {
 		WorkflowPage.getters
 			.canvasNodeByName('Code')
 			.should('have.css', 'left', '860px')
-			.should('have.css', 'top', '220px')
+			.should('have.css', 'top', '220px');
 
 		WorkflowPage.actions.hitUndo();
 		WorkflowPage.getters.canvasNodes().should('have.have.length', 2);
@@ -62,16 +64,13 @@ describe('Undo/Redo', () => {
 		WorkflowPage.getters
 			.canvasNodeByName('Code')
 			.should('have.css', 'left', '860px')
-			.should('have.css', 'top', '220px')
+			.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();
@@ -137,21 +136,21 @@ describe('Undo/Redo', () => {
 		WorkflowPage.getters
 			.canvasNodeByName('Code')
 			.should('have.css', 'left', '740px')
-			.should('have.css', 'top', '320px')
+			.should('have.css', 'top', '320px');
 
 		WorkflowPage.actions.hitUndo();
 		WorkflowPage.getters
 			.canvasNodeByName('Code')
 			.should('have.css', 'left', '640px')
-			.should('have.css', 'top', '220px')
+			.should('have.css', 'top', '220px');
 		WorkflowPage.actions.hitRedo();
 		WorkflowPage.getters
 			.canvasNodeByName('Code')
 			.should('have.css', 'left', '740px')
-			.should('have.css', 'top', '320px')
+			.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();
@@ -177,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);
@@ -252,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();
@@ -276,9 +267,6 @@ describe('Undo/Redo', () => {
 	});
 
 	it('should undo/redo multiple steps', () => {
-		const initialPosition = {left: '420px', top: '220px'};
-		const movedPosition = {left: '540px', top: '360px'};
-
 		WorkflowPage.actions.addNodeToCanvas(SCHEDULE_TRIGGER_NODE_NAME);
 		WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME);
 		// WorkflowPage.actions.addNodeToCanvas(SET_NODE_NAME);
@@ -289,48 +277,115 @@ describe('Undo/Redo', () => {
 		// Disable last node
 		WorkflowPage.getters.canvasNodes().last().click();
 		WorkflowPage.actions.hitDisableNodeShortcut();
+
 		// Move first one
-		WorkflowPage.getters.canvasNodes()
-			.first()
-			.should('have.css', 'left', initialPosition.left)
-			.should('have.css', 'top', initialPosition.top)
+		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`);
 
-		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', movedPosition.left)
-			.should('have.css', 'top', movedPosition.top)
-		// Delete the set node
-		WorkflowPage.getters.canvasNodeByName(EDIT_FIELDS_SET_NODE_NAME).click().click();
-		cy.get('body').type('{backspace}');
+				// 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();
+				// 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.actions.hitUndo();
-		WorkflowPage.getters.canvasNodes()
-			.first()
-			.should('have.css', 'left', initialPosition.left)
-			.should('have.css', 'top', initialPosition.top)
-		// 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', movedPosition.left)
-			.should('have.css', 'top', movedPosition.top)
-		// Third redo: Should delete the Set node
-		WorkflowPage.actions.hitRedo();
-		WorkflowPage.getters.canvasNodes().should('have.length', 3);
 		WorkflowPage.getters.nodeConnections().should('have.length', 2);
+
+		WorkflowPage.actions.hitUndo();
+
+		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.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);
+	});
+
+	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 f7e192e06c..7f1b97b03c 100644
--- a/cypress/e2e/11-inline-expression-editor.cy.ts
+++ b/cypress/e2e/11-inline-expression-editor.cy.ts
@@ -67,6 +67,6 @@ describe('Inline expression editor', () => {
 		WorkflowPage.getters.inlineExpressionEditorInput().type('{{');
 		// Resolving $parameter is slow, especially on CI runner
 		WorkflowPage.getters.inlineExpressionEditorInput().type('$parameter["operation"]');
-		WorkflowPage.getters.inlineExpressionEditorOutput().contains(/^get$/);
+		WorkflowPage.getters.inlineExpressionEditorOutput().should('have.text', 'getAll');
 	});
 });
diff --git a/cypress/e2e/12-canvas-actions.cy.ts b/cypress/e2e/12-canvas-actions.cy.ts
index c34a918970..91f6b65884 100644
--- a/cypress/e2e/12-canvas-actions.cy.ts
+++ b/cypress/e2e/12-canvas-actions.cy.ts
@@ -134,7 +134,7 @@ describe('Canvas Actions', () => {
 			.canvasNodes()
 			.last()
 			.should('have.css', 'left', '860px')
-			.should('have.css', 'top', '220px')
+			.should('have.css', 'top', '220px');
 	});
 
 	it('should delete connections by pressing the delete button', () => {
@@ -163,21 +163,29 @@ describe('Canvas Actions', () => {
 			.find('[data-test-id="execute-node-button"]')
 			.click({ force: true });
 		WorkflowPage.getters.successToast().should('contain', 'Node executed successfully');
+		WorkflowPage.actions.executeNode(CODE_NODE_NAME);
+		WorkflowPage.getters.successToast().should('contain', 'Node executed successfully');
 	});
 
 	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', () => {
@@ -205,22 +213,21 @@ describe('Canvas Actions', () => {
 		WorkflowPage.getters
 			.canvasNodes()
 			.last()
-			.findChildByTestId('disable-node-button').as('disableNodeButton');
-		cy.drag('@disableNodeButton', [200, 200]);
+			.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('disable-node-button').as('disableNodeButton');
+		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('@disableNodeButton').should('be.visible');
-			cy.get('@disableNodeButton').realTouch();
+			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 9e2b8abe06..359f0cf851 100644
--- a/cypress/e2e/12-canvas.cy.ts
+++ b/cypress/e2e/12-canvas.cy.ts
@@ -16,12 +16,13 @@ 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.75;
-const ZOOM_OUT_X2_FACTOR = 0.5625;
+const ZOOM_OUT_X1_FACTOR = 0.8;
+const ZOOM_OUT_X2_FACTOR = 0.64;
 
-const PINCH_ZOOM_IN_FACTOR = 1.32;
-const PINCH_ZOOM_OUT_FACTOR = 0.4752;
+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', () => {
 	beforeEach(() => {
@@ -30,22 +31,30 @@ describe('Canvas Node Manipulation and Navigation', () => {
 
 	it('should add switch node and test connections', () => {
 		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()
+			cy.contains('Add Routing Rule').click();
 		}
 
-		NDVDialog.actions.close()
+		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(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 < desiredOutputs; i++) {
 			const setName = `${EDIT_FIELDS_SET_NODE_NAME}${i > 0 ? i : ''}`;
@@ -121,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);
 	});
@@ -154,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', () => {
@@ -168,12 +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], { clickToFinish: true });
 		WorkflowPage.getters
 			.canvasNodes()
 			.last()
 			.should('have.css', 'left', '740px')
-			.should('have.css', 'top', '320px')
+			.should('have.css', 'top', '320px');
 	});
 
 	it('should zoom in', () => {
@@ -214,8 +246,8 @@ describe('Canvas Node Manipulation and Navigation', () => {
 			);
 	});
 
-	it('should zoom using pinch to zoom', () => {
-		WorkflowPage.actions.pinchToZoom(2, 'zoomIn');
+	it('should zoom using scroll or pinch gesture', () => {
+		WorkflowPage.actions.pinchToZoom(1, 'zoomIn');
 		WorkflowPage.getters
 			.nodeView()
 			.should(
@@ -224,7 +256,11 @@ describe('Canvas Node Manipulation and Navigation', () => {
 				`matrix(${PINCH_ZOOM_IN_FACTOR}, 0, 0, ${PINCH_ZOOM_IN_FACTOR}, 0, 0)`,
 			);
 
-		WorkflowPage.actions.pinchToZoom(4, 'zoomOut');
+		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(
@@ -259,39 +295,42 @@ 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}');
 		WorkflowPage.actions.selectAll();
+
+		// Keyboard shortcut
 		WorkflowPage.actions.hitDisableNodeShortcut();
 		WorkflowPage.getters.disabledNodes().should('have.length', 2);
+		WorkflowPage.actions.hitDisableNodeShortcut();
+		WorkflowPage.getters.disabledNodes().should('have.length', 0);
+
+		// Context menu
+		WorkflowPage.actions.openContextMenu();
+		WorkflowPage.actions.contextMenuAction('toggle_activation');
+		WorkflowPage.getters.disabledNodes().should('have.length', 2);
+		WorkflowPage.actions.openContextMenu();
+		WorkflowPage.actions.contextMenuAction('toggle_activation');
+		WorkflowPage.getters.disabledNodes().should('have.length', 0);
 	});
 
-	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();
@@ -300,19 +339,25 @@ 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
@@ -344,5 +389,47 @@ describe('Canvas Node Manipulation and Navigation', () => {
 		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 9283d07923..7648ee7648 100644
--- a/cypress/e2e/13-pinning.cy.ts
+++ b/cypress/e2e/13-pinning.cy.ts
@@ -3,6 +3,7 @@ import {
 	MANUAL_TRIGGER_NODE_NAME,
 	PIPEDRIVE_NODE_NAME,
 	EDIT_FIELDS_SET_NODE_NAME,
+	BACKEND_BASE_URL,
 } from '../constants';
 import { WorkflowPage, NDV } from '../pages';
 
@@ -62,13 +63,77 @@ 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 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.setPinnedData([
+			{
+				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_NAME);
 		workflowPage.actions.addNodeToCanvas(HTTP_REQUEST_NODE_NAME, true, true);
@@ -86,10 +151,25 @@ describe('Data pinning', () => {
 
 		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');
+	});
 });
 
 function setExpressionOnStringValueInSet(expression: string) {
-	cy.get('button').contains('Execute node').click();
+	cy.get('button').contains('Test step').click();
 	cy.get('.fixed-collection-parameter > :nth-child(2) > .button > span').click();
 
 	ndv.getters.nthParam(4).contains('Expression').invoke('show').click();
diff --git a/cypress/e2e/14-mapping.cy.ts b/cypress/e2e/14-mapping.cy.ts
index ef3b3aeb60..c547383e3e 100644
--- a/cypress/e2e/14-mapping.cy.ts
+++ b/cypress/e2e/14-mapping.cy.ts
@@ -80,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();
 
@@ -96,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', () => {
@@ -235,11 +235,8 @@ describe('Data mapping', () => {
 
 		ndv.actions.close();
 
-		workflowPage.actions.addNodeToCanvas('Item Lists');
-		workflowPage.actions.openNode('Item Lists');
-
-		ndv.getters.parameterInput('operation').click();
-		getVisibleSelect().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();
 
diff --git a/cypress/e2e/16-form-trigger-node.cy.ts b/cypress/e2e/16-form-trigger-node.cy.ts
index 27198001a8..8226df6b33 100644
--- a/cypress/e2e/16-form-trigger-node.cy.ts
+++ b/cypress/e2e/16-form-trigger-node.cy.ts
@@ -1,7 +1,5 @@
 import { WorkflowPage, NDV } from '../pages';
-import { v4 as uuid } from 'uuid';
-import { getPopper, getVisiblePopper, getVisibleSelect } from '../utils';
-import { META_KEY } from '../constants';
+import { getVisibleSelect } from '../utils';
 
 const workflowPage = new WorkflowPage();
 const ndv = new NDV();
@@ -13,10 +11,7 @@ describe('n8n Form Trigger', () => {
 
 	it("add node by clicking on 'On form submission'", () => {
 		workflowPage.getters.canvasPlusButton().click();
-		cy.get('#node-view-root > div:nth-child(2) > div > div > aside ')
-			.find('span')
-			.contains('On form submission')
-			.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');
@@ -76,12 +71,25 @@ describe('n8n Form Trigger', () => {
 		)
 			.find('input')
 			.type('Option 2');
-		//add optionall submitted message
-		cy.get('.param-options > .button').click();
-		cy.get('.indent > .parameter-item')
-			.find('input')
+
+		//add optional submitted message
+		cy.get('.param-options').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 c32a1407dc..da43a7cf4b 100644
--- a/cypress/e2e/16-webhook-node.cy.ts
+++ b/cypress/e2e/16-webhook-node.cy.ts
@@ -187,12 +187,14 @@ describe('Webhook Trigger node', async () => {
 
 		ndv.getters.backToCanvas().click();
 
-		workflowPage.actions.addNodeToCanvas('Convert to/from binary data');
+		workflowPage.actions.addNodeToCanvas('Convert to File');
 		workflowPage.actions.zoomToFit();
 
-		workflowPage.actions.openNode('Convert to/from 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();
-		getVisibleSelect().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();
diff --git a/cypress/e2e/17-sharing.cy.ts b/cypress/e2e/17-sharing.cy.ts
index 40454dde3f..71f41250ec 100644
--- a/cypress/e2e/17-sharing.cy.ts
+++ b/cypress/e2e/17-sharing.cy.ts
@@ -1,4 +1,4 @@
-import { INSTANCE_MEMBERS, INSTANCE_OWNER } 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
@@ -59,6 +60,7 @@ describe('Sharing', { disableAutoLogin: true }, () => {
 		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;
 		});
@@ -96,6 +98,26 @@ describe('Sharing', { disableAutoLogin: true }, () => {
 		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();
+
+		workflowPage.actions.openNode('Notion');
+		ndv.getters
+			.credentialInput()
+			.find('input')
+			.should('have.value', 'Credential C1')
+			.should('be.enabled');
+		ndv.actions.close();
+	});
+
 	it('should not have access to W2, as U3', () => {
 		cy.signin(INSTANCE_MEMBERS[1]);
 
@@ -128,4 +150,41 @@ describe('Sharing', { disableAutoLogin: true }, () => {
 		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/18-user-management.cy.ts b/cypress/e2e/18-user-management.cy.ts
index 8c714eaa6c..91ab059f83 100644
--- a/cypress/e2e/18-user-management.cy.ts
+++ b/cypress/e2e/18-user-management.cy.ts
@@ -1,6 +1,7 @@
-import { INSTANCE_MEMBERS, INSTANCE_OWNER } from '../constants';
-import { SettingsUsersPage, WorkflowPage } 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
@@ -25,9 +26,13 @@ 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', { disableAutoLogin: true }, () => {
-	before(() => cy.enableFeature('sharing'));
+	before(() => {
+		cy.enableFeature('sharing');
+	});
 
 	it('should prevent non-owners to access UM settings', () => {
 		usersSettingsPage.actions.loginAndVisit(
@@ -44,7 +49,7 @@ describe('User Management', { disableAutoLogin: true }, () => {
 	it('should properly render UM settings page for instance owners', () => {
 		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(INSTANCE_OWNER.email)
@@ -53,6 +58,93 @@ describe('User Management', { disableAutoLogin: true }, () => {
 		// Other users list items should contain action pop-up list
 		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('/n8n-dev-logo-dark-mode.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('/n8n-dev-logo.svg');
+			});
 	});
 
 	it('should delete user and their data', () => {
diff --git a/cypress/e2e/19-execution.cy.ts b/cypress/e2e/19-execution.cy.ts
index 0fcea7069c..2598b3f0f9 100644
--- a/cypress/e2e/19-execution.cy.ts
+++ b/cypress/e2e/19-execution.cy.ts
@@ -1,7 +1,8 @@
 import { v4 as uuid } from 'uuid';
-import { NDV, WorkflowPage as WorkflowPageClass, WorkflowsPage } from '../pages';
+import { NDV, WorkflowExecutionsTab, WorkflowPage as WorkflowPageClass } from '../pages';
 
 const workflowPage = new WorkflowPageClass();
+const executionsTab = new WorkflowExecutionsTab();
 const ndv = new NDV();
 
 describe('Execution', () => {
@@ -112,10 +113,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'));
@@ -191,10 +188,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'))
@@ -267,10 +260,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('Wait')
 			.within(() => cy.get('.fa-sync-alt').should('not.visible'));
@@ -286,4 +275,139 @@ 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');
+		});
+	});
 });
diff --git a/cypress/e2e/2-credentials.cy.ts b/cypress/e2e/2-credentials.cy.ts
index c30225429d..ca1ca6e014 100644
--- a/cypress/e2e/2-credentials.cy.ts
+++ b/cypress/e2e/2-credentials.cy.ts
@@ -42,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');
@@ -60,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);
diff --git a/cypress/e2e/20-workflow-executions.cy.ts b/cypress/e2e/20-workflow-executions.cy.ts
index bdc7c3b711..b44b9337a7 100644
--- a/cypress/e2e/20-workflow-executions.cy.ts
+++ b/cypress/e2e/20-workflow-executions.cy.ts
@@ -1,18 +1,20 @@
 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', () => {
 	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');
 
@@ -29,6 +31,45 @@ 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-current?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-current?filter=*', throttleResponse);
+
+		executionsTab.actions.switchToExecutionsTab();
+		executionsTab.actions.switchToEditorTab();
+		cy.wait(executionsRefreshInterval);
+		cy.url().should('not.include', '/executions');
+	});
 });
 
 const createMockExecutions = () => {
diff --git a/cypress/e2e/24-ndv-paired-item.cy.ts b/cypress/e2e/24-ndv-paired-item.cy.ts
index d1509db9e6..58fa0fdb63 100644
--- a/cypress/e2e/24-ndv-paired-item.cy.ts
+++ b/cypress/e2e/24-ndv-paired-item.cy.ts
@@ -19,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');
@@ -92,7 +92,7 @@ describe('NDV', () => {
 		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
 
diff --git a/cypress/e2e/25-stickies.cy.ts b/cypress/e2e/25-stickies.cy.ts
index ac94f882dd..dea3fa4fde 100644
--- a/cypress/e2e/25-stickies.cy.ts
+++ b/cypress/e2e/25-stickies.cy.ts
@@ -1,4 +1,7 @@
+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();
 
@@ -29,6 +32,19 @@ describe('Canvas Actions', () => {
 		workflowPage.getters.addStickyButton().should('not.be.visible');
 
 		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)
@@ -66,6 +82,32 @@ describe('Canvas Actions', () => {
 		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();
 
@@ -84,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', () => {
@@ -205,27 +250,6 @@ 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);
 }
diff --git a/cypress/e2e/26-resource-locator.cy.ts b/cypress/e2e/26-resource-locator.cy.ts
index c556ba983e..9cea4e25a3 100644
--- a/cypress/e2e/26-resource-locator.cy.ts
+++ b/cypress/e2e/26-resource-locator.cy.ts
@@ -1,5 +1,5 @@
 import { WorkflowPage, NDV, CredentialsModal } from '../pages';
-import { getPopper, getVisiblePopper, getVisibleSelect } from '../utils';
+import { getVisiblePopper, getVisibleSelect } from '../utils';
 
 const workflowPage = new WorkflowPage();
 const ndv = new NDV();
@@ -16,7 +16,7 @@ describe('Resource Locator', () => {
 
 	it('should render both RLC components in google sheets', () => {
 		workflowPage.actions.addInitialNodeToCanvas('Manual');
-		workflowPage.actions.addNodeToCanvas('Google Sheets', true, true);
+		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
@@ -31,7 +31,7 @@ describe('Resource Locator', () => {
 
 	it('should show appropriate error when credentials are not set', () => {
 		workflowPage.actions.addInitialNodeToCanvas('Manual');
-		workflowPage.actions.addNodeToCanvas('Google Sheets', true, true);
+		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);
@@ -39,7 +39,7 @@ describe('Resource Locator', () => {
 
 	it('should show appropriate error when credentials are not valid', () => {
 		workflowPage.actions.addInitialNodeToCanvas('Manual');
-		workflowPage.actions.addNodeToCanvas('Google Sheets', true, true);
+		workflowPage.actions.addNodeToCanvas('Google Sheets', true, true, 'Update row in sheet');
 		workflowPage.getters.nodeCredentialsSelect().click();
 		// Add oAuth credentials
 		getVisibleSelect().find('li').last().click();
@@ -54,7 +54,7 @@ describe('Resource Locator', () => {
 
 	it('should reset resource locator when dependent field is changed', () => {
 		workflowPage.actions.addInitialNodeToCanvas('Manual');
-		workflowPage.actions.addNodeToCanvas('Google Sheets', true, true);
+		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');
@@ -66,6 +66,8 @@ describe('Resource Locator', () => {
 		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')
@@ -73,9 +75,11 @@ describe('Resource Locator', () => {
 
 		ndv.actions.setInvalidExpression({ fieldName: 'fieldId' });
 
-		ndv.getters.container().click(); // remove focus from input, hide expression preview
+		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')
diff --git a/cypress/e2e/27-cloud.cy.ts b/cypress/e2e/27-cloud.cy.ts
new file mode 100644
index 0000000000..965bc5bccf
--- /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-opt-in-trial-banner.cy.ts b/cypress/e2e/27-opt-in-trial-banner.cy.ts
deleted file mode 100644
index 0f66236bb0..0000000000
--- a/cypress/e2e/27-opt-in-trial-banner.cy.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-import { BannerStack, MainSidebar, WorkflowPage } 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('BannerStack', { disableAutoLogin: true }, () => {
-	before(() => {
-		const now = new Date();
-		const fiveDaysFromNow = new Date(now.getTime() + 5 * 24 * 60 * 60 * 1000);
-		planData.expirationDate = fiveDaysFromNow.toJSON();
-	});
-
-	it('should render trial banner for opt-in cloud user', () => {
-		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.intercept('GET', '/rest/admin/cloud-plan', {
-			body: planData,
-		}).as('getPlanData');
-
-		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();
-	});
-});
diff --git a/cypress/e2e/27-two-factor-authentication.cy.ts b/cypress/e2e/27-two-factor-authentication.cy.ts
index 5e93909331..91f6ca57a2 100644
--- a/cypress/e2e/27-two-factor-authentication.cy.ts
+++ b/cypress/e2e/27-two-factor-authentication.cy.ts
@@ -1,5 +1,5 @@
 import { MainSidebar } from './../pages/sidebar/main-sidebar';
-import { INSTANCE_OWNER, BACKEND_BASE_URL } from '../constants';
+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';
@@ -19,6 +19,16 @@ const user = {
 	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();
@@ -30,6 +40,7 @@ describe('Two-factor authentication', () => {
 		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');
diff --git a/cypress/e2e/28-debug.cy.ts b/cypress/e2e/28-debug.cy.ts
index 5795ffc257..699f07d53f 100644
--- a/cypress/e2e/28-debug.cy.ts
+++ b/cypress/e2e/28-debug.cy.ts
@@ -12,14 +12,11 @@ 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/settings', (req) => {
-			req.on('response', (res) => {
-				res.send({
-					data: { ...res.body.data, enterprise: { debugInEditor: true } },
-				});
-			});
-		}).as('loadSettings');
 		cy.intercept('GET', '/rest/executions?filter=*').as('getExecutions');
 		cy.intercept('GET', '/rest/executions/*').as('getExecution');
 		cy.intercept('GET', '/rest/executions-current?filter=*').as('getCurrentExecutions');
@@ -47,6 +44,7 @@ describe('Debug', () => {
 		cy.wait(['@getExecutions', '@getCurrentExecutions']);
 
 		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');
 
@@ -56,6 +54,8 @@ describe('Debug', () => {
 		ndv.actions.close();
 
 		workflowPage.actions.saveWorkflowUsingKeyboardShortcut();
+		cy.url().should('not.include', '/debug');
+
 		workflowPage.actions.executeWorkflow();
 
 		cy.wait(['@postWorkflowRun']);
@@ -87,6 +87,7 @@ describe('Debug', () => {
 		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
@@ -104,6 +105,7 @@ describe('Debug', () => {
 		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', '@getCurrentExecutions']);
@@ -112,6 +114,8 @@ describe('Debug', () => {
 		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();
@@ -119,7 +123,10 @@ describe('Debug', () => {
 		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();
@@ -128,5 +135,6 @@ describe('Debug', () => {
 		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/29-templates.cy.ts b/cypress/e2e/29-templates.cy.ts
index 609f9cac0e..1df5a7c8c7 100644
--- a/cypress/e2e/29-templates.cy.ts
+++ b/cypress/e2e/29-templates.cy.ts
@@ -2,11 +2,21 @@ import { TemplatesPage } from '../pages/templates';
 import { WorkflowPage } from '../pages/workflow';
 
 import OnboardingWorkflow from '../fixtures/Onboarding_workflow.json';
+import WorkflowTemplate from '../fixtures/Workflow_template_write_http_query.json';
+import { TemplateWorkflowPage } from '../pages/template-workflow';
 
 const templatesPage = new TemplatesPage();
 const workflowPage = new WorkflowPage();
+const templateWorkflowPage = new TemplateWorkflowPage();
 
 describe('Templates', () => {
+	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');
+	});
+
 	it('can open onboarding flow', () => {
 		templatesPage.actions.openOnboardingFlow(1234, OnboardingWorkflow.name, OnboardingWorkflow);
 		cy.url().then(($url) => {
@@ -26,9 +36,104 @@ describe('Templates', () => {
 		cy.url().then(($url) => {
 			expect($url).to.include('/workflow/new?templateId=1234');
 		});
-		
+
 		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);
+
+		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.expandCategoriesButton().click();
+		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.expandCategoriesButton().click();
+		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/30-editor-after-route-changes.cy.ts b/cypress/e2e/30-editor-after-route-changes.cy.ts
new file mode 100644
index 0000000000..656d7e9b78
--- /dev/null
+++ b/cypress/e2e/30-editor-after-route-changes.cy.ts
@@ -0,0 +1,218 @@
+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');
+		cy.intercept('GET', '/rest/executions-current?filter=*').as('getCurrentExecutions');
+
+		executionsTab.actions.switchToExecutionsTab();
+		cy.wait(['@getExecutions', '@getCurrentExecutions']);
+		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('GET', '/rest/executions-current?filter=*').as('getCurrentExecutions');
+		cy.intercept('POST', '/rest/workflows/run').as('postWorkflowRun');
+
+		editWorkflowAndDeactivate();
+		workflowPage.actions.executeWorkflow();
+		cy.wait(['@postWorkflowRun']);
+
+		executionsTab.actions.switchToExecutionsTab();
+		cy.wait(['@getExecutions', '@getCurrentExecutions']);
+
+		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 0000000000..95ed1e9a0d
--- /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 0000000000..9140acdef2
--- /dev/null
+++ b/cypress/e2e/30-langchain.cy.ts
@@ -0,0 +1,278 @@
+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,
+} from './../constants';
+import { createMockNodeExecutionData, runMockWorkflowExcution } from '../utils';
+import {
+	addLanguageModelNodeToParent,
+	addMemoryNodeToParent,
+	addNodeToCanvas,
+	addOutputParserNodeToParent,
+	addToolNodeToParent,
+	clickManualChatButton,
+	navigateToNewWorkflowPage,
+	openNode,
+} from '../composables/workflow';
+import {
+	clickCreateNewCredential,
+	clickExecuteNode,
+	clickGetBackToCanvas,
+	getOutputPanelTable,
+	setParameterInputByName,
+} from '../composables/ndv';
+import { setCredentialValues } from '../composables/modals/credential-modal';
+import {
+	closeManualChatModal,
+	getManualChatMessages,
+	getManualChatModalLogs,
+	getManualChatModalLogsEntries,
+	getManualChatModalLogsTree,
+	sendManualChatMessage,
+} from '../composables/modals/chat-modal';
+
+describe('Langchain Integration', () => {
+	beforeEach(() => {
+		navigateToNewWorkflowPage();
+	});
+
+	it('should add nodes to all Agent node input types', () => {
+		addNodeToCanvas(MANUAL_TRIGGER_NODE_NAME, true);
+		addNodeToCanvas(AGENT_NODE_NAME, true);
+
+		addLanguageModelNodeToParent(AI_LANGUAGE_MODEL_OPENAI_CHAT_MODEL_NODE_NAME, AGENT_NODE_NAME);
+		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,
+		);
+
+		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?';
+
+		setParameterInputByName('prompt', inputMessage);
+
+		runMockWorkflowExcution({
+			trigger: () => clickExecuteNode(),
+			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,
+		});
+
+		getOutputPanelTable().should('contain', 'output');
+		getOutputPanelTable().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);
+
+		clickCreateNewCredential();
+		setCredentialValues({
+			apiKey: 'sk_test_123',
+		});
+		clickGetBackToCanvas();
+
+		openNode(AGENT_NODE_NAME);
+
+		const inputMessage = 'Hello!';
+		const outputMessage = 'Hi there! How can I assist you today?';
+
+		setParameterInputByName('text', inputMessage);
+
+		runMockWorkflowExcution({
+			trigger: () => clickExecuteNode(),
+			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,
+		});
+
+		getOutputPanelTable().should('contain', 'output');
+		getOutputPanelTable().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);
+
+		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 0000000000..634f95ba06
--- /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 0000000000..d9397ace4e
--- /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 0000000000..4dc2cc5968
--- /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);
+		cy.get('.highlight').should('not.exist');
+
+		searchInput.type('ar');
+		ndv.getters.pagination().find('li').should('have.length', 2);
+		cy.get('.highlight').its('length').should('be.gt', 0);
+
+		searchInput.type('i');
+		ndv.getters.pagination().should('not.exist');
+		cy.get('.highlight').its('length').should('be.gt', 0);
+	});
+
+	it.only('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 0000000000..ba3edbe4c9
--- /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 0000000000..9257bee22d
--- /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 0000000000..863cc61c18
--- /dev/null
+++ b/cypress/e2e/34-template-credentials-setup.cy.ts
@@ -0,0 +1,212 @@
+import {
+	clickUseWorkflowButtonByTitle,
+	visitTemplateCollectionPage,
+	testData,
+} from '../pages/template-collection';
+import * as templateCredentialsSetupPage from '../pages/template-credential-setup';
+import { TemplateWorkflowPage } from '../pages/template-workflow';
+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 templateWorkflowPage = new TemplateWorkflowPage();
+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,
+		});
+	});
+
+	it('can be opened from template workflow page', () => {
+		templateWorkflowPage.actions.visit(testTemplate.id);
+		templateCredentialsSetupPage.enableTemplateCredentialSetupFeatureFlag();
+		templateWorkflowPage.getters.useTemplateButton().should('be.visible');
+		templateCredentialsSetupPage.enableTemplateCredentialSetupFeatureFlag();
+		templateWorkflowPage.actions.clickUseThisWorkflowButton();
+
+		templateCredentialsSetupPage.getters
+			.title(`Set up 'Promote new Shopify products on Twitter and Telegram' template`)
+			.should('be.visible');
+	});
+
+	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 0000000000..05e70aa339
--- /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 0000000000..897714a835
--- /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 0000000000..2d93223ebb
--- /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/4-node-creator.cy.ts b/cypress/e2e/4-node-creator.cy.ts
index 8f9fbde4d3..90ea78c1fb 100644
--- a/cypress/e2e/4-node-creator.cy.ts
+++ b/cypress/e2e/4-node-creator.cy.ts
@@ -2,6 +2,7 @@ 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();
@@ -34,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
@@ -101,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('{uparrow}{rightarrow}');
+		// 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',
@@ -307,7 +308,7 @@ describe('Node Creator', () => {
 			nodeCreatorFeature.getters.getCategoryItem('Actions').click();
 			nodeCreatorFeature.getters.getCreatorItem('Create a credential').click();
 			NDVModal.actions.close();
-			WorkflowPage.actions.deleteNode('When clicking "Execute Workflow"');
+			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();
@@ -316,7 +317,7 @@ describe('Node Creator', () => {
 			NDVModal.actions.close();
 			WorkflowPage.getters.canvasNodes().should('have.length', 2);
 			WorkflowPage.actions.zoomToFit();
-			WorkflowPage.actions.addNodeBetweenNodes('n8n', 'n8n1', 'Item Lists', 'Summarize');
+			WorkflowPage.actions.addNodeBetweenNodes('n8n', 'n8n1', 'Summarize');
 			WorkflowPage.getters.canvasNodes().should('have.length', 3);
 		});
 	});
@@ -360,7 +361,7 @@ describe('Node Creator', () => {
 		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');
+		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');
@@ -368,11 +369,11 @@ describe('Node Creator', () => {
 		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');
+		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');
+		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');
@@ -410,7 +411,7 @@ describe('Node Creator', () => {
 
 		nodeCreatorFeature.getters.searchBar().find('input').clear().type('js');
 		nodeCreatorFeature.getters.nodeItemName().first().should('have.text', 'Code');
-		nodeCreatorFeature.getters.nodeItemName().eq(1).should('have.text', 'Item Lists');
+		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');
@@ -478,15 +479,14 @@ describe('Node Creator', () => {
 
 		nodeCreatorFeature.getters.searchBar().find('input').clear().type('wa');
 		nodeCreatorFeature.getters.nodeItemName().first().should('have.text', 'Wait');
-		nodeCreatorFeature.getters.nodeItemName().eq(1).should('have.text', 'Merge');
 
 		nodeCreatorFeature.getters.searchBar().find('input').clear().type('wait');
 		nodeCreatorFeature.getters.nodeItemName().first().should('have.text', 'Wait');
-		nodeCreatorFeature.getters.nodeItemName().eq(1).should('have.text', 'Merge');
 
 		nodeCreatorFeature.getters.searchBar().find('input').clear().type('spreadsheet');
-		nodeCreatorFeature.getters.nodeItemName().first().should('have.text', 'Spreadsheet File');
-		nodeCreatorFeature.getters.nodeItemName().eq(1).should('have.text', 'Google Sheets');
+		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');
diff --git a/cypress/e2e/5-ndv.cy.ts b/cypress/e2e/5-ndv.cy.ts
index 956d6470f5..4fc69f8fde 100644
--- a/cypress/e2e/5-ndv.cy.ts
+++ b/cypress/e2e/5-ndv.cy.ts
@@ -1,7 +1,7 @@
-import { WorkflowPage, NDV } from '../pages';
 import { v4 as uuid } from 'uuid';
-import { getPopper, getVisiblePopper, getVisibleSelect } from '../utils';
-import { META_KEY } from '../constants';
+import { getVisibleSelect } from '../utils';
+import { MANUAL_TRIGGER_NODE_DISPLAY_NAME } from '../constants';
+import { NDV, WorkflowPage } from '../pages';
 
 const workflowPage = new WorkflowPage();
 const ndv = new NDV();
@@ -42,7 +42,7 @@ 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();
@@ -50,6 +50,9 @@ describe('NDV', () => {
 		ndv.getters.inputOption().last().click();
 		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 show correct validation state for resource locator params', () => {
@@ -68,10 +71,10 @@ describe('NDV', () => {
 		workflowPage.actions.addNodeToCanvas('Manual');
 		workflowPage.actions.addNodeToCanvas('Airtable', true, true, 'Search records');
 		ndv.getters.container().should('be.visible');
-		// cy.get('.has-issues').should('have.length', 0);
+		cy.get('.has-issues').should('have.length', 0);
 		ndv.getters.parameterInput('table').find('input').eq(1).focus().blur();
 		ndv.getters.parameterInput('base').find('input').eq(1).focus().blur();
-		cy.get('.has-issues').should('have.length', 0);
+		cy.get('.has-issues').should('have.length', 2);
 		ndv.getters.backToCanvas().click();
 		workflowPage.actions.openNode('Airtable');
 		cy.get('.has-issues').should('have.length', 2);
@@ -299,11 +302,11 @@ describe('NDV', () => {
 
 		ndv.actions.setInvalidExpression({ fieldName: 'fieldId', delay: 200 });
 
-		ndv.getters.container().click(); // remove focus from input, hide expression preview
+		ndv.getters.nodeParameters().click(); // remove focus from input, hide expression preview
 
 		ndv.getters.parameterInput('remoteOptions').click();
 
-		ndv.getters.parameterInputIssues('remoteOptions').realHover();
+		ndv.getters.parameterInputIssues('remoteOptions').realHover({ scrollBehavior: false});
 		// Remote options dropdown should not be visible
 		ndv.getters.parameterInput('remoteOptions').find('.el-select').should('not.exist');
 	});
@@ -317,7 +320,7 @@ describe('NDV', () => {
 
 		ndv.actions.setInvalidExpression({ fieldName: 'otherField', delay: 50 });
 
-		ndv.getters.container().click(); // remove focus from input, hide expression preview
+		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);
@@ -357,12 +360,253 @@ describe('NDV', () => {
 		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/node-parameter-options?**', cy.spy().as('fetchParameterOptions'));
+		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}]`);
+		}
+		beforeEach(() => {
+			cy.createFixtureWorkflow('Floating_Nodes.json', `Floating Nodes`);
+			workflowPage.getters.canvasNodes().first().dblclick();
+			getFloatingNodeByPosition('inputMain').should('not.exist');
+			getFloatingNodeByPosition('outputMain').should('exist');
+		});
+
+		it('should traverse floating nodes with mouse', () => {
+			// 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');
+			getFloatingNodeByPosition('inputSub').should('exist');
+			getFloatingNodeByPosition('inputSub').click({ force: true });
+			ndv.getters.nodeNameContainer().should('contain', 'Model');
+			getFloatingNodeByPosition('inputSub').should('not.exist');
+			getFloatingNodeByPosition('inputMain').should('not.exist');
+			getFloatingNodeByPosition('outputMain').should('not.exist');
+			getFloatingNodeByPosition('outputSub').should('exist');
+			ndv.actions.close();
+			workflowPage.getters.selectedNodes().should('have.length', 1);
+			workflowPage.getters.selectedNodes().first().should('contain', 'Model');
+			workflowPage.getters.selectedNodes().first().dblclick();
+			getFloatingNodeByPosition('outputSub').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 mouse', () => {
+			// 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');
+			getFloatingNodeByPosition('inputSub').should('exist');
+			cy.realPress(['ShiftLeft', 'Meta', 'AltLeft', 'ArrowDown']);
+			ndv.getters.nodeNameContainer().should('contain', 'Model');
+			getFloatingNodeByPosition('inputSub').should('not.exist');
+			getFloatingNodeByPosition('inputMain').should('not.exist');
+			getFloatingNodeByPosition('outputMain').should('not.exist');
+			getFloatingNodeByPosition('outputSub').should('exist');
+			ndv.actions.close();
+			workflowPage.getters.selectedNodes().should('have.length', 1);
+			workflowPage.getters.selectedNodes().first().should('contain', 'Model');
+			workflowPage.getters.selectedNodes().first().dblclick();
+			cy.realPress(['ShiftLeft', 'Meta', 'AltLeft', 'ArrowUp']);
+			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 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.2)');
+		ndv.actions.close();
+
+		workflowPage.actions.openNode('Edit Fields (latest)');
+		ndv.actions.openSettings();
+		ndv.getters.nodeVersion().should('have.text', 'Edit Fields (Set) node version 3.2 (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 handle mismatched option attributes', () => {
+		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);
+	});
 });
diff --git a/cypress/e2e/7-workflow-actions.cy.ts b/cypress/e2e/7-workflow-actions.cy.ts
index 7a0eda770c..ef15dd97d7 100644
--- a/cypress/e2e/7-workflow-actions.cy.ts
+++ b/cypress/e2e/7-workflow-actions.cy.ts
@@ -4,6 +4,8 @@ import {
 	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';
@@ -100,6 +102,7 @@ describe('Workflow Actions', () => {
 		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');
@@ -275,3 +278,19 @@ describe('Workflow Actions', () => {
 		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 c7f44e3494..1567815ddf 100644
--- a/cypress/e2e/8-http-request-node.cy.ts
+++ b/cypress/e2e/8-http-request-node.cy.ts
@@ -1,6 +1,8 @@
 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', () => {
@@ -18,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 46affa0d62..3cd00d1f68 100644
--- a/cypress/e2e/9-expression-editor-modal.cy.ts
+++ b/cypress/e2e/9-expression-editor-modal.cy.ts
@@ -57,6 +57,6 @@ describe('Expression editor modal', () => {
 	it('should resolve $parameter[]', () => {
 		WorkflowPage.getters.expressionModalInput().clear();
 		WorkflowPage.getters.expressionModalInput().type('{{ $parameter["operation"]');
-		WorkflowPage.getters.expressionModalOutput().contains(/^get$/);
+		WorkflowPage.getters.expressionModalOutput().should('have.text', 'getAll');
 	});
 });
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 0000000000..1f908c587b
--- /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 0000000000..d95675d3c2
--- /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 0000000000..85a100b94e
--- /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": []
+}
\ No newline at end of file
diff --git a/cypress/fixtures/Node_IO_filter.json b/cypress/fixtures/Node_IO_filter.json
new file mode 100644
index 0000000000..9bb9ff994f
--- /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/Plan_data_opt_in_trial.json b/cypress/fixtures/Plan_data_opt_in_trial.json
index 504805de32..7a805708c6 100644
--- a/cypress/fixtures/Plan_data_opt_in_trial.json
+++ b/cypress/fixtures/Plan_data_opt_in_trial.json
@@ -13,8 +13,7 @@
 		"feat:advancedExecutionFilters": true,
 		"quota:users": -1,
 		"quota:maxVariables": -1,
-		"feat:variables": true,
-		"feat:apiDisabled": true
+		"feat:variables": true
 	},
 	"metadata": {
 		"version": "v1",
diff --git a/cypress/fixtures/Schedule_pinned.json b/cypress/fixtures/Schedule_pinned.json
new file mode 100644
index 0000000000..e27623b6fa
--- /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/Suggested_Templates.json b/cypress/fixtures/Suggested_Templates.json
new file mode 100644
index 0000000000..982b75296d
--- /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 0000000000..f15970677e
--- /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 0000000000..29001a78e3
--- /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_5.json b/cypress/fixtures/Test_workflow_5.json
index 6b87fc33b7..b94fcd283a 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 0000000000..e30a3504ca
--- /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 0000000000..78349c3ae5
--- /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 0000000000..871a526e3a
--- /dev/null
+++ b/cypress/fixtures/Test_workflow_ndv_version.json
@@ -0,0 +1,49 @@
+{
+	"name": "Node versions",
+	"nodes": [
+	  {
+		"parameters": {},
+		"id": "aadaed66-84ed-4cf8-bf21-082e9a65db76",
+		"name": "When clicking \"Test Workflow\"",
+		"type": "n8n-nodes-base.manualTrigger",
+		"typeVersion": 1,
+		"position": [
+		  1540,
+		  780
+		]
+	  },
+	  {
+		"parameters": {},
+		"id": "93d73a85-82f0-4380-a032-713d5dc82b32",
+		"name": "Function",
+		"type": "n8n-nodes-base.function",
+		"typeVersion": 1,
+		"position": [
+		  2040,
+		  780
+		]
+	  },
+	  {
+		"id": "50f322d9-c622-4dd0-8d38-e851502739dd",
+		"name": "Edit Fields (old)",
+		"type": "n8n-nodes-base.set",
+		"typeVersion": 2,
+		"position": [
+		  1880,
+		  780
+		]
+	  },
+	  {
+		"id": "93aaadac-55fe-4618-b1eb-f63e61d1446a",
+		"name": "Edit Fields (latest)",
+		"type": "n8n-nodes-base.set",
+		"typeVersion": 3.2,
+		"position": [
+		  1720,
+		  780
+		]
+	  }
+	],
+	"pinData": {},
+	"connections": {}
+  }
diff --git a/cypress/fixtures/Test_workflow_schema_test.json b/cypress/fixtures/Test_workflow_schema_test.json
index 0db43a5ea4..f615316c73 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 5233a17848..867563ddfd 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 0000000000..d1bfb17133
--- /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 0000000000..03d09a1735
--- /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 0000000000..a0a3eba649
--- /dev/null
+++ b/cypress/fixtures/Workflow_template_write_http_query.json
@@ -0,0 +1,188 @@
+{
+    "workflow": {
+        "id": 3,
+        "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,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"
+            },
+            {
+                "id": 14,
+                "url": "data:image/png;base64,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"
+            }
+        ]
+    }
+}
\ No newline at end of file
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
index 569ac1fc13..8fb17e15b4 100644
--- a/cypress/fixtures/expression_with_paired_item_in_multi_input_node.json
+++ b/cypress/fixtures/expression_with_paired_item_in_multi_input_node.json
@@ -6,7 +6,7 @@
 		{
 			"parameters": {},
 			"id": "bcb6abdf-d34b-4ea7-a8ed-58155b708c43",
-			"name": "When clicking \"Execute Workflow\"",
+			"name": "When clicking \"Test Workflow\"",
 			"type": "n8n-nodes-base.manualTrigger",
 			"typeVersion": 1,
 			"position": [
@@ -90,7 +90,7 @@
 		}
 	],
 	"connections": {
-		"When clicking \"Execute Workflow\"": {
+		"When clicking \"Test Workflow\"": {
 			"main": [
 				[
 					{
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 0000000000..5a0a1eb5ad
--- /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,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"
+									},
+									"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,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"
+									},
+									"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 0000000000..4efbb3585b
--- /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,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"
+                    },
+                    "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,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"
+                    },
+                    "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,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"
+                    },
+                    "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,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"
+                    },
+                    "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,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"
+                    },
+                    "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,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"
+                    },
+                    "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,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"
+                    },
+                    "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 0000000000..c77be3db9c
--- /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 0000000000..4d3ca1e548
--- /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 0000000000..17d355f92e
--- /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 0000000000..c5b5f165b3
--- /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/demo.ts b/cypress/pages/demo.ts
new file mode 100644
index 0000000000..0590fb8def
--- /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 6686de25ff..3e6a819443 100644
--- a/cypress/pages/features/node-creator.ts
+++ b/cypress/pages/features/node-creator.ts
@@ -20,6 +20,7 @@ export class NodeCreator extends BasePage {
 		communityNodeTooltip: () => cy.getByTestId('node-item-community-tooltip'),
 		noResults: () => cy.getByTestId('node-creator-no-results'),
 		nodeItemName: () => cy.getByTestId('node-creator-item-name'),
+		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 18e3649e1a..39c9be3b56 100644
--- a/cypress/pages/index.ts
+++ b/cypress/pages/index.ts
@@ -10,3 +10,6 @@ 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/modals/credentials-modal.ts b/cypress/pages/modals/credentials-modal.ts
index 312e9edbf5..08a258a057 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 = {
@@ -30,11 +31,7 @@ export class CredentialsModal extends BasePage {
 	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();
@@ -48,6 +45,12 @@ export class CredentialsModal extends BasePage {
 			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/ndv.ts b/cypress/pages/ndv.ts
index 611a351ff5..449ad75eb4 100644
--- a/cypress/pages/ndv.ts
+++ b/cypress/pages/ndv.ts
@@ -24,6 +24,7 @@ export class NDV extends BasePage {
 		editPinnedDataButton: () => cy.getByTestId('ndv-edit-pinned-data'),
 		pinnedDataEditor: () => this.getters.outputPanel().find('.cm-editor .cm-scroller'),
 		runDataPaneHeader: () => cy.getByTestId('run-data-pane-header'),
+		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'),
@@ -48,9 +49,7 @@ export class NDV extends BasePage {
 		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'),
@@ -72,15 +71,43 @@ export class NDV extends BasePage {
 			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'),
+		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'),
+		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();
@@ -104,7 +131,12 @@ export class NDV extends BasePage {
 			this.getters.pinnedDataEditor().click();
 			this.getters
 				.pinnedDataEditor()
-				.type(`{selectall}{backspace}${JSON.stringify(data).replace(new RegExp('{', 'g'), '{{}')}`);
+				.type(
+					`{selectall}{backspace}${JSON.stringify(data).replace(new RegExp('{', 'g'), '{{}')}`,
+					{
+						delay: 0,
+					},
+				);
 
 			this.actions.savePinnedData();
 		},
@@ -114,7 +146,7 @@ export class NDV extends BasePage {
 		typeIntoParameterInput: (
 			parameterName: string,
 			content: string,
-			opts?: { parseSpecialCharSequences: boolean, delay?: number },
+			opts?: { parseSpecialCharSequences: boolean; delay?: number },
 		) => {
 			this.getters.parameterInput(parameterName).type(content, opts);
 		},
@@ -187,7 +219,6 @@ export class NDV extends BasePage {
 				.find('span')
 				.should('include.html', asEncodedHTML(value));
 		},
-
 		refreshResourceMapperColumns: () => {
 			this.getters.resourceMapperSelectColumn().realHover();
 			this.getters
@@ -198,8 +229,21 @@ export class NDV extends BasePage {
 
 			getVisiblePopper().find('li').last().click();
 		},
-
-		setInvalidExpression: ({ fieldName, invalidExpression, delay }: { fieldName: string, invalidExpression?: string, delay?: number }) => {
+		addFilterCondition: (paramName: string) => {
+			this.getters.filterConditionAdd(paramName).click();
+		},
+		removeFilterCondition: (paramName: string, index: number) => {
+			this.getters.filterConditionRemove(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,
@@ -207,6 +251,20 @@ export class NDV extends BasePage {
 			});
 			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);
+		},
 	};
 }
 
diff --git a/cypress/pages/settings-personal.ts b/cypress/pages/settings-personal.ts
index 79cf58c752..716625beb5 100644
--- a/cypress/pages/settings-personal.ts
+++ b/cypress/pages/settings-personal.ts
@@ -20,8 +20,15 @@ export class PersonalSettingsPage extends BasePage {
 		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);
diff --git a/cypress/pages/settings-public-api.ts b/cypress/pages/settings-public-api.ts
new file mode 100644
index 0000000000..1a7d668136
--- /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 d9a2e32df9..e3c80e5bcc 100644
--- a/cypress/pages/settings-users.ts
+++ b/cypress/pages/settings-users.ts
@@ -20,6 +20,8 @@ export class SettingsUsersPage extends BasePage {
 		userItem: (email: string) => cy.getByTestId(`user-list-item-${email.toLowerCase()}`),
 		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(),
diff --git a/cypress/pages/settings.ts b/cypress/pages/settings.ts
new file mode 100644
index 0000000000..264b525dee
--- /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 1559d3da65..5379b1f889 100644
--- a/cypress/pages/sidebar/main-sidebar.ts
+++ b/cypress/pages/sidebar/main-sidebar.ts
@@ -12,7 +12,9 @@ export class MainSidebar extends BasePage {
 		workflows: () => this.getters.menuItem('Workflows'),
 		credentials: () => this.getters.menuItem('Credentials'),
 		executions: () => this.getters.menuItem('Executions'),
+		adminPanel: () => this.getters.menuItem('Admin Panel'),
 		userMenu: () => cy.get('div[class="action-dropdown-container"]'),
+		logo: () => cy.getByTestId('n8n-logo'),
 	};
 	actions = {
 		goToSettings: () => {
diff --git a/cypress/pages/template-collection.ts b/cypress/pages/template-collection.ts
new file mode 100644
index 0000000000..9f3457eae9
--- /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 0000000000..d673261fdf
--- /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 0000000000..ff54e1e3d4
--- /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 }[];
+			};
+		}) => {
+			cy.intercept('GET', `https://api.n8n.io/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
index d49c086a79..e72c450312 100644
--- a/cypress/pages/templates.ts
+++ b/cypress/pages/templates.ts
@@ -1,15 +1,29 @@
 import { BasePage } from './base';
-import { WorkflowPage } from './workflow';
 
-const workflowPage = new WorkflowPage();
 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 = {
-		openOnboardingFlow: (id: number, name: string , workflow: object) => {
+		openSingleTemplateView: (templateId: number) => {
+			cy.visit(`${this.url}/${templateId}`);
+			cy.waitForLoad();
+		},
+
+		openOnboardingFlow: (id: number, name: string, workflow: object) => {
 			const apiResponse = {
 				id,
 				name,
@@ -43,8 +57,7 @@ export class TemplatesPage extends BasePage {
 			cy.visit(`/workflows/templates/${id}`);
 
 			cy.wait('@getTemplate');
-			cy.wait( '@getWorkflow');
-		}
-	}
+			cy.wait('@getWorkflow');
+		},
+	};
 }
-
diff --git a/cypress/pages/workerView.ts b/cypress/pages/workerView.ts
new file mode 100644
index 0000000000..e14bfd36a2
--- /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 eff3fedd30..eb855f026f 100644
--- a/cypress/pages/workflow-executions-tab.ts
+++ b/cypress/pages/workflow-executions-tab.ts
@@ -14,6 +14,7 @@ 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-"]'),
+		executionPreviewDeleteButton: () => cy.get('[data-test-id="execution-preview-delete-button"]'),
 		executionPreviewDetailsById: (executionId: string) =>
 			cy.getByTestId(`execution-preview-details-${executionId}`),
 		executionPreviewTime: () =>
@@ -38,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 0000000000..18cd6ed999
--- /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 4bcccc7418..f3994b4b42 100644
--- a/cypress/pages/workflow.ts
+++ b/cypress/pages/workflow.ts
@@ -46,8 +46,10 @@ 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-notification--success').parent(),
-		errorToast: () => cy.get('.el-notification .el-notification--error'),
+		successToast: () => cy.get('.el-notification:has(.el-notification--success)'),
+		warningToast: () => cy.get('.el-notification:has(.el-notification--warning)'),
+		errorToast: () => cy.get('.el-notification:has(.el-notification--error)'),
+		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'),
@@ -70,6 +72,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'),
@@ -124,6 +127,9 @@ 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: (preventNodeViewUnload = true) => {
@@ -168,23 +174,86 @@ 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();
 					} else {
 						// Select the first action
-						cy.get('[data-keyboard-nav-type="action"]').eq(0).click();
+						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();
@@ -209,6 +278,7 @@ 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');
@@ -260,7 +330,8 @@ export class WorkflowPage extends BasePage {
 				ctrlKey: true,
 				pageX: cy.window().innerWidth / 2,
 				pageY: cy.window().innerHeight / 2,
-				deltaY: mode === 'zoomOut' ? 16 * steps : -16 * steps,
+				deltaMode: 1,
+				deltaY: mode === 'zoomOut' ? steps : -steps,
 			});
 		},
 		hitUndo: () => {
@@ -276,13 +347,22 @@ 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();
@@ -321,6 +401,17 @@ export class WorkflowPage extends BasePage {
 		deleteSticky: () => {
 			this.getters.stickies().eq(0).realHover().find('[data-test-id="delete-sticky"]').click();
 		},
+		toggleColorPalette: () => {
+			this.getters
+				.stickies()
+				.eq(0)
+				.realHover()
+				.find('[data-test-id="change-sticky-color"]')
+				.click({ force: true });
+		},
+		pickColor: (index: number) => {
+			this.getters.colors().eq(1).click();
+		},
 		editSticky: (content: string) => {
 			this.getters.stickies().dblclick().find('textarea').clear().type(content).type('{esc}');
 		},
@@ -334,5 +425,11 @@ export class WorkflowPage extends BasePage {
 			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 416528e85c..56a3c44923 100644
--- a/cypress/pages/workflows.ts
+++ b/cypress/pages/workflows.ts
@@ -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 = {
diff --git a/cypress/support/commands.ts b/cypress/support/commands.ts
index c86db382a3..238ea0d2a2 100644
--- a/cypress/support/commands.ts
+++ b/cypress/support/commands.ts
@@ -1,6 +1,12 @@
 import 'cypress-real-events';
 import { WorkflowPage } from '../pages';
-import { BACKEND_BASE_URL, N8N_AUTH_COOKIE } from '../constants';
+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);
@@ -16,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(
@@ -33,7 +39,7 @@ Cypress.Commands.add('waitForLoad', (waitForIntercepts = true) => {
 	// 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']);
+		cy.wait(['@loadSettings', '@loadNodeTypes']);
 	}
 	cy.getByTestId('node-view-loader', { timeout: 20000 }).should('not.exist');
 	cy.get('.el-loading-mask', { timeout: 20000 }).should('not.exist');
@@ -51,6 +57,10 @@ Cypress.Commands.add('signin', ({ email, password }) => {
 	);
 });
 
+Cypress.Commands.add('signinAsOwner', () => {
+	cy.signin({ email: INSTANCE_OWNER.email, password: INSTANCE_OWNER.password });
+});
+
 Cypress.Commands.add('signout', () => {
 	cy.request('POST', `${BACKEND_BASE_URL}/rest/logout`);
 	cy.getCookie(N8N_AUTH_COOKIE).should('not.exist');
@@ -66,8 +76,15 @@ const setFeature = (feature: string, enabled: boolean) =>
 		enabled,
 	});
 
+const setQueueMode = (enabled: boolean) =>
+	cy.request('PATCH', `${BACKEND_BASE_URL}/rest/e2e/queue-mode`, {
+		enabled,
+	});
+
 Cypress.Commands.add('enableFeature', (feature: string) => setFeature(feature, true));
-Cypress.Commands.add('disableFeature', (feature): string => setFeature(feature, false));
+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')) {
@@ -153,6 +170,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();
@@ -161,3 +179,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 a750918c6d..1a209d66b9 100644
--- a/cypress/support/e2e.ts
+++ b/cypress/support/e2e.ts
@@ -1,11 +1,8 @@
-import { BACKEND_BASE_URL, INSTANCE_MEMBERS, INSTANCE_OWNER } from '../constants';
+import { INSTANCE_OWNER } from '../constants';
 import './commands';
 
 before(() => {
-	cy.request('POST', `${BACKEND_BASE_URL}/rest/e2e/reset`, {
-		owner: INSTANCE_OWNER,
-		members: INSTANCE_MEMBERS,
-	});
+	cy.resetDatabase();
 
 	Cypress.on('uncaught:exception', (err) => {
 		return !err.message.includes('ResizeObserver');
@@ -18,6 +15,7 @@ beforeEach(() => {
 	}
 
 	cy.intercept('GET', '/rest/settings').as('loadSettings');
+	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', {
diff --git a/cypress/support/index.ts b/cypress/support/index.ts
index 37140351ff..f31e50c578 100644
--- a/cypress/support/index.ts
+++ b/cypress/support/index.ts
@@ -23,10 +23,13 @@ declare global {
 			findChildByTestId(childTestId: string): Chainable<JQuery<HTMLElement>>;
 			createFixtureWorkflow(fixtureKey: string, workflowName: string): void;
 			signin(payload: SigninPayload): void;
+			signinAsOwner(): void;
 			signout(): void;
 			interceptREST(method: string, url: string): Chainable<Interception>;
 			enableFeature(feature: string): void;
 			disableFeature(feature: string): void;
+			enableQueueMode(): void;
+			disableQueueMode(): void;
 			waitForLoad(waitForIntercepts?: boolean): void;
 			grantBrowserPermissions(...permissions: string[]): void;
 			readClipboard(): Chainable<string>;
@@ -34,9 +37,19 @@ declare global {
 			drag(
 				selector: string | Cypress.Chainable<JQuery<HTMLElement>>,
 				target: [number, number],
-				options?: { abs?: boolean; index?: number; realMouse?: boolean },
+				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 61b0e504a3..26a5da716b 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 0000000000..81748af505
--- /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
index 1929454b18..3cfa5a7449 100644
--- a/cypress/utils/index.ts
+++ b/cypress/utils/index.ts
@@ -1 +1,3 @@
+export * from './executions';
+export * from './modal';
 export * from './popper';
diff --git a/docker/images/n8n/Dockerfile b/docker/images/n8n/Dockerfile
index a699563633..14398820a1 100644
--- a/docker/images/n8n/Dockerfile
+++ b/docker/images/n8n/Dockerfile
@@ -16,9 +16,10 @@ RUN set -eux; \
 	case "$apkArch" in \
 	'armv7') apk del build-dependencies;; \
 	esac && \
+	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 && \
+	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
 
 COPY docker-entrypoint.sh /
diff --git a/docker/images/n8n/README.md b/docker/images/n8n/README.md
index 8497d1ed77..848c21c7cd 100644
--- a/docker/images/n8n/README.md
+++ b/docker/images/n8n/README.md
@@ -2,7 +2,7 @@
 
 # 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>
 
@@ -63,7 +63,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`
@@ -258,6 +258,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/jest.config.js b/jest.config.js
index a4c416f152..f3f7824c14 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -30,8 +30,8 @@ const config = {
 		return acc;
 	}, {}),
 	setupFilesAfterEnv: ['jest-expect-message'],
-	collectCoverage: true,
-	coverageReporters: [process.env.COVERAGE_REPORT === 'true' ? 'text' : 'text-summary'],
+	collectCoverage: process.env.COVERAGE_ENABLED === 'true',
+	coverageReporters: ['text-summary'],
 	collectCoverageFrom: ['src/**/*.ts'],
 };
 
diff --git a/package.json b/package.json
index 2ce4e34681..2e794cfbf2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n",
-  "version": "1.14.0",
+  "version": "1.24.0",
   "private": true,
   "homepage": "https://n8n.io",
   "engines": {
@@ -11,8 +11,11 @@
   "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,14 +26,17 @@
     "start:tunnel": "./packages/cli/bin/n8n start --tunnel",
     "start:windows": "cd packages/cli/bin && n8n",
     "test": "turbo run test",
+    "test:backend": "pnpm --filter=!@n8n/chat --filter=!n8n-design-system --filter=!n8n-editor-ui  --filter=!n8n-nodes-base test",
+    "test:nodes": "pnpm --filter=n8n-nodes-base test",
+    "test:frontend": "pnpm --filter=@n8n/chat --filter=n8n-design-system --filter=n8n-editor-ui test",
     "watch": "turbo run watch",
     "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 NODE_OPTIONS=--dns-result-order=ipv4first start-server-and-test start http://localhost:5678/favicon.ico 'cypress open'",
-    "test:e2e:dev": "cross-env E2E_TESTS=true NODE_OPTIONS=--dns-result-order=ipv4first  CYPRESS_BASE_URL=http://localhost:8080 start-server-and-test dev http://localhost:8080/favicon.ico 'cypress open'",
-    "test:e2e:all": "cross-env E2E_TESTS=true NODE_OPTIONS=--dns-result-order=ipv4first  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": {
     "n8n": "workspace:*"
@@ -40,11 +46,11 @@
     "@ngneat/falso": "^6.4.0",
     "@types/jest": "^29.5.3",
     "@types/supertest": "^2.0.12",
-    "@vitest/coverage-v8": "^0.33.0",
+    "@vitest/coverage-v8": "^1.1.0",
     "cross-env": "^7.0.3",
+    "cypress": "^13.6.2",
     "cypress-otp": "^1.0.3",
-    "cypress": "^12.17.2",
-    "cypress-real-events": "^1.9.1",
+    "cypress-real-events": "^1.11.0",
     "jest": "^29.6.2",
     "jest-environment-jsdom": "^29.6.2",
     "jest-expect-message": "^1.1.3",
@@ -55,16 +61,16 @@
     "p-limit": "^3.1.0",
     "rimraf": "^5.0.1",
     "run-script-os": "^1.0.7",
-    "start-server-and-test": "^2.0.0",
+    "start-server-and-test": "^2.0.3",
     "supertest": "^6.3.3",
     "ts-jest": "^29.1.1",
     "tsc-alias": "^1.8.7",
     "tsc-watch": "^6.0.4",
     "turbo": "1.10.12",
     "typescript": "*",
-    "vite": "^4.4.7",
-    "vitest": "^0.33.0",
-    "vue-tsc": "^1.8.8"
+    "vite": "^5.0.10",
+    "vitest": "^1.1.0",
+    "vue-tsc": "^1.8.25"
   },
   "pnpm": {
     "onlyBuiltDependencies": [
@@ -74,16 +80,17 @@
       "@types/node": "^18.16.16",
       "chokidar": "3.5.2",
       "jsonwebtoken": "9.0.0",
-      "prettier": "^3.0.3",
+      "prettier": "^3.1.0",
       "semver": "^7.5.4",
       "tough-cookie": "^4.1.3",
       "tslib": "^2.6.1",
       "tsconfig-paths": "^4.2.0",
       "ts-node": "^10.9.1",
-      "typescript": "^5.2.2",
+      "typescript": "^5.3.0",
       "xml2js": "^0.5.0",
       "cpy@8>globby": "^11.1.0",
-      "qqjs>globby": "^11.1.0"
+      "qqjs>globby": "^11.1.0",
+      "@langchain/core": "^0.1.8"
     },
     "patchedDependencies": {
       "typedi@0.10.0": "patches/typedi@0.10.0.patch",
diff --git a/packages/@n8n/chat/.eslintignore b/packages/@n8n/chat/.eslintignore
new file mode 100644
index 0000000000..40a7b4122b
--- /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 0000000000..a1ad467ea3
--- /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 0000000000..38adffa64e
--- /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 0000000000..5b1cb0a96a
--- /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 0000000000..c826aea088
--- /dev/null
+++ b/packages/@n8n/chat/.storybook/main.ts
@@ -0,0 +1,27 @@
+import type { StorybookConfig } from '@storybook/vue3-vite';
+
+import { join, dirname } from 'path';
+
+/**
+ * This function is used to resolve the absolute path of a package.
+ * It is needed in projects that use Yarn PnP or are set up within a monorepo.
+ */
+function getAbsolutePath(value: string): any {
+	return dirname(require.resolve(join(value, 'package.json')));
+}
+const config: StorybookConfig = {
+	stories: ['../src/**/*.mdx', '../src/**/*.stories.@(js|jsx|mjs|ts|tsx)'],
+	addons: [
+		getAbsolutePath('@storybook/addon-links'),
+		getAbsolutePath('@storybook/addon-essentials'),
+		getAbsolutePath('@storybook/addon-interactions'),
+	],
+	framework: {
+		name: getAbsolutePath('@storybook/vue3-vite'),
+		options: {},
+	},
+	docs: {
+		autodocs: 'tag',
+	},
+};
+export default config;
diff --git a/packages/@n8n/chat/.storybook/preview.scss b/packages/@n8n/chat/.storybook/preview.scss
new file mode 100644
index 0000000000..abaf406f8d
--- /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 0000000000..0a92b65cb2
--- /dev/null
+++ b/packages/@n8n/chat/.storybook/preview.ts
@@ -0,0 +1,16 @@
+import type { Preview } from '@storybook/vue3';
+import './preview.scss';
+
+const preview: Preview = {
+	parameters: {
+		actions: { argTypesRegex: '^on[A-Z].*' },
+		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 0000000000..c0a6e5a481
--- /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 0000000000..c1d7423975
--- /dev/null
+++ b/packages/@n8n/chat/LICENSE.md
@@ -0,0 +1,85 @@
+# License
+
+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".
+- 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 0000000000..2cb9babbf1
--- /dev/null
+++ b/packages/@n8n/chat/README.md
@@ -0,0 +1,250 @@
+# 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--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;
+}
+```
+
+## 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 0000000000..9d5910dbe7
--- /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 0000000000..11f02fe2a0
--- /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 0000000000..a888544898
--- /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 0000000000..ec913f0fa4
--- /dev/null
+++ b/packages/@n8n/chat/package.json
@@ -0,0 +1,60 @@
+{
+  "name": "@n8n/chat",
+  "version": "0.7.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",
+    "uuid": "^8.3.2",
+    "vue": "^3.3.4",
+    "vue-markdown-render": "^2.0.1"
+  },
+  "devDependencies": {
+    "@iconify-json/mdi": "^1.1.54",
+    "shelljs": "^0.8.5",
+    "unbuild": "^2.0.0",
+    "unplugin-icons": "^0.17.0",
+    "vite-plugin-dts": "^3.6.4"
+  },
+  "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 0000000000..df36fcfb72
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 0000000000..4c3f5aed4e
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 0000000000..1a598c823e
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 0000000000..a21028b9fb
--- /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 0000000000..1bf4be681b
--- /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 0000000000..0dffb892e4
--- /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 0000000000..2ce6a4e8c2
--- /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 0000000000..ec90bef425
--- /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 0000000000..ca93cdb240
--- /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 0000000000..5307880d67
--- /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 0000000000..7b0828bfa8
--- /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 0000000000..db34921acd
--- /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 0000000000..51d539d773
--- /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 () => 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 0000000000..6dc234f1d0
--- /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 0000000000..a510652b0d
--- /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 0000000000..98385b90c4
--- /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 Promise<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 authenticatedFetch<T>(resolvedUrl, { ...options, method: 'GET' });
+}
+
+export async function post<T>(url: string, body: object = {}, options: RequestInit = {}) {
+	return authenticatedFetch<T>(url, {
+		...options,
+		method: 'POST',
+		body: JSON.stringify(body),
+	});
+}
+
+export async function put<T>(url: string, body: object = {}, options: RequestInit = {}) {
+	return authenticatedFetch<T>(url, {
+		...options,
+		method: 'PUT',
+		body: JSON.stringify(body),
+	});
+}
+
+export async function patch<T>(url: string, body: object = {}, options: RequestInit = {}) {
+	return authenticatedFetch<T>(url, {
+		...options,
+		method: 'PATCH',
+		body: JSON.stringify(body),
+	});
+}
+
+export async function del<T>(url: string, body: object = {}, options: RequestInit = {}) {
+	return 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 0000000000..a78afb92f2
--- /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 0000000000..ff629bc917
--- /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 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 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 0000000000..ca35153fc6
--- /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 0000000000..e9a4476a98
--- /dev/null
+++ b/packages/@n8n/chat/src/components/Chat.vue
@@ -0,0 +1,52 @@
+<script setup lang="ts">
+import { 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();
+
+async function getStarted() {
+	void chatStore.startNewSession();
+	void nextTick(() => {
+		chatEventBus.emit('scrollToBottom');
+	});
+}
+
+async function initialize() {
+	await chatStore.loadPreviousSession();
+	void nextTick(() => {
+		chatEventBus.emit('scrollToBottom');
+	});
+}
+
+onMounted(async () => {
+	await initialize();
+	if (!options.showWelcomeScreen && !currentSessionId.value) {
+		await getStarted();
+	}
+});
+</script>
+
+<template>
+	<Layout class="chat-wrapper">
+		<template #header>
+			<h1>{{ t('title') }}</h1>
+			<p>{{ 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>
diff --git a/packages/@n8n/chat/src/components/ChatWindow.vue b/packages/@n8n/chat/src/components/ChatWindow.vue
new file mode 100644
index 0000000000..1d1f7ae3c2
--- /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 0000000000..7c1a6aea2b
--- /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 0000000000..dca1d16bc6
--- /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 0000000000..68b9deeb24
--- /dev/null
+++ b/packages/@n8n/chat/src/components/Input.vue
@@ -0,0 +1,93 @@
+<script setup lang="ts">
+// eslint-disable-next-line import/no-unresolved
+import IconSend from 'virtual:icons/mdi/send';
+import { computed, ref } from 'vue';
+import { useI18n, useChat } from '@n8n/chat/composables';
+
+const chatStore = useChat();
+const { waitingForResponse } = chatStore;
+const { t } = useI18n();
+
+const input = ref('');
+
+const isSubmitDisabled = computed(() => {
+	return input.value === '' || waitingForResponse.value;
+});
+
+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
+			v-model="input"
+			rows="1"
+			: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%;
+
+	textarea {
+		font-family: inherit;
+		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--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 0000000000..c61ec54477
--- /dev/null
+++ b/packages/@n8n/chat/src/components/Layout.vue
@@ -0,0 +1,82 @@
+<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 {
+		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));
+	}
+
+	.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 0000000000..6110315102
--- /dev/null
+++ b/packages/@n8n/chat/src/components/Message.vue
@@ -0,0 +1,97 @@
+<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 type { ChatMessage } from '@n8n/chat/types';
+
+const props = defineProps({
+	message: {
+		type: Object as PropType<ChatMessage>,
+		required: true,
+	},
+});
+
+const { message } = toRefs(props);
+
+const messageText = computed(() => {
+	return message.value.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',
+	};
+});
+
+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
+	},
+};
+</script>
+<template>
+	<div class="chat-message" :class="classes">
+		<slot>
+			<VueMarkdown class="chat-message-markdown" :source="messageText" :options="markdownOptions" />
+		</slot>
+	</div>
+</template>
+
+<style lang="scss">
+.chat-message {
+	display: block;
+	max-width: 80%;
+	padding: var(--chat--message--padding, var(--chat--spacing));
+	border-radius: var(--chat--message--border-radius, var(--chat--border-radius));
+
+	+ .chat-message {
+		margin-top: var(--chat--message--margin-bottom, calc(var(--chat--spacing) * 0.5));
+	}
+
+	&.chat-message-from-bot {
+		background-color: var(--chat--message--bot--background);
+		color: var(--chat--message--bot--color);
+		border-bottom-left-radius: 0;
+	}
+
+	&.chat-message-from-user {
+		background-color: var(--chat--message--user--background);
+		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 0000000000..cf5981a97c
--- /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 0000000000..7781c45046
--- /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 0000000000..bd899e6b16
--- /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 0000000000..223c136993
--- /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 0000000000..1eee732bc8
--- /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 0000000000..a7ec614732
--- /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 0000000000..4c9a154965
--- /dev/null
+++ b/packages/@n8n/chat/src/composables/useI18n.ts
@@ -0,0 +1,16 @@
+import { useOptions } from '@n8n/chat/composables/useOptions';
+
+export function useI18n() {
+	const { options } = useOptions();
+	const language = options?.defaultLanguage ?? 'en';
+
+	function t(key: string): string {
+		return options?.i18n?.[language]?.[key] ?? 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 0000000000..5223ad09df
--- /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 0000000000..7444d05c97
--- /dev/null
+++ b/packages/@n8n/chat/src/constants/defaults.ts
@@ -0,0 +1,29 @@
+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..',
+		},
+	},
+	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 0000000000..4138202e08
--- /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 0000000000..43b2d3d8ec
--- /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 0000000000..618d48e960
--- /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 0000000000..4f44509a39
--- /dev/null
+++ b/packages/@n8n/chat/src/css/_tokens.scss
@@ -0,0 +1,36 @@
+: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;
+}
diff --git a/packages/@n8n/chat/src/css/index.scss b/packages/@n8n/chat/src/css/index.scss
new file mode 100644
index 0000000000..1cfb0253a4
--- /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 0000000000..92ef5e33a1
--- /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 0000000000..34b5669549
--- /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 0000000000..eb45e0b963
--- /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 0000000000..f91c9fff55
--- /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 0000000000..80b343ac45
--- /dev/null
+++ b/packages/@n8n/chat/src/plugins/chat.ts
@@ -0,0 +1,105 @@
+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,
+			);
+
+			const receivedMessage: ChatMessage = {
+				id: uuidv4(),
+				text: sendMessageResponse.output,
+				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 0000000000..043e5b3938
--- /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 0000000000..1fc02b2079
--- /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 0000000000..07c8c253cb
--- /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 0000000000..7fce96db04
--- /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 0000000000..6c73936a52
--- /dev/null
+++ b/packages/@n8n/chat/src/types/messages.ts
@@ -0,0 +1,6 @@
+export interface ChatMessage {
+	id: string;
+	text: string;
+	createdAt: string;
+	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 0000000000..85648a66f6
--- /dev/null
+++ b/packages/@n8n/chat/src/types/options.ts
@@ -0,0 +1,28 @@
+export interface ChatOptions {
+	webhookUrl: string;
+	webhookConfig?: {
+		method?: 'GET' | 'POST';
+		headers?: Record<string, string>;
+	};
+	target?: string | Element;
+	mode?: 'window' | 'fullscreen';
+	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;
+			[message: string]: string;
+		}
+	>;
+	theme?: {};
+}
diff --git a/packages/@n8n/chat/src/types/webhook.ts b/packages/@n8n/chat/src/types/webhook.ts
new file mode 100644
index 0000000000..16cd44678f
--- /dev/null
+++ b/packages/@n8n/chat/src/types/webhook.ts
@@ -0,0 +1,17 @@
+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;
+}
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 0000000000..f6ffc597f5
--- /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 0000000000..b0d37298b5
--- /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 0000000000..214bd98c4f
--- /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 0000000000..358588b852
--- /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 0000000000..62241dacbb
--- /dev/null
+++ b/packages/@n8n/chat/vite.config.ts
@@ -0,0 +1,53 @@
+import { fileURLToPath, URL } from 'node:url';
+
+import { defineConfig } from 'vite';
+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));
+
+// https://vitejs.dev/config/
+export default defineConfig({
+	plugins: [
+		vue(),
+		icons({
+			compiler: 'vue3',
+		}),
+		dts(),
+	],
+	resolve: {
+		alias: {
+			'@': srcPath,
+			'@n8n/chat': srcPath,
+		},
+	},
+	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 0000000000..cda2fb7867
--- /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
index 825e65949a..c3fe283453 100644
--- a/packages/@n8n/client-oauth2/.eslintrc.js
+++ b/packages/@n8n/client-oauth2/.eslintrc.js
@@ -10,5 +10,6 @@ module.exports = {
 
 	rules: {
 		'@typescript-eslint/consistent-type-imports': 'error',
+		'n8n-local-rules/no-plain-errors': 'off',
 	},
 };
diff --git a/packages/@n8n/client-oauth2/package.json b/packages/@n8n/client-oauth2/package.json
index 9456c44c60..85d24f69c8 100644
--- a/packages/@n8n/client-oauth2/package.json
+++ b/packages/@n8n/client-oauth2/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@n8n/client-oauth2",
-  "version": "0.8.0",
+  "version": "0.12.0",
   "scripts": {
     "clean": "rimraf dist .turbo",
     "dev": "pnpm watch",
@@ -20,6 +20,6 @@
     "dist/**/*"
   ],
   "dependencies": {
-    "axios": "^0.21.1"
+    "axios": "1.6.2"
   }
 }
diff --git a/packages/@n8n/client-oauth2/src/ClientOAuth2.ts b/packages/@n8n/client-oauth2/src/ClientOAuth2.ts
index 87178255e9..b41c68686c 100644
--- a/packages/@n8n/client-oauth2/src/ClientOAuth2.ts
+++ b/packages/@n8n/client-oauth2/src/ClientOAuth2.ts
@@ -1,6 +1,5 @@
 /* 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';
@@ -26,6 +25,7 @@ export interface ClientOAuth2Options {
 	clientId: string;
 	clientSecret?: string;
 	accessTokenUri: string;
+	authentication?: 'header' | 'body';
 	authorizationUri?: string;
 	redirectUri?: string;
 	scopes?: string[];
diff --git a/packages/@n8n/client-oauth2/src/CredentialsFlow.ts b/packages/@n8n/client-oauth2/src/CredentialsFlow.ts
index d83450a412..f1ccc256e7 100644
--- a/packages/@n8n/client-oauth2/src/CredentialsFlow.ts
+++ b/packages/@n8n/client-oauth2/src/CredentialsFlow.ts
@@ -1,9 +1,12 @@
-import type { ClientOAuth2, ClientOAuth2Options } from './ClientOAuth2';
+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;
 }
@@ -19,10 +22,11 @@ export class CredentialsFlow {
 	/**
 	 * Request an access token using the client credentials.
 	 */
-	async getToken(opts?: Partial<ClientOAuth2Options>): Promise<ClientOAuth2Token> {
-		const options = { ...this.client.options, ...opts };
+	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',
 		};
@@ -31,15 +35,21 @@ export class CredentialsFlow {
 			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: {
-					...DEFAULT_HEADERS,
-					// eslint-disable-next-line @typescript-eslint/naming-convention
-					Authorization: auth(options.clientId, options.clientSecret),
-				},
+				headers,
 				body,
 			},
 			options,
diff --git a/packages/@n8n/client-oauth2/src/index.ts b/packages/@n8n/client-oauth2/src/index.ts
index 376c10f1ee..aa19a0f66d 100644
--- a/packages/@n8n/client-oauth2/src/index.ts
+++ b/packages/@n8n/client-oauth2/src/index.ts
@@ -1,2 +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
index f64fcc10c8..69c225d827 100644
--- a/packages/@n8n/client-oauth2/src/types.ts
+++ b/packages/@n8n/client-oauth2/src/types.ts
@@ -1 +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/test/CredentialsFlow.test.ts b/packages/@n8n/client-oauth2/test/CredentialsFlow.test.ts
index 7aee647b25..439d66a4b8 100644
--- a/packages/@n8n/client-oauth2/test/CredentialsFlow.test.ts
+++ b/packages/@n8n/client-oauth2/test/CredentialsFlow.test.ts
@@ -1,4 +1,6 @@
 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';
 
@@ -11,18 +13,24 @@ describe('CredentialsFlow', () => {
 		nock.restore();
 	});
 
+	beforeEach(() => jest.clearAllMocks());
+
 	describe('#getToken', () => {
-		const createAuthClient = (scopes?: string[]) =>
+		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 = (requestedScope?: string) =>
-			nock(config.baseUrl)
+		const mockTokenCall = async ({ requestedScope }: { requestedScope?: string } = {}) => {
+			const nockScope = nock(config.baseUrl)
 				.post(
 					'/login/oauth/access_token',
 					({ scope, grant_type }) =>
@@ -34,10 +42,19 @@ describe('CredentialsFlow', () => {
 					refresh_token: config.refreshToken,
 					scope: requestedScope,
 				});
+			return 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(['notifications']);
-			mockTokenCall('notifications');
+			const authClient = createAuthClient({ scopes: ['notifications'] });
+			const requestPromise = mockTokenCall({ requestedScope: 'notifications' });
 
 			const user = await authClient.credentials.getToken();
 
@@ -45,34 +62,62 @@ describe('CredentialsFlow', () => {
 			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();
-			mockTokenCall();
+			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([]);
-			mockTokenCall('');
+			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(['notifications']);
-				mockTokenCall('notifications');
+				const authClient = createAuthClient({ scopes: ['notifications'] });
+				void mockTokenCall({ requestedScope: 'notifications' });
 
 				const token = await authClient.credentials.getToken();
 				const requestOptions = token.sign({
@@ -99,8 +144,8 @@ describe('CredentialsFlow', () => {
 					});
 
 			it('should make a request to get a new access token', async () => {
-				const authClient = createAuthClient(['notifications']);
-				mockTokenCall('notifications');
+				const authClient = createAuthClient({ scopes: ['notifications'] });
+				void mockTokenCall({ requestedScope: 'notifications' });
 
 				const token = await authClient.credentials.getToken();
 				expect(token.accessToken).toEqual(config.accessToken);
diff --git a/packages/@n8n/nodes-langchain/.editorconfig b/packages/@n8n/nodes-langchain/.editorconfig
new file mode 100644
index 0000000000..cff7816e85
--- /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 0000000000..1016c4740b
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/.eslintrc.js
@@ -0,0 +1,154 @@
+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-unused-vars': '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 0000000000..7e72963329
--- /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 0000000000..a7ac611a60
--- /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 0000000000..ebf28d8091
--- /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 0000000000..306a6af39a
--- /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 0000000000..c1d7423975
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/LICENSE.md
@@ -0,0 +1,85 @@
+# License
+
+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".
+- 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 0000000000..e5761628cf
--- /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 0000000000..2ee2aa94dc
--- /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/CohereApi.credentials.ts b/packages/@n8n/nodes-langchain/credentials/CohereApi.credentials.ts
new file mode 100644
index 0000000000..7ad875162a
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/credentials/CohereApi.credentials.ts
@@ -0,0 +1,45 @@
+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/detect-language',
+			method: 'POST',
+			body: {
+				texts: ['hello'],
+			},
+		},
+	};
+}
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 0000000000..853157946f
--- /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 = 'GooglePaLMApi';
+
+	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}}/v1beta3/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 0000000000..9545b1619c
--- /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 0000000000..c5b47b3760
--- /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 0000000000..2a3b3e4640
--- /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 0000000000..acfbbcd3f9
--- /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 0000000000..a4f0be5e9c
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/credentials/PineconeApi.credentials.ts
@@ -0,0 +1,50 @@
+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: '',
+		},
+		{
+			displayName: 'Environment',
+			name: 'environment',
+			type: 'string',
+			required: true,
+			default: 'us-central1-gcp',
+		},
+	];
+
+	authenticate: IAuthenticateGeneric = {
+		type: 'generic',
+		properties: {
+			headers: {
+				'Api-Key': '={{$credentials.apiKey}}',
+			},
+		},
+	};
+
+	test: ICredentialTestRequest = {
+		request: {
+			baseURL: '=https://controller.{{$credentials.environment}}.pinecone.io/databases',
+			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 0000000000..25c1bec32a
--- /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 0000000000..a1ab3a55c4
--- /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 0000000000..642161c462
--- /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 0000000000..0d66cdf89b
--- /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 0000000000..3d5758ae22
--- /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/gulpfile.js b/packages/@n8n/nodes-langchain/gulpfile.js
new file mode 100644
index 0000000000..831c707540
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/gulpfile.js
@@ -0,0 +1,16 @@
+const path = require('path');
+const { task, src, dest } = require('gulp');
+
+task('build:icons', copyIcons);
+
+function copyIcons() {
+	const nodeSource = path.resolve('nodes', '**', '*.{png,svg}');
+	const nodeDestination = path.resolve('dist', 'nodes');
+
+	src(nodeSource).pipe(dest(nodeDestination));
+
+	const credSource = path.resolve('credentials', '**', '*.{png,svg}');
+	const credDestination = path.resolve('dist', 'credentials');
+
+	return src(credSource).pipe(dest(credDestination));
+}
diff --git a/packages/@n8n/nodes-langchain/index.js b/packages/@n8n/nodes-langchain/index.js
new file mode 100644
index 0000000000..e69de29bb2
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 0000000000..49fa322f5d
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/Agent.node.ts
@@ -0,0 +1,268 @@
+import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
+import type {
+	ConnectionTypes,
+	INodeInputConfiguration,
+	INodeInputFilter,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeType,
+	INodeTypeDescription,
+} from 'n8n-workflow';
+import { getTemplateNoticeField } from '../../../utils/sharedFields';
+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',
+): Array<ConnectionTypes | INodeInputConfiguration> {
+	interface SpecialInput {
+		type: ConnectionTypes;
+		filter?: INodeInputFilter;
+	}
+
+	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 }) => {
+			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.lmChatOllama',
+						'@n8n/n8n-nodes-langchain.lmChatOpenAi',
+						'@n8n/n8n-nodes-langchain.lmChatGooglePalm',
+						'@n8n/n8n-nodes-langchain.lmChatMistralCloud',
+					],
+				},
+			},
+			{
+				type: NodeConnectionType.AiMemory,
+			},
+			{
+				type: NodeConnectionType.AiTool,
+			},
+			{
+				type: NodeConnectionType.AiOutputParser,
+			},
+		];
+	} else if (agent === 'openAiFunctionsAgent') {
+		specialInputs = [
+			{
+				type: NodeConnectionType.AiLanguageModel,
+				filter: {
+					nodes: ['@n8n/n8n-nodes-langchain.lmChatOpenAi'],
+				},
+			},
+			{
+				type: NodeConnectionType.AiMemory,
+			},
+			{
+				type: NodeConnectionType.AiTool,
+			},
+			{
+				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,
+			},
+		];
+	} else if (agent === 'planAndExecuteAgent') {
+		specialInputs = [
+			{
+				type: NodeConnectionType.AiLanguageModel,
+			},
+			{
+				type: NodeConnectionType.AiTool,
+			},
+			{
+				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],
+		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' }[$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) => { ${getInputs.toString()}; return getInputs(agent) })($parameter.agent) }}`,
+		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',
+			},
+
+			...conversationalAgentProperties,
+			...openAiFunctionsAgentProperties,
+			...reActAgentAgentProperties,
+			...sqlAgentAgentProperties,
+			...planAndExecuteAgentProperties,
+		],
+	};
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		const agentType = this.getNodeParameter('agent', 0, '') as string;
+
+		if (agentType === 'conversationalAgent') {
+			return conversationalAgentExecute.call(this);
+		} else if (agentType === 'openAiFunctionsAgent') {
+			return openAiFunctionsAgentExecute.call(this);
+		} else if (agentType === 'reActAgent') {
+			return reActAgentAgentExecute.call(this);
+		} else if (agentType === 'sqlAgent') {
+			return sqlAgentAgentExecute.call(this);
+		} else if (agentType === 'planAndExecuteAgent') {
+			return planAndExecuteAgentExecute.call(this);
+		}
+
+		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 0000000000..c3507b328c
--- /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 0000000000..abc820b325
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ConversationalAgent/execute.ts
@@ -0,0 +1,106 @@
+import {
+	type IExecuteFunctions,
+	type INodeExecutionData,
+	NodeConnectionType,
+	NodeOperationError,
+} from 'n8n-workflow';
+
+import { initializeAgentExecutorWithOptions } from 'langchain/agents';
+import { BaseChatModel } from 'langchain/chat_models/base';
+import type { Tool } from 'langchain/tools';
+import type { BaseChatMemory } from 'langchain/memory';
+import type { BaseOutputParser } from 'langchain/schema/output_parser';
+import { PromptTemplate } from 'langchain/prompts';
+import { CombiningOutputParser } from 'langchain/output_parsers';
+
+export async function conversationalAgentExecute(
+	this: IExecuteFunctions,
+): Promise<INodeExecutionData[][]> {
+	this.logger.verbose('Executing Conversational Agent');
+
+	const model = (await this.getInputConnectionData(
+		NodeConnectionType.AiLanguageModel,
+		0,
+	)) as BaseChatModel;
+
+	if (!(model instanceof BaseChatModel)) {
+		throw new NodeOperationError(this.getNode(), 'Conversational Agent requires Chat Model');
+	}
+
+	const memory = (await this.getInputConnectionData(NodeConnectionType.AiMemory, 0)) as
+		| BaseChatMemory
+		| undefined;
+	const tools = (await this.getInputConnectionData(NodeConnectionType.AiTool, 0)) as Tool[];
+	const outputParsers = (await this.getInputConnectionData(
+		NodeConnectionType.AiOutputParser,
+		0,
+	)) as BaseOutputParser[];
+
+	// 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++) {
+		let input = this.getNodeParameter('text', itemIndex) as string;
+
+		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.call({ input, outputParsers });
+
+		if (outputParser) {
+			response = { output: await outputParser.parse(response.output as string) };
+		}
+
+		returnData.push({ json: response });
+	}
+
+	return 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 0000000000..d8706304fa
--- /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 0000000000..40f9ad1945
--- /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 0000000000..e21b5bdf42
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/OpenAiFunctionsAgent/execute.ts
@@ -0,0 +1,105 @@
+import {
+	type IExecuteFunctions,
+	type INodeExecutionData,
+	NodeConnectionType,
+	NodeOperationError,
+} from 'n8n-workflow';
+
+import type { AgentExecutorInput } from 'langchain/agents';
+import { AgentExecutor, OpenAIAgent } from 'langchain/agents';
+import type { Tool } from 'langchain/tools';
+import type { BaseOutputParser } from 'langchain/schema/output_parser';
+import { PromptTemplate } from 'langchain/prompts';
+import { CombiningOutputParser } from 'langchain/output_parsers';
+import { BufferMemory, type BaseChatMemory } from 'langchain/memory';
+import { ChatOpenAI } from 'langchain/chat_models/openai';
+
+export async function openAiFunctionsAgentExecute(
+	this: IExecuteFunctions,
+): 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 this.getInputConnectionData(NodeConnectionType.AiTool, 0)) as Tool[];
+	const outputParsers = (await this.getInputConnectionData(
+		NodeConnectionType.AiOutputParser,
+		0,
+	)) as BaseOutputParser[];
+	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++) {
+		let input = this.getNodeParameter('text', itemIndex) as string;
+
+		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.call({ input, outputParsers });
+
+		if (outputParser) {
+			response = { output: await outputParser.parse(response.output as string) };
+		}
+
+		returnData.push({ json: response });
+	}
+
+	return 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 0000000000..47e6c783f3
--- /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 0000000000..a710a786b9
--- /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 0000000000..e1e031b85a
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/PlanAndExecuteAgent/execute.ts
@@ -0,0 +1,80 @@
+import {
+	type IExecuteFunctions,
+	type INodeExecutionData,
+	NodeConnectionType,
+	NodeOperationError,
+} from 'n8n-workflow';
+
+import type { Tool } from 'langchain/tools';
+import type { BaseOutputParser } from 'langchain/schema/output_parser';
+import { PromptTemplate } from 'langchain/prompts';
+import { CombiningOutputParser } from 'langchain/output_parsers';
+import type { BaseChatModel } from 'langchain/chat_models/base';
+import { PlanAndExecuteAgentExecutor } from 'langchain/experimental/plan_and_execute';
+
+export async function planAndExecuteAgentExecute(
+	this: IExecuteFunctions,
+): Promise<INodeExecutionData[][]> {
+	this.logger.verbose('Executing PlanAndExecute Agent');
+	const model = (await this.getInputConnectionData(
+		NodeConnectionType.AiLanguageModel,
+		0,
+	)) as BaseChatModel;
+
+	const tools = (await this.getInputConnectionData(NodeConnectionType.AiTool, 0)) as Tool[];
+
+	const outputParsers = (await this.getInputConnectionData(
+		NodeConnectionType.AiOutputParser,
+		0,
+	)) as BaseOutputParser[];
+
+	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++) {
+		let input = this.getNodeParameter('text', itemIndex) as string;
+
+		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.call({ input, outputParsers });
+
+		if (outputParser) {
+			response = { output: await outputParser.parse(response.output as string) };
+		}
+
+		returnData.push({ json: response });
+	}
+
+	return 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 0000000000..cd1f964fd1
--- /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 0000000000..f95026f7a4
--- /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 0000000000..0366fedf73
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ReActAgent/execute.ts
@@ -0,0 +1,98 @@
+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 { Tool } from 'langchain/tools';
+import type { BaseOutputParser } from 'langchain/schema/output_parser';
+import { PromptTemplate } from 'langchain/prompts';
+import { CombiningOutputParser } from 'langchain/output_parsers';
+import { BaseChatModel } from 'langchain/chat_models/base';
+
+export async function reActAgentAgentExecute(
+	this: IExecuteFunctions,
+): Promise<INodeExecutionData[][]> {
+	this.logger.verbose('Executing ReAct Agent');
+
+	const model = (await this.getInputConnectionData(NodeConnectionType.AiLanguageModel, 0)) as
+		| BaseLanguageModel
+		| BaseChatModel;
+
+	const tools = (await this.getInputConnectionData(NodeConnectionType.AiTool, 0)) as Tool[];
+
+	const outputParsers = (await this.getInputConnectionData(
+		NodeConnectionType.AiOutputParser,
+		0,
+	)) as BaseOutputParser[];
+
+	const options = this.getNodeParameter('options', 0, {}) as {
+		prefix?: string;
+		suffix?: string;
+		suffixChat?: string;
+		humanMessageTemplate?: string;
+		returnIntermediateSteps?: boolean;
+	};
+	let agent: ChatAgent | ZeroShotAgent;
+
+	if (model instanceof BaseChatModel) {
+		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++) {
+		let input = this.getNodeParameter('text', itemIndex) as string;
+
+		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.call({ input, outputParsers });
+		if (outputParser) {
+			response = { output: await outputParser.parse(response.output as string) };
+		}
+
+		returnData.push({ json: response });
+	}
+
+	return 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 0000000000..274a95629e
--- /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 0000000000..9b6180a8c2
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/description.ts
@@ -0,0 +1,114 @@
+import type { INodeProperties } from 'n8n-workflow';
+import { SQL_PREFIX, SQL_SUFFIX } from './other/prompts';
+
+export const sqlAgentAgentProperties: 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',
+			},
+		],
+	},
+	{
+		displayName: 'Prompt',
+		name: 'input',
+		type: 'string',
+		displayOptions: {
+			show: {
+				agent: ['sqlAgent'],
+			},
+		},
+		default: '',
+		required: true,
+		typeOptions: {
+			rows: 5,
+		},
+	},
+	{
+		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 0000000000..faa3c4b609
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/execute.ts
@@ -0,0 +1,105 @@
+import {
+	type IExecuteFunctions,
+	type INodeExecutionData,
+	NodeConnectionType,
+	NodeOperationError,
+} 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/dist/base_language';
+import type { DataSource } from 'typeorm';
+
+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,
+): 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++) {
+		const item = items[i];
+		const input = this.getNodeParameter('input', i) as string;
+
+		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',
+				);
+			}
+
+			dataSource = getSqliteDataSource.call(this, item.binary);
+		}
+
+		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,
+		};
+
+		const dbInstance = await SqlDatabase.fromDataSourceParams({
+			appDataSource: dataSource,
+			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 response = await agentExecutor.call({ input, signal: this.getExecutionCancelSignal() });
+
+		returnData.push({ json: response });
+	}
+
+	return 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 0000000000..f04c844248
--- /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 '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 0000000000..9688ed6e65
--- /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 '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 0000000000..a80027ea9f
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/other/handlers/sqlite.ts
@@ -0,0 +1,38 @@
+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 'typeorm';
+
+export function getSqliteDataSource(
+	this: IExecuteFunctions,
+	binary: INodeExecutionData['binary'],
+): DataSource {
+	const binaryData = binary?.data;
+
+	if (!binaryData) {
+		throw new NodeOperationError(this.getNode(), 'No binary data received.');
+	}
+
+	const bufferString = Buffer.from(binaryData.data, 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 0000000000..445824c2dd
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/other/prompts.ts
@@ -0,0 +1,18 @@
+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!
+
+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 0000000000..22234ae584
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/agents/OpenAiAssistant/OpenAiAssistant.node.ts
@@ -0,0 +1,385 @@
+import { AgentExecutor } from 'langchain/agents';
+import { OpenAI as OpenAIClient } from 'openai';
+import { OpenAIAssistantRunnable } from 'langchain/experimental/openai_assistant';
+import { type Tool } from 'langchain/tools';
+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 { formatToOpenAIAssistantTool } from './utils';
+
+export class OpenAiAssistant implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'OpenAI Assistant',
+		name: 'openAiAssistant',
+		icon: 'fa:robot',
+		group: ['transform'],
+		version: 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 tools = (await this.getInputConnectionData(NodeConnectionType.AiTool, 0)) as Tool[];
+		const credentials = await this.getCredentials('openAiApi');
+
+		const items = this.getInputData();
+		const returnData: INodeExecutionData[] = [];
+
+		for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
+			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.call({
+				content: input,
+				signal: this.getExecutionCancelSignal(),
+				timeout: options.timeout ?? 10000,
+			});
+
+			returnData.push({ json: response });
+		}
+
+		return 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 0000000000..575444193c
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/agents/OpenAiAssistant/utils.ts
@@ -0,0 +1,47 @@
+import { zodToJsonSchema } from 'zod-to-json-schema';
+import type { OpenAI as OpenAIClient } from 'openai';
+import type { StructuredTool } from 'langchain/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.AssistantCreateParams.AssistantToolsFunction {
+	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 0000000000..d181dfa1f8
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/chains/ChainLLM/ChainLlm.node.ts
@@ -0,0 +1,509 @@
+import { ApplicationError, NodeConnectionType, NodeOperationError } from 'n8n-workflow';
+import type {
+	IBinaryData,
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeType,
+	INodeTypeDescription,
+} from 'n8n-workflow';
+
+import type { BaseLanguageModel } from 'langchain/base_language';
+import {
+	AIMessagePromptTemplate,
+	PromptTemplate,
+	SystemMessagePromptTemplate,
+	HumanMessagePromptTemplate,
+	ChatPromptTemplate,
+} from 'langchain/prompts';
+import type { BaseOutputParser } from 'langchain/schema/output_parser';
+import { CombiningOutputParser } from 'langchain/output_parsers';
+import { LLMChain } from 'langchain/chains';
+import { BaseChatModel } from 'langchain/chat_models/base';
+import { HumanMessage } from 'langchain/schema';
+import { getTemplateNoticeField } from '../../../utils/sharedFields';
+
+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);
+	return new HumanMessage({
+		content: [
+			{
+				type: 'image_url',
+				image_url: {
+					url: `data:image/jpeg;base64,${bufferData.toString('base64')}`,
+					detail,
+				},
+			},
+		],
+	});
+}
+
+async function getChainPromptTemplate(
+	context: IExecuteFunctions,
+	itemIndex: number,
+	llm: BaseLanguageModel | BaseChatModel,
+	messages?: MessagesTemplate[],
+	formatInstructions?: string,
+) {
+	const queryTemplate = new PromptTemplate({
+		template: `{query}${formatInstructions ? '\n{formatInstructions}' : ''}`,
+		inputVariables: ['query'],
+		partialVariables: formatInstructions ? { formatInstructions } : undefined,
+	});
+
+	if (llm instanceof BaseChatModel) {
+		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;
+			}),
+		);
+
+		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,
+	});
+	const response = (await chain.call({
+		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,
+	);
+
+	// If there are no output parsers, create a simple LLM chain and execute the query
+	if (!outputParsers.length) {
+		return 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,
+	);
+
+	const chain = prompt.pipe(llm).pipe(combinedOutputParser);
+
+	const response = (await chain.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.1 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],
+		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: '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: 'Require Specific Output Format',
+				name: 'hasOutputParser',
+				type: 'boolean',
+				default: false,
+				displayOptions: {
+					show: {
+						'@version': [1.2],
+					},
+				},
+			},
+			{
+				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;
+
+		let outputParsers: BaseOutputParser[] = [];
+
+		if (this.getNodeParameter('hasOutputParser', 0, true) === true) {
+			outputParsers = (await this.getInputConnectionData(
+				NodeConnectionType.AiOutputParser,
+				0,
+			)) as BaseOutputParser[];
+		}
+
+		for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
+			const prompt = this.getNodeParameter('prompt', itemIndex) as string;
+			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,
+				});
+			});
+		}
+
+		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 0000000000..4c4637fcd6
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/chains/ChainRetrievalQA/ChainRetrievalQa.node.ts
@@ -0,0 +1,131 @@
+import {
+	NodeConnectionType,
+	type IExecuteFunctions,
+	type INodeExecutionData,
+	type INodeType,
+	type INodeTypeDescription,
+	NodeOperationError,
+} from 'n8n-workflow';
+
+import { RetrievalQAChain } from 'langchain/chains';
+import type { BaseLanguageModel } from 'langchain/dist/base_language';
+import type { BaseRetriever } from 'langchain/schema/retriever';
+import { getTemplateNoticeField } from '../../../utils/sharedFields';
+
+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],
+		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],
+					},
+				},
+			},
+		],
+	};
+
+	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++) {
+			const query = this.getNodeParameter('query', itemIndex) as string;
+
+			if (query === undefined) {
+				throw new NodeOperationError(this.getNode(), 'The ‘query‘ parameter is empty.');
+			}
+
+			const response = await chain.call({ query });
+			returnData.push({ json: { response } });
+		}
+		return 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 0000000000..8cc64c6e4f
--- /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 0000000000..79347087af
--- /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/dist/base_language';
+import type { Document } from 'langchain/document';
+import { PromptTemplate } from 'langchain/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 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 0000000000..784406b156
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/chains/ChainSummarization/V2/ChainSummarizationV2.node.ts
@@ -0,0 +1,420 @@
+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/dist/base_language';
+import type { Document } from 'langchain/document';
+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';
+
+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: 'Final Prompt to Combine',
+											name: 'combineMapPrompt',
+											type: 'string',
+											hint: 'The prompt to combine individual summaries',
+											displayOptions: {
+												hide: {
+													'/options.summarizationMethodAndPrompts.values.summarizationMethod': [
+														'stuff',
+														'refine',
+													],
+												},
+											},
+											default: DEFAULT_PROMPT_TEMPLATE,
+											typeOptions: {
+												rows: 9,
+											},
+										},
+										{
+											displayName: 'Individual Summary Prompt',
+											name: 'prompt',
+											type: 'string',
+											default: DEFAULT_PROMPT_TEMPLATE,
+											hint: 'The prompt to summarize an individual document (or chunk)',
+											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++) {
+			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.call({
+					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 } });
+			}
+		}
+
+		return 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 0000000000..e24e21b77f
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/chains/ChainSummarization/helpers.ts
@@ -0,0 +1,72 @@
+import type { SummarizationChainParams } from 'langchain/chains';
+import { PromptTemplate } from 'langchain/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 0000000000..4908d59715
--- /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 0000000000..a54b982cd8
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/code/Code.node.ts
@@ -0,0 +1,367 @@
+/* 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/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/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();`;
+
+export const vmResolver = makeResolverFromLegacyOptions({
+	external: {
+		modules: external ? ['langchain', ...external.split(',')] : ['langchain'],
+		transitive: false,
+	},
+	resolve(moduleName, parentDirname) {
+		if (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.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: 'codeNodeEditor',
+									editorLanguage: 'javaScript',
+								},
+								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: 'codeNodeEditor',
+									editorLanguage: 'javaScript',
+								},
+								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 0000000000..7dfce64a50
--- /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 0000000000..de9db5cae9
--- /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 0000000000..cb9d66ac9d
--- /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 0000000000..de9db5cae9
--- /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 0000000000..2d640d9818
--- /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: 'recursive',
+						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 0000000000..629e53dc25
--- /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 0000000000..2bc1d8025e
--- /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 0000000000..db96b6eb84
--- /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 0000000000..f27591200b
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsAwsBedrock/EmbeddingsAwsBedrock.node.ts
@@ -0,0 +1,133 @@
+/* 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/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',
+							},
+							output: {
+								postReceive: [
+									{
+										type: 'rootProperty',
+										properties: {
+											property: 'modelSummaries',
+										},
+									},
+									{
+										type: 'filter',
+										properties: {
+											// There isn't a good way to filter embedding models, so we atleast filter-out the default non-embedding ones
+											pass: "={{ !'anthropic.claude-instant-v1-100k,anthropic.claude-v2,amazon.titan-text-express-v1'.match($responseItem.modelId) }}",
+										},
+									},
+									{
+										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 0000000000..33c91d8661
--- /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/EmbeddingsCohere/EmbeddingsCohere.node.ts b/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsCohere/EmbeddingsCohere.node.ts
new file mode 100644
index 0000000000..0186bb8256
--- /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/embeddings/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,
+			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 0000000000..5311832f19
--- /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/EmbeddingsGooglePalm/EmbeddingsGooglePalm.node.ts b/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsGooglePalm/EmbeddingsGooglePalm.node.ts
new file mode 100644
index 0000000000..7059eb6e15
--- /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/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 0000000000..38f3c22592
--- /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 0000000000..a2fc288b63
--- /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/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 0000000000..8f9b152632
--- /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 0000000000..d8223a2ffe
--- /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 0000000000..928faf4518
--- /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/EmbeddingsOpenAI/EmbeddingsOpenAi.node.ts b/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsOpenAI/EmbeddingsOpenAi.node.ts
new file mode 100644
index 0000000000..8154559412
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsOpenAI/EmbeddingsOpenAi.node.ts
@@ -0,0 +1,128 @@
+/* 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 'openai';
+import { OpenAIEmbeddings } from 'langchain/embeddings/openai';
+import { logWrapper } from '../../../utils/logWrapper';
+import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+
+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'],
+		properties: [
+			getConnectionHintNoticeField([NodeConnectionType.AiVectorStore]),
+			{
+				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(
+			{
+				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 0000000000..73d7895782
--- /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 0000000000..cdadbdfabf
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LMChatAnthropic/LmChatAnthropic.node.ts
@@ -0,0 +1,141 @@
+/* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import {
+	NodeConnectionType,
+	type IExecuteFunctions,
+	type INodeType,
+	type INodeTypeDescription,
+	type SupplyData,
+} from 'n8n-workflow';
+
+import { ChatAnthropic } from 'langchain/chat_models/anthropic';
+import { logWrapper } from '../../../utils/logWrapper';
+import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+
+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,
+		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/',
+					},
+				],
+			},
+		},
+		// 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]),
+			{
+				displayName: 'Model',
+				name: 'model',
+				type: 'options',
+				options: [
+					{
+						name: 'Claude 2',
+						value: 'claude-2',
+					},
+					{
+						name: 'Claude 2.1',
+						value: 'claude-2.1',
+					},
+					{
+						name: 'Claude Instant 1.2',
+						value: 'claude-instant-1.2',
+					},
+					{
+						name: 'Claude Instant 1',
+						value: 'claude-instant-1',
+					},
+				],
+				description:
+					'The model which will generate the completion. <a href="https://docs.anthropic.com/claude/reference/selecting-a-model">Learn more</a>.',
+				default: 'claude-2',
+			},
+			{
+				displayName: 'Options',
+				name: 'options',
+				placeholder: 'Add Option',
+				description: 'Additional options to add',
+				type: 'collection',
+				default: {},
+				options: [
+					{
+						displayName: 'Maximum Number of Tokens',
+						name: 'maxTokensToSample',
+						default: 32768,
+						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 object;
+
+		const model = new ChatAnthropic({
+			anthropicApiKey: credentials.apiKey as string,
+			modelName,
+			...options,
+		});
+
+		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 0000000000..253e44fd52
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 0000000000..7eee07a207
--- /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 0000000000..0c951ac370
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LMChatOllama/LmChatOllama.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 { ChatOllama } from 'langchain/chat_models/ollama';
+// import { ChatAnthropic } from 'langchain/chat_models/anthropic';
+import { logWrapper } from '../../../utils/logWrapper';
+import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+
+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'],
+		credentials: [
+			{
+				name: 'ollamaApi',
+				required: true,
+			},
+		],
+		requestDefaults: {
+			ignoreHttpStatusErrors: true,
+			baseURL: '={{ $credentials.baseUrl.replace(new RegExp("/$"), "") }}',
+		},
+		properties: [
+			getConnectionHintNoticeField([NodeConnectionType.AiChain, NodeConnectionType.AiAgent]),
+			{
+				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,
+			},
+			{
+				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: -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('ollamaApi');
+
+		const modelName = this.getNodeParameter('model', itemIndex) as string;
+		const options = this.getNodeParameter('options', itemIndex, {}) as object;
+
+		const model = new ChatOllama({
+			baseUrl: credentials.baseUrl as string,
+			model: modelName,
+			...options,
+		});
+
+		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 0000000000..ced4564f6c
--- /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 0000000000..838a526669
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LMChatOpenAi/LmChatOpenAi.node.ts
@@ -0,0 +1,262 @@
+/* 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 'openai';
+import { ChatOpenAI } from 'langchain/chat_models/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 0000000000..73d7895782
--- /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 0000000000..0fb8aed2ca
--- /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/llms/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 0000000000..5311832f19
--- /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 0000000000..b82a86dba4
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LMOllama/LmOllama.node.ts
@@ -0,0 +1,160 @@
+/* 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/llms/ollama';
+import { logWrapper } from '../../../utils/logWrapper';
+import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+
+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'],
+		credentials: [
+			{
+				name: 'ollamaApi',
+				required: true,
+			},
+		],
+		requestDefaults: {
+			ignoreHttpStatusErrors: true,
+			baseURL: '={{ $credentials.baseUrl.replace(new RegExp("/$"), "") }}',
+		},
+		properties: [
+			getConnectionHintNoticeField([NodeConnectionType.AiChain, NodeConnectionType.AiAgent]),
+			{
+				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,
+			},
+			{
+				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: -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('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/ollama.svg b/packages/@n8n/nodes-langchain/nodes/llms/LMOllama/ollama.svg
new file mode 100644
index 0000000000..ced4564f6c
--- /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 0000000000..3f6a94d65e
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LMOpenAi/LmOpenAi.node.ts
@@ -0,0 +1,250 @@
+/* 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 type { ClientOptions } from 'openai';
+import { OpenAI } from 'langchain/llms/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 0000000000..73d7895782
--- /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 0000000000..65fb25fc1d
--- /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/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 0000000000..8f9b152632
--- /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 0000000000..166f0bebed
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LmChatAwsBedrock/LmChatAwsBedrock.node.ts
@@ -0,0 +1,168 @@
+/* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import {
+	NodeConnectionType,
+	type IExecuteFunctions,
+	type INodeType,
+	type INodeTypeDescription,
+	type SupplyData,
+} from 'n8n-workflow';
+import { ChatBedrock } from 'langchain/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',
+							},
+							output: {
+								postReceive: [
+									{
+										type: 'rootProperty',
+										properties: {
+											property: 'modelSummaries',
+										},
+									},
+									{
+										type: 'filter',
+										properties: {
+											// Not a foundational model
+											pass: "={{ !['anthropic.claude-instant-v1-100k'].includes($responseItem.modelId) }}",
+										},
+									},
+									{
+										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 ChatBedrock({
+			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 0000000000..33c91d8661
--- /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/LmChatGooglePalm/LmChatGooglePalm.node.ts b/packages/@n8n/nodes-langchain/nodes/llms/LmChatGooglePalm/LmChatGooglePalm.node.ts
new file mode 100644
index 0000000000..b250c6be70
--- /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/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 0000000000..38f3c22592
--- /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/LmChatMistralCloud/LmChatMistralCloud.node.ts b/packages/@n8n/nodes-langchain/nodes/llms/LmChatMistralCloud/LmChatMistralCloud.node.ts
new file mode 100644
index 0000000000..a23ab4c0c1
--- /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 0000000000..928faf4518
--- /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 0000000000..9b88fd3fca
--- /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/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 0000000000..38f3c22592
--- /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 0000000000..3cf6ff66f8
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/memory/MemoryBufferWindow/MemoryBufferWindow.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 type { BufferWindowMemoryInput } from 'langchain/memory';
+import { BufferWindowMemory } from 'langchain/memory';
+import { logWrapper } from '../../../utils/logWrapper';
+import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+
+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],
+		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],
+					},
+				},
+			},
+			{
+				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 sessionKey = this.getNodeParameter('sessionKey', itemIndex) as string;
+		const contextWindowLength = this.getNodeParameter('contextWindowLength', itemIndex) as number;
+		const workflowId = this.getWorkflow().id;
+		const memoryInstance = MemoryChatBufferSingleton.getInstance();
+
+		const memory = await memoryInstance.getMemory(`${workflowId}__${sessionKey}`, {
+			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 0000000000..f3adf3e92b
--- /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/memory';
+import type { BaseMessage } from 'langchain/schema';
+
+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.memorychatretriever/',
+					},
+				],
+			},
+		},
+		// 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 this.prepareOutputData(simplifyMessages(messages));
+		}
+
+		const serializedMessages =
+			messages?.map((message) => {
+				const serializedMessage = message.toJSON();
+				return { json: serializedMessage as unknown as IDataObject };
+			}) ?? [];
+
+		return 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 0000000000..8c196673b1
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/memory/MemoryManager/MemoryManager.node.ts
@@ -0,0 +1,329 @@
+/* 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/memory';
+import { AIMessage, SystemMessage, HumanMessage, type BaseMessage } from 'langchain/schema';
+
+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;
+}
+
+export class MemoryManager implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Chat Memory Manager',
+		name: 'memoryManager',
+		icon: 'fa:database',
+		group: ['transform'],
+		version: 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'],
+					},
+				},
+			},
+		],
+	};
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		const memory = (await this.getInputConnectionData(
+			NodeConnectionType.AiMemory,
+			0,
+		)) as BaseChatMemory;
+
+		const items = this.getInputData();
+		const result = [];
+		for (let i = 0; i < items.length; i++) {
+			const mode = this.getNodeParameter('mode', i) as 'load' | 'insert' | 'delete';
+
+			let 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();
+				}
+			}
+
+			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);
+				}
+			}
+
+			// Refresh messages from memory
+			messages = await memory.chatHistory.getMessages();
+
+			const simplifyOutput = this.getNodeParameter('simplifyOutput', i, false) as boolean;
+			if (simplifyOutput && messages) {
+				return [
+					this.helpers.constructExecutionMetaData(
+						this.helpers.returnJsonArray(simplifyMessages(messages)),
+						{ itemData: { item: i } },
+					),
+				];
+			}
+			const serializedMessages = messages?.map((message) => message.toJSON()) ?? [];
+
+			const executionData = this.helpers.constructExecutionMetaData(
+				this.helpers.returnJsonArray(serializedMessages as unknown as IDataObject[]),
+				{ itemData: { item: i } },
+			);
+			result.push(...executionData);
+		}
+
+		return this.prepareOutputData(result);
+	}
+}
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 0000000000..cc3a030c36
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/memory/MemoryMotorhead/MemoryMotorhead.node.ts
@@ -0,0 +1,100 @@
+/* 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/memory';
+import { logWrapper } from '../../../utils/logWrapper';
+import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+
+export class MemoryMotorhead implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Motorhead',
+		name: 'memoryMotorhead',
+		icon: 'fa:file-export',
+		group: ['transform'],
+		version: [1, 1.1],
+		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],
+					},
+				},
+			},
+		],
+	};
+
+	async supplyData(this: IExecuteFunctions, itemIndex: number): Promise<SupplyData> {
+		const credentials = await this.getCredentials('motorheadApi');
+
+		const 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 0000000000..788fe38849
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/memory/MemoryRedisChat/MemoryRedisChat.node.ts
@@ -0,0 +1,143 @@
+/* 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/stores/message/redis';
+import { RedisChatMessageHistory } from 'langchain/stores/message/redis';
+import type { RedisClientOptions } from 'redis';
+import { createClient } from 'redis';
+import { logWrapper } from '../../../utils/logWrapper';
+import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+
+export class MemoryRedisChat implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Redis Chat Memory',
+		name: 'memoryRedisChat',
+		icon: 'file:redis.svg',
+		group: ['transform'],
+		version: [1, 1.1],
+		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],
+					},
+				},
+			},
+			{
+				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 sessionKey = this.getNodeParameter('sessionKey', itemIndex) as string;
+		const sessionTTL = this.getNodeParameter('sessionTTL', itemIndex, 0) as number;
+
+		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: sessionKey,
+		};
+
+		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 0000000000..beb6ad40da
--- /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 0000000000..f2f3016daf
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/memory/MemoryXata/MemoryXata.node.ts
@@ -0,0 +1,113 @@
+/* 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/stores/message/xata';
+import { BufferMemory } from 'langchain/memory';
+import { BaseClient } from '@xata.io/client';
+import { logWrapper } from '../../../utils/logWrapper';
+import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+export class MemoryXata implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Xata',
+		name: 'memoryXata',
+		icon: 'file:xata.svg',
+		group: ['transform'],
+		version: [1, 1.1],
+		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],
+					},
+				},
+			},
+		],
+	};
+
+	async supplyData(this: IExecuteFunctions, itemIndex: number): Promise<SupplyData> {
+		const credentials = await this.getCredentials('xataApi');
+
+		const xataClient = new BaseClient({
+			apiKey: credentials.apiKey as string,
+			branch: (credentials.branch as string) || 'main',
+			databaseURL: credentials.databaseEndpoint as string,
+		});
+
+		const sessionId = this.getNodeParameter('sessionId', itemIndex) 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 memory = new BufferMemory({
+			chatHistory: new XataChatMessageHistory({
+				table: table[1],
+				sessionId,
+				client: xataClient,
+				apiKey: credentials.apiKey as string,
+			}),
+			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 0000000000..546596b3e4
--- /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 0000000000..d1b0d87ba5
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/memory/MemoryZep/MemoryZep.node.ts
@@ -0,0 +1,101 @@
+/* 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/memory/zep';
+import { logWrapper } from '../../../utils/logWrapper';
+import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+
+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],
+		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],
+					},
+				},
+			},
+		],
+	};
+
+	async supplyData(this: IExecuteFunctions, itemIndex: number): Promise<SupplyData> {
+		const credentials = (await this.getCredentials('zepApi')) as {
+			apiKey?: string;
+			apiUrl: string;
+		};
+
+		// TODO: Should it get executed once per item or not?
+		const 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 0000000000..12d5d975ff
Binary files /dev/null and b/packages/@n8n/nodes-langchain/nodes/memory/MemoryZep/zep.png differ
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 0000000000..0e49591348
--- /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/schema/output_parser';
+import type { BaseLanguageModel } from 'langchain/base_language';
+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 0000000000..ec2173f924
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/output_parser/OutputParserItemList/ItemListOutputParser.ts
@@ -0,0 +1,51 @@
+import { BaseOutputParser, OutputParserException } from 'langchain/schema/output_parser';
+
+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 0000000000..24327b2970
--- /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 0000000000..568590db19
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/output_parser/OutputParserStructured/OutputParserStructured.node.ts
@@ -0,0 +1,165 @@
+/* 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 { parseSchema } from 'json-schema-to-zod';
+import { z } from 'zod';
+import type { JSONSchema7 } from 'json-schema';
+import { StructuredOutputParser } from 'langchain/output_parsers';
+import { OutputParserException } from 'langchain/schema/output_parser';
+import get from 'lodash/get';
+import { logWrapper } from '../../../utils/logWrapper';
+import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+
+const STRUCTURED_OUTPUT_KEY = '__structured__output';
+const STRUCTURED_OUTPUT_OBJECT_KEY = '__structured__output__object';
+const STRUCTURED_OUTPUT_ARRAY_KEY = '__structured__output__array';
+
+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 fromZedJsonSchema(
+		schema: JSONSchema7,
+	): StructuredOutputParser<z.ZodType<object, z.ZodTypeDef, object>> {
+		// Make sure to remove the description from root schema
+		const { description, ...restOfSchema } = schema;
+
+		const zodSchemaString = parseSchema(restOfSchema as JSONSchema7);
+
+		// TODO: This is obviously not great and should be replaced later!!!
+		// eslint-disable-next-line @typescript-eslint/no-implied-eval
+		const itemSchema = new Function('z', `return (${zodSchemaString})`)(z) as z.ZodSchema<object>;
+
+		const returnSchema = z.object({
+			[STRUCTURED_OUTPUT_KEY]: z
+				.object({
+					[STRUCTURED_OUTPUT_OBJECT_KEY]: itemSchema.optional(),
+					[STRUCTURED_OUTPUT_ARRAY_KEY]: z.array(itemSchema).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],
+					},
+				),
+		});
+
+		return N8nStructuredOutputParser.fromZodSchema(returnSchema);
+	}
+}
+export class OutputParserStructured implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Structured Output Parser',
+		name: 'outputParserStructured',
+		icon: 'fa:code',
+		group: ['transform'],
+		version: 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);
+		} catch (error) {
+			throw new NodeOperationError(this.getNode(), 'Error during parsing of JSON Schema.');
+		}
+
+		const parser = N8nStructuredOutputParser.fromZedJsonSchema(itemSchema);
+
+		return {
+			response: logWrapper(parser, this),
+		};
+	}
+}
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 0000000000..1ab65194ce
--- /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/base_language';
+import type { BaseRetriever } from 'langchain/schema/retriever';
+
+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 0000000000..6939eec609
--- /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/base_language';
+import type { BaseRetriever } from 'langchain/schema/retriever';
+
+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 0000000000..92a33538af
--- /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/vectorstores/base';
+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 0000000000..baa6c39912
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/retrievers/RetrieverWorkflow/RetrieverWorkflow.node.ts
@@ -0,0 +1,394 @@
+/* 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/schema/retriever';
+import { Document } from 'langchain/document';
+
+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 { 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): 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,
+					)) 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 0000000000..8ff294b076
--- /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 0000000000..450276afea
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/text_splitters/TextSplitterRecursiveCharacterTextSplitter/TextSplitterRecursiveCharacterTextSplitter.node.ts
@@ -0,0 +1,80 @@
+/* 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 } from 'langchain/text_splitter';
+import { RecursiveCharacterTextSplitter } from 'langchain/text_splitter';
+import { logWrapper } from '../../../utils/logWrapper';
+import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+
+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,
+			},
+		],
+	};
+
+	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 params: RecursiveCharacterTextSplitterParams = {
+			// TODO: These are the default values, should we allow the user to change them?
+			separators: ['\n\n', '\n', ' ', ''],
+			chunkSize,
+			chunkOverlap,
+			keepSeparator: false,
+		};
+
+		const 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 0000000000..fd1d8d1b0c
--- /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 0000000000..12af4b3821
--- /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/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 0000000000..b3087ad12c
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/tools/ToolCode/ToolCode.node.ts
@@ -0,0 +1,209 @@
+/* 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/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,
+		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: 'Name',
+				name: 'name',
+				type: 'string',
+				default: '',
+				placeholder: 'My_Tool',
+			},
+			{
+				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: 'codeNodeEditor',
+					editorLanguage: 'javaScript',
+				},
+				default: '',
+				// 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.',
+				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,
+			},
+			{
+				displayName: 'Python',
+				name: 'pythonCode',
+				type: 'string',
+				displayOptions: {
+					show: {
+						language: ['python'],
+					},
+				},
+				typeOptions: {
+					editor: 'codeNodeEditor',
+					editorLanguage: 'python',
+				},
+				default: '',
+				// 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.',
+				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,
+			},
+		],
+	};
+
+	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 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(),
+							`The code did not return a valid value. Instead of a string did a value of type '${typeof response}' get returned.`,
+						);
+						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 0000000000..77147abdc2
--- /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/tools';
+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 0000000000..821aa27c8f
--- /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 0000000000..bc8ff97c0a
--- /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/tools';
+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 0000000000..2ba1fda8d3
--- /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 0000000000..ab9f5d43e8
--- /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/tools';
+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 0000000000..50c0714e4e
--- /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 0000000000..14e8511168
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/ToolWorkflow.node.ts
@@ -0,0 +1,419 @@
+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/tools';
+import get from 'lodash/get';
+import isObject from 'lodash/isObject';
+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,
+		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: 'Name',
+				name: 'name',
+				type: 'string',
+				default: '',
+				placeholder: 'My_Color_Tool',
+			},
+			{
+				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:
+					'The workflow will receive "query" as input and the output of the last node will be returned as response',
+				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',
+			},
+			{
+				displayName: 'Response Property Name',
+				name: 'responsePropertyName',
+				type: 'string',
+				default: 'response',
+				description: 'The name of the property of the last node that will be returned as response',
+			},
+
+			// ----------------------------------
+			//         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> {
+		const name = this.getNodeParameter('name', itemIndex) as string;
+		const description = this.getNodeParameter('description', itemIndex) as string;
+
+		const runFunction = async (query: string): Promise<string> => {
+			const source = this.getNodeParameter('source', itemIndex) as string;
+			const responsePropertyName = this.getNodeParameter(
+				'responsePropertyName',
+				itemIndex,
+			) as string;
+
+			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)) 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): Promise<string> => {
+					const { index } = this.addInputData(NodeConnectionType.AiTool, [[{ json: { query } }]]);
+
+					let response: string = '';
+					let executionError: ExecutionError | undefined;
+					try {
+						response = await runFunction(query);
+					} 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(),
+							`The code did not return a valid value. Instead of a string did a value of type '${typeof response}' get returned.`,
+						);
+						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 0000000000..1ca62d1f92
--- /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/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.responseCode as number, {
+						'www-authenticate': 'Basic realm="Webhook"',
+					});
+					res.end(error.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 0000000000..bd89c6595d
--- /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 0000000000..6f19cfeae7
--- /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 0000000000..d5935d6fad
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/trigger/ChatTrigger/templates.ts
@@ -0,0 +1,106 @@
+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'
+							});
+
+							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 0000000000..dedf7e48cb
--- /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 0000000000..58dac30fd5
--- /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 0000000000..b7d58b8411
--- /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 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 0000000000..51f0a2f7a9
--- /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/embeddings/base';
+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 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 0000000000..1359e13f86
--- /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/embeddings/base';
+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 0000000000..a348ffbc40
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStorePinecone/VectorStorePinecone.node.ts
@@ -0,0 +1,137 @@
+import { NodeOperationError, type INodeProperties } from 'n8n-workflow';
+import type { PineconeLibArgs } from 'langchain/vectorstores/pinecone';
+import { PineconeStore } from 'langchain/vectorstores/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,
+			environment: credentials.environment as string,
+		});
+
+		const pineconeIndex = client.Index(index);
+		const config: PineconeLibArgs = {
+			namespace: options.pineconeNamespace ?? undefined,
+			pineconeIndex,
+			filter,
+		};
+
+		return 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,
+			environment: credentials.environment as string,
+		});
+
+		const indexes = (await client.listIndexes()).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) {
+			await pineconeIndex.namespace(options.pineconeNamespace).deleteAll();
+		}
+
+		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 0000000000..b94b8b3af6
--- /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 0000000000..cb764c5c7b
--- /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 { PineconeStore } from 'langchain/vectorstores/pinecone';
+import { Pinecone } from '@pinecone-database/pinecone';
+import type { Embeddings } from 'langchain/embeddings/base';
+import type { Document } from 'langchain/document';
+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,
+			environment: credentials.environment 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 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 0000000000..b94b8b3af6
--- /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 0000000000..daec8ef06e
--- /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 { PineconeLibArgs } from 'langchain/vectorstores/pinecone';
+import { PineconeStore } from 'langchain/vectorstores/pinecone';
+import { Pinecone } from '@pinecone-database/pinecone';
+import type { Embeddings } from 'langchain/embeddings/base';
+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,
+			environment: credentials.environment as string,
+		});
+
+		const pineconeIndex = client.Index(index);
+		const config: PineconeLibArgs = {
+			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 0000000000..b94b8b3af6
--- /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 0000000000..759330539e
--- /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/vectorstores/qdrant';
+import { QdrantVectorStore } from 'langchain/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 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 0000000000..be9350cd28
--- /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 0000000000..931fc22f82
--- /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/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 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 0000000000..7f00f09fc9
--- /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 0000000000..f199ecd6af
--- /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/embeddings/base';
+import type { Document } from 'langchain/document';
+import { createClient } from '@supabase/supabase-js';
+import { SupabaseVectorStore } from 'langchain/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 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 0000000000..7f00f09fc9
--- /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 0000000000..9592c1c06e
--- /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/embeddings/base';
+import { createClient } from '@supabase/supabase-js';
+import type { SupabaseLibArgs } from 'langchain/vectorstores/supabase';
+import { SupabaseVectorStore } from 'langchain/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 0000000000..7f00f09fc9
--- /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 0000000000..8795efa27f
--- /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/vectorstores/zep';
+import { ZepVectorStore } from 'langchain/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 0000000000..12d5d975ff
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 0000000000..fad1692d37
--- /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/vectorstores/zep';
+import type { Embeddings } from 'langchain/embeddings/base';
+import type { Document } from 'langchain/document';
+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 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 0000000000..12d5d975ff
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 0000000000..c0e50221d5
--- /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/vectorstores/zep';
+import { ZepVectorStore } from 'langchain/vectorstores/zep';
+import type { Embeddings } from 'langchain/embeddings/base';
+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 0000000000..12d5d975ff
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 0000000000..4cc022aafe
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/shared/MemoryVectorStoreManager.ts
@@ -0,0 +1,46 @@
+import type { Document } from 'langchain/document';
+import type { Embeddings } from 'langchain/embeddings/base';
+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 0000000000..1bc49c868f
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/shared/createVectorStoreNode.ts
@@ -0,0 +1,299 @@
+/* eslint-disable n8n-nodes-base/node-filename-against-convention */
+/* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import type { VectorStore } from 'langchain/vectorstores/base';
+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/embeddings/base';
+import type { Document } from 'langchain/document';
+import { logWrapper } from '../../../utils/logWrapper';
+import type { N8nJsonLoader } from '../../../utils/N8nJsonLoader';
+import type { N8nBinaryLoader } from '../../../utils/N8nBinaryLoader';
+import { getMetadataFiltersValues } 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);
+				}
+
+				return 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);
+					} catch (error) {
+						throw error;
+					}
+				}
+
+				return 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 0000000000..483e73c1fe
--- /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 0000000000..d606a0db05
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/shared/methods/listSearch.ts
@@ -0,0 +1,70 @@
+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,
+		environment: credentials.environment as string,
+	});
+
+	const indexes = await client.listIndexes();
+
+	const results = 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 0000000000..9a4d8a77f5
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/shared/processDocuments.ts
@@ -0,0 +1,51 @@
+import type { Document } from 'langchain/document';
+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/package.json b/packages/@n8n/nodes-langchain/package.json
new file mode 100644
index 0000000000..1dcdff0266
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/package.json
@@ -0,0 +1,158 @@
+{
+  "name": "@n8n/n8n-nodes-langchain",
+  "version": "0.9.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 && gulp build: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\""
+  },
+  "files": [
+    "dist"
+  ],
+  "n8n": {
+    "n8nNodesApiVersion": 1,
+    "credentials": [
+      "dist/credentials/AnthropicApi.credentials.js",
+      "dist/credentials/CohereApi.credentials.js",
+      "dist/credentials/GooglePalmApi.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/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/EmbeddingsGooglePalm/EmbeddingsGooglePalm.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/llms/LMChatAnthropic/LmChatAnthropic.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/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.6",
+    "@types/html-to-text": "^9.0.1",
+    "@types/json-schema": "^7.0.12",
+    "@types/request-promise-native": "~1.0.15",
+    "@types/temp": "^0.9.1",
+    "eslint-plugin-n8n-nodes-base": "^1.16.0",
+    "gulp": "^4.0.2",
+    "n8n-core": "workspace:*"
+  },
+  "dependencies": {
+    "@aws-sdk/client-bedrock-runtime": "3.454.0",
+    "@aws-sdk/credential-provider-node": "3.451.0",
+    "@getzep/zep-js": "0.9.0",
+    "@google-ai/generativelanguage": "0.2.1",
+    "@huggingface/inference": "2.6.4",
+    "@langchain/core": "0.1.8",
+    "@langchain/mistralai": "0.0.6",
+    "@n8n/vm2": "3.9.20",
+    "@pinecone-database/pinecone": "1.1.2",
+    "@qdrant/js-client-rest": "1.7.0",
+    "@supabase/supabase-js": "2.38.5",
+    "@xata.io/client": "0.25.3",
+    "basic-auth": "2.0.1",
+    "cohere-ai": "6.2.2",
+    "d3-dsv": "2.0.0",
+    "epub2": "3.0.1",
+    "html-to-text": "9.0.5",
+    "json-schema-to-zod": "1.2.0",
+    "langchain": "0.0.198",
+    "lodash": "4.17.21",
+    "mammoth": "1.6.0",
+    "mssql": "9.1.1",
+    "n8n-nodes-base": "workspace:*",
+    "n8n-workflow": "workspace:*",
+    "openai": "4.20.0",
+    "pdf-parse": "1.1.1",
+    "pg": "8.11.3",
+    "redis": "4.6.11",
+    "sqlite3": "5.1.6",
+    "temp": "0.9.4",
+    "typeorm": "0.3.17",
+    "zod": "3.22.4",
+    "zod-to-json-schema": "3.22.0"
+  }
+}
diff --git a/packages/@n8n/nodes-langchain/tsconfig.build.json b/packages/@n8n/nodes-langchain/tsconfig.build.json
new file mode 100644
index 0000000000..d7b07412f6
--- /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 0000000000..f031a5ae97
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/tsconfig.json
@@ -0,0 +1,25 @@
+{
+	"compilerOptions": {
+		"strict": true,
+		"module": "commonjs",
+		"moduleResolution": "node",
+		"target": "es2019",
+		"lib": ["es2019", "es2020", "es2022.error"],
+		"removeComments": true,
+		"useUnknownInCatchVariables": false,
+		"forceConsistentCasingInFileNames": true,
+		"noImplicitAny": true,
+		"noImplicitReturns": true,
+		"noUnusedLocals": 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 0000000000..5929818316
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/utils/N8nBinaryLoader.ts
@@ -0,0 +1,197 @@
+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/document';
+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 { pipeline } from 'stream/promises';
+import { createWriteStream } from 'fs';
+
+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) {
+			filePathOrBlob = this.context.helpers.getBinaryPath(binaryData.id);
+		} 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 0000000000..bf3fb2926c
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/utils/N8nJsonLoader.ts
@@ -0,0 +1,95 @@
+import {
+	type IExecuteFunctions,
+	type INodeExecutionData,
+	NodeOperationError,
+} from 'n8n-workflow';
+
+import type { TextSplitter } from 'langchain/text_splitter';
+import type { Document } from 'langchain/document';
+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/helpers.ts b/packages/@n8n/nodes-langchain/utils/helpers.ts
new file mode 100644
index 0000000000..0640cfbd91
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/utils/helpers.ts
@@ -0,0 +1,16 @@
+import type { IExecuteFunctions } from 'n8n-workflow';
+
+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;
+}
diff --git a/packages/@n8n/nodes-langchain/utils/logWrapper.ts b/packages/@n8n/nodes-langchain/utils/logWrapper.ts
new file mode 100644
index 0000000000..52a24ef6ac
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/utils/logWrapper.ts
@@ -0,0 +1,504 @@
+import {
+	NodeOperationError,
+	type ConnectionTypes,
+	type IExecuteFunctions,
+	type INodeExecutionData,
+	NodeConnectionType,
+} from 'n8n-workflow';
+
+import { Tool } from 'langchain/tools';
+import type { BaseMessage, ChatResult, InputValues } from 'langchain/schema';
+import { BaseChatMessageHistory } from 'langchain/schema';
+import { BaseChatModel } from 'langchain/chat_models/base';
+import type { CallbackManagerForLLMRun } from 'langchain/callbacks';
+
+import { Embeddings } from 'langchain/embeddings/base';
+import { VectorStore } from 'langchain/vectorstores/base';
+import type { Document } from 'langchain/document';
+import { TextSplitter } from 'langchain/text_splitter';
+import type { BaseDocumentLoader } from 'langchain/document_loaders/base';
+import type { BaseCallbackConfig, Callbacks } from 'langchain/dist/callbacks/manager';
+import { BaseLLM } from 'langchain/llms/base';
+import { BaseChatMemory } from 'langchain/memory';
+import type { MemoryVariables } from 'langchain/dist/memory/base';
+import { BaseRetriever } from 'langchain/schema/retriever';
+import type { FormatInstructionsOptions } from 'langchain/schema/output_parser';
+import { BaseOutputParser } from 'langchain/schema/output_parser';
+import { isObject } from 'lodash';
+import { N8nJsonLoader } from './N8nJsonLoader';
+import { N8nBinaryLoader } from './N8nBinaryLoader';
+
+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) {
+		// 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;
+
+						executeFunctions.addOutputData(connectionType, index, [
+							[{ json: { action: 'loadMemoryVariables', response } }],
+						]);
+						return response;
+					};
+				} else if (
+					prop === 'outputKey' &&
+					'outputKey' in target &&
+					target.constructor.name === 'BufferWindowMemory'
+				) {
+					connectionType = NodeConnectionType.AiMemory;
+					const { index } = executeFunctions.addInputData(connectionType, [
+						[{ json: { action: 'chatHistory' } }],
+					]);
+					const response = target[prop];
+
+					target.chatHistory
+						.getMessages()
+						.then((messages) => {
+							executeFunctions.addOutputData(NodeConnectionType.AiMemory, index, [
+								[{ json: { action: 'chatHistory', chatHistory: messages } }],
+							]);
+						})
+						.catch((error: Error) => {
+							executeFunctions.addOutputData(NodeConnectionType.AiMemory, index, [
+								[{ json: { action: 'chatHistory', error } }],
+							]);
+						});
+					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[];
+
+						executeFunctions.addOutputData(connectionType, index, [
+							[{ json: { action: 'getMessages', response } }],
+						]);
+						return response;
+					};
+				} else if (prop === 'addMessage' && 'addMessage' in target) {
+					return async (message: BaseMessage): Promise<void> => {
+						connectionType = NodeConnectionType.AiMemory;
+						const { index } = executeFunctions.addInputData(connectionType, [
+							[{ json: { action: 'addMessage', message } }],
+						]);
+
+						await callMethodAsync.call(target, {
+							executeFunctions,
+							connectionType,
+							currentNodeRunIndex: index,
+							method: target[prop],
+							arguments: [message],
+						});
+
+						executeFunctions.addOutputData(connectionType, index, [
+							[{ json: { action: 'addMessage' } }],
+						]);
+					};
+				}
+			}
+
+			// ========== BaseChatModel ==========
+			if (originalInstance instanceof BaseLLM || originalInstance instanceof BaseChatModel) {
+				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;
+							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 } }],
+						]);
+						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;
+
+						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>>>;
+
+						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[][];
+
+						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[];
+
+						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[];
+
+						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[];
+
+						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;
+
+						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>>>;
+
+						executeFunctions.addOutputData(connectionType, index, [[{ json: { response } }]]);
+
+						return response;
+					};
+				}
+			}
+
+			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 0000000000..4a22829a0c
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/utils/sharedFields.ts
@@ -0,0 +1,141 @@
+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 getAhref = (connectionType: { connection: string; locale: string }) =>
+	`<a data-action='openSelectiveNodeCreator' data-action-parameter-connectiontype='${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()}. <a data-action='openSelectiveNodeCreator' data-action-parameter-connectiontype='${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/permissions/.eslintrc.js b/packages/@n8n/permissions/.eslintrc.js
new file mode 100644
index 0000000000..f60180296c
--- /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 0000000000..d6c48554a7
--- /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 0000000000..0423854b9d
--- /dev/null
+++ b/packages/@n8n/permissions/package.json
@@ -0,0 +1,22 @@
+{
+  "name": "@n8n/permissions",
+  "version": "0.5.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 0000000000..76c22f7b19
--- /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 0000000000..5934473ce7
--- /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 0000000000..6dce8947d6
--- /dev/null
+++ b/packages/@n8n/permissions/src/types.ts
@@ -0,0 +1,85 @@
+export type DefaultOperations = 'create' | 'read' | 'update' | 'delete' | 'list';
+export type Resource =
+	| 'auditLogs'
+	| '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 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
+	| 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 0000000000..22137d6326
--- /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 0000000000..30910a3bf1
--- /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 0000000000..a693815582
--- /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_io/eslint-config/base.js b/packages/@n8n_io/eslint-config/base.js
index bdf78918c3..7a2ee861d3 100644
--- a/packages/@n8n_io/eslint-config/base.js
+++ b/packages/@n8n_io/eslint-config/base.js
@@ -134,6 +134,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
 		 */
@@ -148,6 +153,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
 		 */
@@ -231,7 +239,7 @@ const config = (module.exports = {
 			},
 			{
 				selector: 'variable',
-				format: ['camelCase', 'snake_case', 'UPPER_CASE'],
+				format: ['camelCase', 'snake_case', 'UPPER_CASE', 'PascalCase'],
 				leadingUnderscore: 'allowSingleOrDouble',
 				trailingUnderscore: 'allowSingleOrDouble',
 			},
@@ -317,6 +325,17 @@ 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'],
+			},
+		],
+
 		// ----------------------------------
 		//       eslint-plugin-import
 		// ----------------------------------
@@ -344,6 +363,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',
@@ -354,6 +374,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
 		// ******************************************************************
@@ -451,13 +473,13 @@ const config = (module.exports = {
 			},
 		},
 		{
-			files: ['test/**/*.ts', 'src/__tests__/*.ts'],
+			files: ['test/**/*.ts', '**/__tests__/*.ts'],
 			rules: {
+				'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/await-thenable': 'off',
 				'@typescript-eslint/ban-ts-comment': 'off',
 				'@typescript-eslint/naming-convention': 'off',
 				'import/no-duplicates': 'off',
diff --git a/packages/@n8n_io/eslint-config/frontend.js b/packages/@n8n_io/eslint-config/frontend.js
index a93c510e20..7008d08f23 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/vue3-essential', '@vue/typescript', './base'],
+	extends: ['plugin:vue/vue3-recommended', '@vue/typescript', './base'],
 
 	env: {
 		browser: true,
@@ -16,9 +16,9 @@ module.exports = {
 
 	overrides: [
 		{
-			files: ['src/**/*.vue'],
+			files: ['**/*.test.ts', '**/test/**/*.ts', '**/__tests__/**/*.ts'],
 			rules: {
-				'n8n-local-rules/dangerously-use-html-string-missing': 'error',
+				'import/no-extraneous-dependencies': 'off',
 			},
 		},
 	],
@@ -36,17 +36,40 @@ module.exports = {
 		'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 56eb10d5d8..0d3ff867b3 100644
--- a/packages/@n8n_io/eslint-config/local-rules.js
+++ b/packages/@n8n_io/eslint-config/local-rules.js
@@ -353,6 +353,75 @@ module.exports = {
 			};
 		},
 	},
+
+	'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 18cc51681a..333c198156 100644
--- a/packages/@n8n_io/eslint-config/package.json
+++ b/packages/@n8n_io/eslint-config/package.json
@@ -3,21 +3,22 @@
   "private": true,
   "version": "0.0.1",
   "devDependencies": {
-    "@types/eslint": "^8.44.1",
-    "@typescript-eslint/eslint-plugin": "^6.2.0",
-    "@typescript-eslint/parser": "^6.2.0",
-    "@vue/eslint-config-typescript": "^11.0.3",
-    "eslint": "^8.45.0",
+    "@types/eslint": "^8.44.7",
+    "@typescript-eslint/eslint-plugin": "^6.12.0",
+    "@typescript-eslint/parser": "^6.12.0",
+    "@vue/eslint-config-prettier": "^8.0.0",
+    "@vue/eslint-config-typescript": "^12.0.0",
+    "eslint": "^8.54.0",
     "eslint-config-airbnb-typescript": "^17.1.0",
-    "eslint-config-prettier": "^8.9.0",
-    "eslint-import-resolver-typescript": "^3.5.5",
-    "eslint-plugin-import": "^2.28.0",
+    "eslint-config-prettier": "^9.0.0",
+    "eslint-import-resolver-typescript": "^3.6.1",
+    "eslint-plugin-import": "^2.29.0",
     "eslint-plugin-n8n-local-rules": "^1.0.0",
-    "eslint-plugin-prettier": "^5.0.0",
-    "eslint-plugin-unicorn": "^48.0.1",
+    "eslint-plugin-prettier": "^5.0.1",
+    "eslint-plugin-unicorn": "^49.0.0",
     "eslint-plugin-unused-imports": "^3.0.0",
-    "eslint-plugin-vue": "^9.15.1",
-    "vue-eslint-parser": "^9.3.1"
+    "eslint-plugin-vue": "^9.18.1",
+    "vue-eslint-parser": "^9.3.2"
   },
   "scripts": {
     "clean": "rimraf .turbo",
diff --git a/packages/cli/.eslintrc.js b/packages/cli/.eslintrc.js
index 694ed381d8..1840061479 100644
--- a/packages/cli/.eslintrc.js
+++ b/packages/cli/.eslintrc.js
@@ -8,6 +8,10 @@ module.exports = {
 
 	...sharedOptions(__dirname),
 
+	parserOptions: {
+		project: './tsconfig.json',
+	},
+
 	ignorePatterns: [
 		'jest.config.js',
 		// TODO: Remove these
@@ -15,6 +19,8 @@ module.exports = {
 	],
 
 	rules: {
+		'n8n-local-rules/no-dynamic-import-template': 'error',
+
 		// TODO: Remove this
 		'import/no-cycle': 'warn',
 		'import/order': 'off',
diff --git a/packages/cli/BREAKING-CHANGES.md b/packages/cli/BREAKING-CHANGES.md
index e150b78207..db2ae5269f 100644
--- a/packages/cli/BREAKING-CHANGES.md
+++ b/packages/cli/BREAKING-CHANGES.md
@@ -2,6 +2,60 @@
 
 This list shows all the versions which include breaking changes and how to upgrade.
 
+## 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?
@@ -19,6 +73,24 @@ 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?
diff --git a/packages/cli/README.md b/packages/cli/README.md
index a473269226..beeac69369 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/package.json b/packages/cli/package.json
index d68f5c3798..0a8b3ba08b 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n",
-  "version": "1.14.0",
+  "version": "1.24.0",
   "description": "n8n Workflow Automation Tool",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",
@@ -37,8 +37,8 @@
     "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:mysql": "N8N_LOG_LEVEL=silent DB_TYPE=mysqldb jest --no-coverage",
+    "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\"",
     "typeorm": "ts-node -T ../../node_modules/typeorm/cli.js"
   },
@@ -76,7 +76,6 @@
     "@types/formidable": "^3.4.0",
     "@types/json-diff": "^1.0.0",
     "@types/jsonwebtoken": "^9.0.1",
-    "@types/localtunnel": "^1.9.0",
     "@types/lodash": "^4.14.195",
     "@types/passport-jwt": "^3.0.6",
     "@types/psl": "^1.1.0",
@@ -99,96 +98,98 @@
   },
   "dependencies": {
     "@n8n/client-oauth2": "workspace:*",
-    "@n8n_io/license-sdk": "~2.7.1",
-    "@oclif/command": "^1.8.16",
-    "@oclif/config": "^1.18.17",
-    "@oclif/core": "^1.16.4",
-    "@oclif/errors": "^1.3.6",
+    "@n8n/localtunnel": "2.1.0",
+    "@n8n/permissions": "workspace:*",
+    "@n8n_io/license-sdk": "2.7.2",
+    "@oclif/command": "1.8.18",
+    "@oclif/config": "1.18.17",
+    "@oclif/core": "1.16.6",
+    "@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",
-    "bull": "^4.10.2",
-    "cache-manager": "^5.2.3",
-    "cache-manager-ioredis-yet": "^1.2.2",
-    "callsites": "^3.1.0",
-    "change-case": "^4.1.1",
-    "class-transformer": "^0.5.1",
-    "class-validator": "^0.14.0",
-    "compression": "^1.7.4",
-    "connect-history-api-fallback": "^1.6.0",
-    "convict": "^6.2.4",
-    "cookie-parser": "^1.4.6",
-    "csrf": "^3.1.0",
+    "@sentry/integrations": "7.87.0",
+    "@sentry/node": "7.87.0",
+    "axios": "1.6.2",
+    "basic-auth": "2.0.1",
+    "bcryptjs": "2.4.3",
+    "bull": "4.10.2",
+    "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",
+    "connect-history-api-fallback": "1.6.0",
+    "convict": "6.2.4",
+    "cookie-parser": "1.4.6",
+    "csrf": "3.1.0",
     "curlconverter": "3.21.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",
-    "formidable": "^3.5.0",
-    "google-timezones-json": "^1.1.0",
+    "dotenv": "8.6.0",
+    "express": "4.18.2",
+    "express-async-errors": "3.1.1",
+    "express-handlebars": "7.0.2",
+    "express-openapi-validator": "4.13.8",
+    "express-prom-bundle": "6.6.0",
+    "express-rate-limit": "7.1.3",
+    "fast-glob": "3.2.12",
+    "flatted": "3.2.7",
+    "formidable": "3.5.0",
+    "google-timezones-json": "1.1.0",
     "handlebars": "4.7.7",
-    "infisical-node": "^1.3.0",
-    "inquirer": "^7.0.1",
-    "ioredis": "^5.2.4",
-    "isbot": "^3.6.13",
-    "json-diff": "^1.0.6",
-    "jsonschema": "^1.4.1",
-    "jsonwebtoken": "^9.0.0",
-    "jwks-rsa": "^3.0.1",
-    "ldapts": "^4.2.6",
-    "localtunnel": "^2.0.0",
-    "lodash": "^4.17.21",
-    "luxon": "^3.3.0",
-    "mysql2": "~2.3.3",
+    "infisical-node": "1.3.0",
+    "inquirer": "7.3.3",
+    "ioredis": "5.2.4",
+    "isbot": "3.6.13",
+    "json-diff": "1.0.6",
+    "jsonschema": "1.4.1",
+    "jsonwebtoken": "9.0.0",
+    "jwks-rsa": "3.0.1",
+    "ldapts": "4.2.6",
+    "lodash": "4.17.21",
+    "luxon": "3.3.0",
+    "mysql2": "2.3.3",
     "n8n-core": "workspace:*",
     "n8n-editor-ui": "workspace:*",
     "n8n-nodes-base": "workspace:*",
+    "@n8n/n8n-nodes-langchain": "workspace:*",
     "n8n-workflow": "workspace:*",
-    "nanoid": "^3.3.6",
-    "nodemailer": "^6.7.1",
-    "oauth-1.0a": "^2.2.6",
-    "open": "^7.0.0",
-    "openapi-types": "^10.0.0",
-    "otpauth": "^9.1.1",
-    "p-cancelable": "^2.0.0",
-    "p-lazy": "^3.1.0",
-    "passport": "^0.6.0",
-    "passport-cookie": "^1.0.9",
-    "passport-jwt": "^4.0.0",
-    "pg": "^8.8.0",
-    "picocolors": "^1.0.0",
-    "pkce-challenge": "^3.0.0",
-    "posthog-node": "^2.2.2",
-    "prom-client": "^13.1.0",
-    "psl": "^1.8.0",
-    "raw-body": "^2.5.1",
-    "reflect-metadata": "^0.1.13",
-    "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.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.17",
-    "uuid": "^8.3.2",
+    "nanoid": "3.3.6",
+    "nodemailer": "6.8.0",
+    "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",
+    "passport": "0.6.0",
+    "passport-cookie": "1.0.9",
+    "passport-jwt": "4.0.1",
+    "pg": "8.8.0",
+    "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.1.13",
+    "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.6",
+    "sse-channel": "4.0.0",
+    "sshpk": "1.17.0",
+    "swagger-ui-express": "4.5.0",
+    "syslog-client": "1.1.1",
+    "typedi": "0.10.0",
+    "typeorm": "0.3.17",
+    "uuid": "8.3.2",
     "validator": "13.7.0",
-    "winston": "^3.3.3",
-    "ws": "^8.12.0",
-    "xml2js": "^0.5.0",
-    "xmllint-wasm": "^3.0.1",
-    "yamljs": "^0.3.0"
+    "winston": "3.8.2",
+    "ws": "8.12.0",
+    "xml2js": "0.5.0",
+    "xmllint-wasm": "3.0.1",
+    "yamljs": "0.3.0"
   }
 }
diff --git a/packages/cli/src/AbstractServer.ts b/packages/cli/src/AbstractServer.ts
index 8323a999e6..71b4c75ea9 100644
--- a/packages/cli/src/AbstractServer.ts
+++ b/packages/cli/src/AbstractServer.ts
@@ -1,4 +1,4 @@
-import { Container } from 'typedi';
+import { Container, Service } from 'typedi';
 import { readFile } from 'fs/promises';
 import type { Server } from 'http';
 import express from 'express';
@@ -7,19 +7,22 @@ import isbot from 'isbot';
 
 import config from '@/config';
 import { N8N_VERSION, inDevelopment, inTest } from '@/constants';
-import { ActiveWorkflowRunner } from '@/ActiveWorkflowRunner';
 import * as Db from '@/Db';
 import { N8nInstanceType } from '@/Interfaces';
-import type { IExternalHooksClass } from '@/Interfaces';
 import { ExternalHooks } from '@/ExternalHooks';
-import { send, sendErrorResponse, ServiceUnavailableError } from '@/ResponseHelper';
+import { send, sendErrorResponse } from '@/ResponseHelper';
 import { rawBodyReader, bodyParser, corsMiddleware } from '@/middlewares';
 import { TestWebhooks } from '@/TestWebhooks';
+import { WaitingForms } from '@/WaitingForms';
 import { WaitingWebhooks } from '@/WaitingWebhooks';
 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 logger: Logger;
 
@@ -27,9 +30,7 @@ export abstract class AbstractServer {
 
 	readonly app: express.Application;
 
-	protected externalHooks: IExternalHooksClass;
-
-	protected activeWorkflowRunner: ActiveWorkflowRunner;
+	protected externalHooks: ExternalHooks;
 
 	protected protocol: string;
 
@@ -37,10 +38,14 @@ export abstract class AbstractServer {
 
 	protected sslCert: string;
 
-	protected timezone: string;
-
 	protected restEndpoint: string;
 
+	protected endpointForm: string;
+
+	protected endpointFormTest: string;
+
+	protected endpointFormWaiting: string;
+
 	protected endpointWebhook: string;
 
 	protected endpointWebhookTest: string;
@@ -57,13 +62,19 @@ export abstract class AbstractServer {
 		this.app = express();
 		this.app.disable('x-powered-by');
 
+		const proxyHops = config.getEnv('proxy_hops');
+		if (proxyHops > 0) this.app.set('trust proxy', proxyHops);
+
 		this.protocol = config.getEnv('protocol');
 		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');
@@ -149,7 +160,6 @@ export abstract class AbstractServer {
 		await new Promise<void>((resolve) => this.server.listen(PORT, ADDRESS, () => resolve()));
 
 		this.externalHooks = Container.get(ExternalHooks);
-		this.activeWorkflowRunner = Container.get(ActiveWorkflowRunner);
 
 		await this.setupHealthCheck();
 
@@ -166,10 +176,18 @@ export abstract class AbstractServer {
 
 		// 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.endpointWebhook}/:path(*)`,
-				webhookRequestHandler(Container.get(ActiveWorkflowRunner)),
+				`/${this.endpointFormWaiting}/:path/:suffix?`,
+				webhookRequestHandler(Container.get(WaitingForms)),
 			);
 
 			// Register a handler for waiting webhooks
@@ -182,14 +200,15 @@ export abstract class AbstractServer {
 		if (this.testWebhooksEnabled) {
 			const testWebhooks = Container.get(TestWebhooks);
 
-			// Register a handler for test webhooks
+			// 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) => testWebhooks.cancelTestWebhook(req.params.id)),
+				send(async (req) => testWebhooks.cancelWebhook(req.params.id)),
 			);
 		}
 
@@ -223,4 +242,26 @@ export abstract class AbstractServer {
 			await this.externalHooks.run('n8n.ready', [this, config]);
 		}
 	}
+
+	/**
+	 * 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 0000000000..e06dcf6dee
--- /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 567da64137..d9526b84c5 100644
--- a/packages/cli/src/ActiveExecutions.ts
+++ b/packages/cli/src/ActiveExecutions.ts
@@ -7,7 +7,7 @@ import type {
 	IRun,
 	ExecutionStatus,
 } from 'n8n-workflow';
-import { createDeferredPromise } from 'n8n-workflow';
+import { ApplicationError, WorkflowOperationError, createDeferredPromise } from 'n8n-workflow';
 
 import type { ChildProcess } from 'child_process';
 import type PCancelable from 'p-cancelable';
@@ -19,7 +19,7 @@ import type {
 	IWorkflowExecutionDataProcess,
 } from '@/Interfaces';
 import { isWorkflowIdValid } from '@/utils';
-import { ExecutionRepository } from '@db/repositories';
+import { ExecutionRepository } from '@db/repositories/execution.repository';
 import { Logger } from '@/Logger';
 
 @Service()
@@ -49,6 +49,7 @@ export class ActiveExecutions {
 				startedAt: new Date(),
 				workflowData: executionData.workflowData,
 				status: executionStatus,
+				workflowId: executionData.workflowData.id,
 			};
 
 			if (executionData.retryOf !== undefined) {
@@ -60,11 +61,9 @@ export class ActiveExecutions {
 				fullExecutionData.workflowId = workflowId;
 			}
 
-			const executionResult =
-				await Container.get(ExecutionRepository).createNewExecution(fullExecutionData);
-			executionId = executionResult.id;
+			executionId = await Container.get(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 {
@@ -98,9 +97,9 @@ export class ActiveExecutions {
 
 	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!`,
-			);
+			throw new ApplicationError('No active execution found to attach to workflow execution to', {
+				extra: { executionId },
+			});
 		}
 
 		this.activeExecutions[executionId].workflowExecution = workflowExecution;
@@ -111,9 +110,9 @@ export class ActiveExecutions {
 		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!`,
-			);
+			throw new ApplicationError('No active execution found to attach to workflow execution to', {
+				extra: { executionId },
+			});
 		}
 
 		this.activeExecutions[executionId].responsePromise = responsePromise;
@@ -170,7 +169,6 @@ export class ActiveExecutions {
 				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);
@@ -190,13 +188,13 @@ export class ActiveExecutions {
 	 * @param {string} executionId The id of the execution to wait for
 	 */
 	async getPostExecutePromise(executionId: string): Promise<IRun | undefined> {
+		if (this.activeExecutions[executionId] === undefined) {
+			throw new WorkflowOperationError(`There is no active execution with id "${executionId}".`);
+		}
+
 		// 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);
 
 		return waitPromise.promise();
diff --git a/packages/cli/src/ActiveWebhooks.ts b/packages/cli/src/ActiveWebhooks.ts
index a271021471..77102eb247 100644
--- a/packages/cli/src/ActiveWebhooks.ts
+++ b/packages/cli/src/ActiveWebhooks.ts
@@ -1,203 +1,161 @@
 import { Service } from 'typedi';
+import type { Response } from 'express';
+import { Workflow, NodeHelpers } from 'n8n-workflow';
+import type { INode, IWebhookData, IHttpRequestMethods } from 'n8n-workflow';
+
+import { WorkflowRepository } from '@db/repositories/workflow.repository';
 import type {
-	IWebhookData,
-	IHttpRequestMethods,
-	Workflow,
-	WorkflowActivateMode,
-	WorkflowExecuteMode,
-} from 'n8n-workflow';
-import { WebhookPathAlreadyTakenError } from 'n8n-workflow';
-import * as NodeExecuteFunctions from 'n8n-core';
+	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[];
-	} = {};
+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,
+	) {}
 
-	private webhookUrls: {
-		[key: string]: IWebhookData[];
-	} = {};
+	async getWebhookMethods(path: string) {
+		return 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('/')) {
-			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 WebhookPathAlreadyTakenError(webhookData.node);
-		}
-
-		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 {
-			await workflow.createWebhookIfNotExists(
-				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: IHttpRequestMethods, 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', 'shared.user.globalRole'],
 		});
 
+		if (workflowData === null) {
+			throw new 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,
+		).find((w) => w.httpMethod === httpMethod && w.path === webhook.webhookPath) as IWebhookData;
+
+		// Get the node which has the webhook defined to know where to start from and to
+		// get additional data
+		const workflowStartNode = workflow.getNode(webhookData.node);
+
+		if (workflowStartNode === null) {
+			throw new NotFoundError('Could not find node to process webhook.');
+		}
+
+		return new Promise((resolve, reject) => {
+			const executionMode = 'webhook';
+			void WebhookHelpers.executeWebhook(
+				workflow,
+				webhookData,
+				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);
+				},
+			);
+		});
+	}
+
+	private async findWebhook(path: string, httpMethod: IHttpRequestMethods) {
+		// Remove trailing slash
+		if (path.endsWith('/')) {
+			path = path.slice(0, -1);
+		}
+
+		const webhook = await this.webhookService.findWebhook(httpMethod, path);
+		if (webhook === null) {
+			throw new WebhookNotFoundError({ path, httpMethod }, { hint: 'production' });
+		}
+
 		return webhook;
 	}
-
-	/**
-	 * Gets all request methods associated with a single webhook
-	 */
-	getWebhookMethods(path: string): IHttpRequestMethods[] {
-		return Object.keys(this.webhookUrls)
-			.filter((key) => key.includes(path))
-			.map((key) => key.split('|')[0] as IHttpRequestMethods);
-	}
-
-	/**
-	 * Returns the ids of all the workflows which have active webhooks
-	 *
-	 */
-	getWorkflowIds(): string[] {
-		return Object.keys(this.workflowWebhooks);
-	}
-
-	/**
-	 * Returns key to uniquely identify a webhook
-	 *
-	 * @param {(string | undefined)} webhookId
-	 */
-	getWebhookKey(httpMethod: IHttpRequestMethods, path: string, webhookId?: string): string {
-		if (webhookId) {
-			if (path.startsWith(webhookId)) {
-				const cutFromIndex = path.indexOf('/') + 1;
-
-				path = path.slice(cutFromIndex);
-			}
-			return `${httpMethod}|${webhookId}|${path.split('/').length}`;
-		}
-		return `${httpMethod}|${path}`;
-	}
-
-	/**
-	 * Removes all webhooks of a workflow
-	 *
-	 */
-	async removeWorkflow(workflow: Workflow): Promise<boolean> {
-		const workflowId = workflow.id;
-
-		if (this.workflowWebhooks[workflowId] === undefined) {
-			// If it did not exist then there is nothing to remove
-			return false;
-		}
-
-		const webhooks = this.workflowWebhooks[workflowId];
-
-		const mode = 'internal';
-
-		// Go through all the registered webhooks of the workflow and remove them
-
-		for (const webhookData of webhooks) {
-			await workflow.deleteWebhook(
-				webhookData,
-				NodeExecuteFunctions,
-				mode,
-				'update',
-				this.testWebhooks,
-			);
-
-			delete this.webhookUrls[
-				this.getWebhookKey(webhookData.httpMethod, webhookData.path, webhookData.webhookId)
-			];
-		}
-
-		// 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 = [];
-
-		for (const workflow of workflows) {
-			removePromises.push(this.removeWorkflow(workflow));
-		}
-
-		await Promise.all(removePromises);
-	}
 }
diff --git a/packages/cli/src/ActiveWorkflowRunner.ts b/packages/cli/src/ActiveWorkflowRunner.ts
index fbaf850bf2..e0e03ad119 100644
--- a/packages/cli/src/ActiveWorkflowRunner.ts
+++ b/packages/cli/src/ActiveWorkflowRunner.ts
@@ -1,7 +1,6 @@
 /* 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';
 
@@ -21,37 +20,22 @@ import type {
 	WorkflowActivateMode,
 	WorkflowExecuteMode,
 	INodeType,
-	IWebhookData,
 } from 'n8n-workflow';
 import {
-	NodeHelpers,
 	Workflow,
 	WorkflowActivationError,
 	ErrorReporterProxy as ErrorReporter,
-	WebhookPathAlreadyTakenError,
+	WebhookPathTakenError,
+	ApplicationError,
 } from 'n8n-workflow';
 
-import type express from 'express';
-
-import * as Db from '@/Db';
-import type {
-	IActivationError,
-	IQueuedWorkflowActivations,
-	IResponseCallbackData,
-	IWebhookManager,
-	IWorkflowDb,
-	IWorkflowExecutionDataProcess,
-	WebhookRequest,
-} from '@/Interfaces';
-import * as ResponseHelper from '@/ResponseHelper';
+import type { IWorkflowDb, IWorkflowExecutionDataProcess } from '@/Interfaces';
 import * as WebhookHelpers from '@/WebhookHelpers';
 import * as WorkflowExecuteAdditionalData from '@/WorkflowExecuteAdditionalData';
 
-import config from '@/config';
-import type { User } from '@db/entities/User';
 import type { WorkflowEntity } from '@db/entities/WorkflowEntity';
 import { ActiveExecutions } from '@/ActiveExecutions';
-import { createErrorExecution } from '@/GenericHelpers';
+import { ExecutionsService } from './executions/executions.service';
 import {
 	STARTING_NODES,
 	WORKFLOW_REACTIVATE_INITIAL_TIMEOUT,
@@ -60,117 +44,64 @@ import {
 import { NodeTypes } from '@/NodeTypes';
 import { WorkflowRunner } from '@/WorkflowRunner';
 import { ExternalHooks } from '@/ExternalHooks';
-import { whereClause } from './UserManagement/UserManagementHelper';
-import { WorkflowsService } from './workflows/workflows.services';
-import { webhookNotFoundErrorMessage } from './utils';
-import { In } from 'typeorm';
 import { WebhookService } from './services/webhook.service';
 import { Logger } from './Logger';
+import { WorkflowRepository } from '@db/repositories/workflow.repository';
+import { MultiMainSetup } from '@/services/orchestration/main/MultiMainSetup.ee';
+import { ActivationErrorsService } from '@/ActivationErrors.service';
+import { ActiveWorkflowsService } from '@/services/activeWorkflows.service';
+import { WorkflowStaticDataService } from '@/workflows/workflowStaticData.service';
+import { OnShutdown } from '@/decorators/OnShutdown';
 
-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)";
+interface QueuedActivation {
+	activationMode: WorkflowActivateMode;
+	lastTimeout: number;
+	timeout: NodeJS.Timeout;
+	workflowData: IWorkflowDb;
+}
 
 @Service()
-export class ActiveWorkflowRunner implements IWebhookManager {
-	private activeWorkflows = new ActiveWorkflows();
-
-	private activationErrors: {
-		[key: string]: IActivationError;
-	} = {};
-
-	private queuedWorkflowActivations: {
-		[key: string]: IQueuedWorkflowActivations;
-	} = {};
+export class ActiveWorkflowRunner {
+	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 multiMainSetup: MultiMainSetup,
+		private readonly activationErrorsService: ActivationErrorsService,
+		private readonly executionService: ExecutionsService,
+		private readonly workflowStaticDataService: WorkflowStaticDataService,
+		private readonly activeWorkflowsService: ActiveWorkflowsService,
 	) {}
 
 	async init() {
-		// Get the active workflows from database
+		await this.multiMainSetup.init();
 
-		// 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 this.webhookService.deleteInstanceWebhooks();
-		}
-
-		if (workflowsData.length !== 0) {
-			this.logger.info(' ================================');
-			this.logger.info('   Start Active Workflows:');
-			this.logger.info(' ================================');
-
-			for (const workflowData of workflowsData) {
-				this.logger.info(`   - ${workflowData.name} (ID: ${workflowData.id})`);
-				this.logger.debug(`Initializing active workflow "${workflowData.name}" (startup)`, {
-					workflowName: workflowData.name,
-					workflowId: workflowData.id,
-				});
-				try {
-					await this.add(workflowData.id, 'init', workflowData);
-					this.logger.verbose(`Successfully started workflow "${workflowData.name}"`, {
-						workflowName: workflowData.name,
-						workflowId: workflowData.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 "${workflowData.name}" (startup)`,
-						{
-							workflowName: workflowData.name,
-							workflowId: workflowData.id,
-						},
-					);
-					// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-					this.executeErrorWorkflow(error, workflowData, 'internal');
-
-					if (!error.message.includes('Authorization')) {
-						// Keep on trying to activate the workflow if not an auth issue
-						this.addQueuedWorkflowActivation('init', workflowData);
-					}
-				}
-			}
-			this.logger.verbose('Finished initializing active workflows (startup)');
-		}
+		await this.addActiveWorkflows('init');
 
 		await this.externalHooks.run('activeWorkflows.initialized', []);
 		await this.webhookService.populateCache();
 	}
 
+	async getAllWorkflowActivationErrors() {
+		return this.activationErrorsService.getAll();
+	}
+
 	/**
-	 * Removes all the currently active workflows
+	 * Removes all the currently active workflows from memory.
 	 */
-	async removeAll(): Promise<void> {
+	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.getActiveWorkflows();
+		const activeWorkflows = await this.activeWorkflowsService.getAllActiveIdsInStorage();
 		activeWorkflowIds = [...activeWorkflowIds, ...activeWorkflows];
 		// Make sure IDs are unique
 		activeWorkflowIds = Array.from(new Set(activeWorkflowIds));
@@ -184,189 +115,42 @@ export class ActiveWorkflowRunner implements IWebhookManager {
 	}
 
 	/**
-	 * Checks if a webhook for the given method and path exists and executes the workflow.
+	 * Returns the ids of the currently active workflows from memory.
 	 */
-	async executeWebhook(
-		request: WebhookRequest,
-		response: express.Response,
-	): Promise<IResponseCallbackData> {
-		const httpMethod = request.method;
-		let path = request.params.path;
-
-		this.logger.debug(`Received webhook "${httpMethod}" for path "${path}"`);
-
-		// Reset request parameters
-		request.params = {} as WebhookRequest['params'];
-
-		// Remove trailing slash
-		if (path.endsWith('/')) {
-			path = path.slice(0, -1);
-		}
-
-		const webhook = await this.webhookService.findWebhook(httpMethod, path);
-
-		if (webhook === null) {
-			throw new ResponseHelper.NotFoundError(
-				webhookNotFoundErrorMessage(path, httpMethod),
-				WEBHOOK_PROD_UNREGISTERED_HINT,
-			);
-		}
-
-		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];
-				}
-			});
-		}
-
-		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,
-		).find((w) => w.httpMethod === httpMethod && w.path === webhook.webhookPath) as IWebhookData;
-
-		// Get the node which has the webhook defined to know where to start from and to
-		// get additional data
-		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';
-			void WebhookHelpers.executeWebhook(
-				workflow,
-				webhookData,
-				workflowData,
-				workflowStartNode,
-				executionMode,
-				undefined,
-				undefined,
-				undefined,
-				request,
-				response,
-				(error: Error | null, data: object) => {
-					if (error !== null) {
-						return reject(error);
-					}
-					resolve(data);
-				},
-			);
-		});
+	allActiveInMemory() {
+		return this.activeWorkflows.allActiveWorkflows();
 	}
 
 	/**
-	 * Gets all request methods associated with a single webhook
-	 */
-	async getWebhookMethods(path: string) {
-		return this.webhookService.getWebhookMethods(path);
-	}
-
-	/**
-	 * Returns the ids of the currently active workflows
-	 */
-	async getActiveWorkflows(user?: User): Promise<string[]> {
-		let activeWorkflows: WorkflowEntity[] = [];
-		if (!user || user.globalRole.name === 'owner') {
-			activeWorkflows = await Db.collections.Workflow.find({
-				select: ['id'],
-				where: { active: true },
-			});
-			return activeWorkflows
-				.map((workflow) => workflow.id)
-				.filter((workflowId) => !this.activationErrors[workflowId]);
-		} else {
-			const active = await Db.collections.Workflow.find({
-				select: ['id'],
-				where: { active: true },
-			});
-			const activeIds = active.map((workflow) => workflow.id);
-			const where = whereClause({
-				user,
-				entityType: 'workflow',
-			});
-			Object.assign(where, { workflowId: In(activeIds) });
-			const shared = await Db.collections.SharedWorkflow.find({
-				select: ['workflowId'],
-				where,
-			});
-			return shared
-				.map((id) => id.workflowId)
-				.filter((workflowId) => !this.activationErrors[workflowId]);
-		}
-	}
-
-	/**
-	 * Returns if the workflow is active
+	 * Returns if the workflow is stored as `active`.
 	 *
-	 * @param {string} id The id of the workflow to check
+	 * @important Do not confuse with `ActiveWorkflows.isActive()`,
+	 * which checks if the workflow is active in memory.
 	 */
-	async isActive(id: string): Promise<boolean> {
-		const workflow = await Db.collections.Workflow.findOne({
+	async isActive(workflowId: string) {
+		const workflow = await this.workflowRepository.findOne({
 			select: ['active'],
-			where: { id },
+			where: { id: workflowId },
 		});
+
 		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
+	 * Register workflow-defined webhooks in the `workflow_entity` table.
 	 */
-	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(
+	async addWebhooks(
 		workflow: Workflow,
 		additionalData: IWorkflowExecuteAdditionalDataWorkflow,
 		mode: WorkflowExecuteMode,
 		activation: WorkflowActivateMode,
-	): Promise<void> {
+	) {
 		const webhooks = WebhookHelpers.getWorkflowWebhooks(workflow, additionalData, undefined, true);
-		let path = '' as string | undefined;
+		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;
@@ -401,15 +185,9 @@ export class ActiveWorkflowRunner implements IWebhookManager {
 					NodeExecuteFunctions,
 					mode,
 					activation,
-					false,
 				);
 			} catch (error) {
-				if (
-					activation === 'init' &&
-					config.getEnv('endpoints.skipWebhooksDeregistrationOnShutdown') &&
-					error.name === 'QueryFailedError'
-				) {
-					// When skipWebhooksDeregistrationOnShutdown is enabled,
+				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
@@ -419,7 +197,7 @@ export class ActiveWorkflowRunner implements IWebhookManager {
 				}
 
 				try {
-					await this.removeWorkflowWebhooks(workflow.id);
+					await this.clearWebhooks(workflow.id);
 				} catch (error1) {
 					ErrorReporter.error(error1);
 					this.logger.error(
@@ -431,7 +209,7 @@ export class ActiveWorkflowRunner implements IWebhookManager {
 				// 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 WebhookPathAlreadyTakenError(webhook.node, error);
+					error = new WebhookPathTakenError(webhook.node, error);
 				} else if (error.detail) {
 					// it's a error running the webhook methods (checkExists, create)
 					error.message = error.detail;
@@ -441,21 +219,21 @@ export class ActiveWorkflowRunner implements IWebhookManager {
 			}
 		}
 		await this.webhookService.populateCache();
-		// Save static data!
-		await WorkflowsService.saveStaticData(workflow);
+
+		await this.workflowStaticDataService.saveStaticData(workflow);
 	}
 
 	/**
-	 * Remove all the webhooks of the workflow
-	 *
+	 * Clear workflow-defined webhooks from the `webhook_entity` table.
 	 */
-	async removeWorkflowWebhooks(workflowId: string): Promise<void> {
-		const workflowData = await Db.collections.Workflow.findOne({
+	async clearWebhooks(workflowId: string) {
+		const workflowData = await this.workflowRepository.findOne({
 			where: { id: workflowId },
 			relations: ['shared', 'shared.user', 'shared.user.globalRole'],
 		});
+
 		if (workflowData === null) {
-			throw new Error(`Could not find workflow with id "${workflowId}"`);
+			throw new ApplicationError('Could not find workflow', { extra: { workflowId } });
 		}
 
 		const workflow = new Workflow({
@@ -478,19 +256,14 @@ export class ActiveWorkflowRunner implements IWebhookManager {
 		const webhooks = WebhookHelpers.getWorkflowWebhooks(workflow, additionalData, undefined, true);
 
 		for (const webhookData of webhooks) {
-			await workflow.deleteWebhook(webhookData, NodeExecuteFunctions, mode, 'update', false);
+			await workflow.deleteWebhook(webhookData, NodeExecuteFunctions, mode, 'update');
 		}
 
-		await WorkflowsService.saveStaticData(workflow);
+		await this.workflowStaticDataService.saveStaticData(workflow);
 
 		await this.webhookService.deleteWorkflowWebhooks(workflowId);
 	}
 
-	/**
-	 * Runs the given workflow
-	 *
-	 */
-
 	async runWorkflow(
 		workflowData: IWorkflowDb,
 		node: INode,
@@ -538,7 +311,6 @@ export class ActiveWorkflowRunner implements IWebhookManager {
 	/**
 	 * 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,
@@ -560,7 +332,7 @@ export class ActiveWorkflowRunner implements IWebhookManager {
 				donePromise?: IDeferredPromise<IRun | undefined>,
 			): void => {
 				this.logger.debug(`Received event to trigger execution for workflow "${workflow.name}"`);
-				void WorkflowsService.saveStaticData(workflow);
+				void this.workflowStaticDataService.saveStaticData(workflow);
 				const executePromise = this.runWorkflow(
 					workflowData,
 					node,
@@ -583,9 +355,11 @@ export class ActiveWorkflowRunner implements IWebhookManager {
 			};
 
 			returnFunctions.__emitError = (error: ExecutionError): void => {
-				void createErrorExecution(error, node, workflowData, workflow, mode).then(() => {
-					this.executeErrorWorkflow(error, workflowData, mode);
-				});
+				void this.executionService
+					.createErrorExecution(error, node, workflowData, workflow, mode)
+					.then(() => {
+						this.executeErrorWorkflow(error, workflowData, mode);
+					});
 			};
 			return returnFunctions;
 		};
@@ -594,7 +368,6 @@ export class ActiveWorkflowRunner implements IWebhookManager {
 	/**
 	 * 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,
@@ -616,7 +389,7 @@ export class ActiveWorkflowRunner implements IWebhookManager {
 				donePromise?: IDeferredPromise<IRun | undefined>,
 			): void => {
 				this.logger.debug(`Received trigger for workflow "${workflow.name}"`);
-				void WorkflowsService.saveStaticData(workflow);
+				void this.workflowStaticDataService.saveStaticData(workflow);
 
 				const executePromise = this.runWorkflow(
 					workflowData,
@@ -651,12 +424,8 @@ export class ActiveWorkflowRunner implements IWebhookManager {
 				// Remove the workflow as "active"
 
 				void this.activeWorkflows.remove(workflowData.id);
-				this.activationErrors[workflowData.id] = {
-					time: new Date().getTime(),
-					error: {
-						message: error.message,
-					},
-				};
+
+				void this.activationErrorsService.register(workflowData.id, error.message);
 
 				// Run Error Workflow if defined
 				const activationError = new WorkflowActivationError(
@@ -665,7 +434,7 @@ export class ActiveWorkflowRunner implements IWebhookManager {
 				);
 				this.executeErrorWorkflow(activationError, workflowData, mode);
 
-				this.addQueuedWorkflowActivation(activation, workflowData);
+				this.addQueuedWorkflowActivation(activation, workflowData as WorkflowEntity);
 			};
 			return returnFunctions;
 		};
@@ -694,126 +463,204 @@ export class ActiveWorkflowRunner implements IWebhookManager {
 	}
 
 	/**
-	 * Makes a workflow active
+	 * Register as active in memory all workflows stored as `active`.
+	 */
+	async addActiveWorkflows(activationMode: WorkflowActivateMode) {
+		const dbWorkflows = await this.workflowRepository.getAllActive();
+
+		if (dbWorkflows.length === 0) return;
+
+		this.logger.info(' ================================');
+		this.logger.info('   Start Active Workflows:');
+		this.logger.info(' ================================');
+
+		for (const dbWorkflow of dbWorkflows) {
+			this.logger.info(`   - ${dbWorkflow.display()}`);
+			this.logger.debug(`Initializing active workflow ${dbWorkflow.display()} (startup)`, {
+				workflowName: dbWorkflow.name,
+				workflowId: dbWorkflow.id,
+			});
+
+			try {
+				await this.add(dbWorkflow.id, activationMode, dbWorkflow);
+
+				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
+				if (error.message.includes('Authorization')) continue;
+
+				this.addQueuedWorkflowActivation('init', dbWorkflow);
+			}
+		}
+
+		this.logger.verbose('Finished activating workflows (startup)');
+	}
+
+	async clearAllActivationErrors() {
+		await this.activationErrorsService.clearAll();
+	}
+
+	async addAllTriggerAndPollerBasedWorkflows() {
+		await this.addActiveWorkflows('leadershipChange');
+	}
+
+	@OnShutdown()
+	async removeAllTriggerAndPollerBasedWorkflows() {
+		await this.activeWorkflows.removeAllTriggerAndPollerBasedWorkflows();
+	}
+
+	/**
+	 * Register a workflow as active.
 	 *
-	 * @param {string} workflowId The id of the workflow to activate
-	 * @param {IWorkflowDb} [workflowData] If workflowData is given it saves the DB query
+	 * 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,
-		activation: WorkflowActivateMode,
-		workflowData?: IWorkflowDb,
-	): Promise<void> {
-		let workflowInstance: Workflow;
+		activationMode: WorkflowActivateMode,
+		existingWorkflow?: WorkflowEntity,
+	) {
+		let workflow: Workflow;
+
+		let shouldAddWebhooks = true;
+		let shouldAddTriggersAndPollers = true;
+
+		/**
+		 * In a multi-main scenario, webhooks are stored in the database, while triggers
+		 * and pollers are run only by the leader main instance.
+		 *
+		 * - During a regular workflow activation (i.e. not leadership change), only the
+		 * leader should add webhooks to prevent duplicate insertions, and only the leader
+		 * should handle triggers and pollers to prevent duplicate work.
+		 *
+		 * - During a leadership change, webhooks remain in storage and so need not be added
+		 * again, and the new leader should take over the triggers and pollers that stopped
+		 * running when the former leader became unresponsive.
+		 */
+		if (this.multiMainSetup.isEnabled) {
+			if (activationMode !== 'leadershipChange') {
+				shouldAddWebhooks = this.multiMainSetup.isLeader;
+				shouldAddTriggersAndPollers = this.multiMainSetup.isLeader;
+			} else {
+				shouldAddWebhooks = false;
+				shouldAddTriggersAndPollers = this.multiMainSetup.isLeader;
+			}
+		}
+
 		try {
-			if (workflowData === undefined) {
-				workflowData = (await Db.collections.Workflow.findOne({
-					where: { id: workflowId },
-					relations: ['shared', 'shared.user', 'shared.user.globalRole', 'shared.role'],
-				})) as IWorkflowDb;
+			const dbWorkflow = existingWorkflow ?? (await this.workflowRepository.findById(workflowId));
+
+			if (!dbWorkflow) {
+				throw new WorkflowActivationError(`Failed to find workflow with ID "${workflowId}"`);
 			}
 
-			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,
+			workflow = new Workflow({
+				id: dbWorkflow.id,
+				name: dbWorkflow.name,
+				nodes: dbWorkflow.nodes,
+				connections: dbWorkflow.connections,
+				active: dbWorkflow.active,
 				nodeTypes: this.nodeTypes,
-				staticData: workflowData.staticData,
-				settings: workflowData.settings,
+				staticData: dbWorkflow.staticData,
+				settings: dbWorkflow.settings,
 			});
 
-			const canBeActivated = workflowInstance.checkIfWorkflowCanBeActivated(STARTING_NODES);
+			const canBeActivated = workflow.checkIfWorkflowCanBeActivated(STARTING_NODES);
+
 			if (!canBeActivated) {
-				this.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.',
+				throw new WorkflowActivationError(
+					`Workflow ${dbWorkflow.display()} has no node to start the workflow - at least one trigger, poller or webhook node is required`,
 				);
 			}
 
-			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 sharing = dbWorkflow.shared.find((shared) => shared.role.name === 'owner');
+
+			if (!sharing) {
+				throw new WorkflowActivationError(`Workflow ${dbWorkflow.display()} 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);
+			const additionalData = await WorkflowExecuteAdditionalData.getBase(sharing.user.id);
 
-			if (
-				workflowInstance.getTriggerNodes().length !== 0 ||
-				workflowInstance.getPollNodes().length !== 0
-			) {
-				await this.activeWorkflows.add(
-					workflowId,
-					workflowInstance,
+			if (shouldAddWebhooks) {
+				await this.addWebhooks(workflow, additionalData, 'trigger', activationMode);
+			}
+
+			if (shouldAddTriggersAndPollers) {
+				await this.addTriggersAndPollers(dbWorkflow, workflow, {
+					activationMode,
+					executionMode: 'trigger',
 					additionalData,
-					mode,
-					activation,
-					getTriggerFunctions,
-					getPollFunctions,
-				);
-				this.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];
-			}
+			await this.activationErrorsService.deregister(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
+			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);
 
-			// Save the error
-			this.activationErrors[workflowId] = {
-				time: new Date().getTime(),
-				error: {
-					message: error.message,
-				},
-			};
-
-			throw error;
+			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 WorkflowsService.saveStaticData(workflowInstance!);
+		await this.workflowStaticDataService.saveStaticData(workflow);
+	}
+
+	/**
+	 * Count all triggers in the workflow, excluding Manual Trigger.
+	 */
+	private countTriggers(
+		workflow: Workflow,
+		additionalData: IWorkflowExecuteAdditionalDataWorkflow,
+	) {
+		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
+		);
 	}
 
 	/**
@@ -821,10 +668,7 @@ export class ActiveWorkflowRunner implements IWebhookManager {
 	 * Meaning it will keep on trying to activate it in regular
 	 * amounts indefinitely.
 	 */
-	addQueuedWorkflowActivation(
-		activationMode: WorkflowActivateMode,
-		workflowData: IWorkflowDb,
-	): void {
+	addQueuedWorkflowActivation(activationMode: WorkflowActivateMode, workflowData: WorkflowEntity) {
 		const workflowId = workflowData.id;
 		const workflowName = workflowData.name;
 
@@ -837,7 +681,7 @@ export class ActiveWorkflowRunner implements IWebhookManager {
 				await this.add(workflowId, activationMode, workflowData);
 			} catch (error) {
 				ErrorReporter.error(error);
-				let lastTimeout = this.queuedWorkflowActivations[workflowId].lastTimeout;
+				let lastTimeout = this.queuedActivations[workflowId].lastTimeout;
 				if (lastTimeout < WORKFLOW_REACTIVATE_MAX_TIMEOUT) {
 					lastTimeout = Math.min(lastTimeout * 2, WORKFLOW_REACTIVATE_MAX_TIMEOUT);
 				}
@@ -852,8 +696,8 @@ export class ActiveWorkflowRunner implements IWebhookManager {
 					},
 				);
 
-				this.queuedWorkflowActivations[workflowId].lastTimeout = lastTimeout;
-				this.queuedWorkflowActivations[workflowId].timeout = setTimeout(retryFunction, lastTimeout);
+				this.queuedActivations[workflowId].lastTimeout = lastTimeout;
+				this.queuedActivations[workflowId].timeout = setTimeout(retryFunction, lastTimeout);
 				return;
 			}
 			this.logger.info(
@@ -869,7 +713,7 @@ export class ActiveWorkflowRunner implements IWebhookManager {
 		// multiple run in parallel
 		this.removeQueuedWorkflowActivation(workflowId);
 
-		this.queuedWorkflowActivations[workflowId] = {
+		this.queuedActivations[workflowId] = {
 			activationMode,
 			lastTimeout: WORKFLOW_REACTIVATE_INITIAL_TIMEOUT,
 			timeout: setTimeout(retryFunction, WORKFLOW_REACTIVATE_INITIAL_TIMEOUT),
@@ -880,18 +724,18 @@ export class ActiveWorkflowRunner implements IWebhookManager {
 	/**
 	 * Remove a workflow from the activation queue
 	 */
-	removeQueuedWorkflowActivation(workflowId: string): void {
-		if (this.queuedWorkflowActivations[workflowId]) {
-			clearTimeout(this.queuedWorkflowActivations[workflowId].timeout);
-			delete this.queuedWorkflowActivations[workflowId];
+	removeQueuedWorkflowActivation(workflowId: string) {
+		if (this.queuedActivations[workflowId]) {
+			clearTimeout(this.queuedActivations[workflowId].timeout);
+			delete this.queuedActivations[workflowId];
 		}
 	}
 
 	/**
 	 * Remove all workflows from the activation queue
 	 */
-	removeAllQueuedWorkflowActivations(): void {
-		for (const workflowId in this.queuedWorkflowActivations) {
+	removeAllQueuedWorkflowActivations() {
+		for (const workflowId in this.queuedActivations) {
 			this.removeQueuedWorkflowActivation(workflowId);
 		}
 	}
@@ -902,10 +746,10 @@ export class ActiveWorkflowRunner implements IWebhookManager {
 	 * @param {string} workflowId The id of the workflow to deactivate
 	 */
 	// TODO: this should happen in a transaction
-	async remove(workflowId: string): Promise<void> {
+	async remove(workflowId: string) {
 		// Remove all the webhooks of the workflow
 		try {
-			await this.removeWorkflowWebhooks(workflowId);
+			await this.clearWebhooks(workflowId);
 		} catch (error) {
 			ErrorReporter.error(error);
 			this.logger.error(
@@ -913,12 +757,9 @@ export class ActiveWorkflowRunner implements IWebhookManager {
 			);
 		}
 
-		if (this.activationErrors[workflowId] !== undefined) {
-			// If there were any activation errors delete them
-			delete this.activationErrors[workflowId];
-		}
+		await this.activationErrorsService.deregister(workflowId);
 
-		if (this.queuedWorkflowActivations[workflowId] !== undefined) {
+		if (this.queuedActivations[workflowId] !== undefined) {
 			this.removeQueuedWorkflowActivation(workflowId);
 		}
 
@@ -931,4 +772,58 @@ export class ActiveWorkflowRunner implements IWebhookManager {
 			}
 		}
 	}
+
+	/**
+	 * 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: IWorkflowExecuteAdditionalDataWorkflow;
+		},
+	) {
+		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/CredentialTypes.ts b/packages/cli/src/CredentialTypes.ts
index 5e4277f1d0..d97825a672 100644
--- a/packages/cli/src/CredentialTypes.ts
+++ b/packages/cli/src/CredentialTypes.ts
@@ -1,6 +1,11 @@
 import { Service } from 'typedi';
 import { loadClassInIsolation } from 'n8n-core';
-import type { ICredentialType, ICredentialTypes, LoadedClass } from 'n8n-workflow';
+import {
+	ApplicationError,
+	type ICredentialType,
+	type ICredentialTypes,
+	type LoadedClass,
+} from 'n8n-workflow';
 import { RESPONSE_ERROR_MESSAGES } from '@/constants';
 import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
 
@@ -17,8 +22,8 @@ export class CredentialTypes implements ICredentialTypes {
 		return this.getCredential(credentialType).type;
 	}
 
-	getNodeTypesToTestWith(type: string): string[] {
-		return this.loadNodesAndCredentials.knownCredentials[type]?.nodesToTestWith ?? [];
+	getSupportedNodes(type: string): string[] {
+		return this.loadNodesAndCredentials.knownCredentials[type]?.supportedNodes ?? [];
 	}
 
 	/**
@@ -46,6 +51,8 @@ export class CredentialTypes implements ICredentialTypes {
 			loadedCredentials[type] = { sourcePath, type: loaded };
 			return loadedCredentials[type];
 		}
-		throw new Error(`${RESPONSE_ERROR_MESSAGES.NO_CREDENTIAL}: ${type}`);
+		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 da045e07fd..dad6f9c3ef 100644
--- a/packages/cli/src/CredentialsHelper.ts
+++ b/packages/cli/src/CredentialsHelper.ts
@@ -32,6 +32,7 @@ import type {
 	INodeTypes,
 	IWorkflowExecuteAdditionalData,
 	ICredentialTestFunctions,
+	IExecuteData,
 } from 'n8n-workflow';
 import {
 	ICredentialsHelper,
@@ -40,9 +41,9 @@ import {
 	RoutingNode,
 	Workflow,
 	ErrorReporterProxy as ErrorReporter,
+	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';
@@ -50,10 +51,12 @@ 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 { isObjectLiteral } from './utils';
 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 { OAUTH2_CREDENTIAL_TEST_SUCCEEDED, OAUTH2_CREDENTIAL_TEST_FAILED } = RESPONSE_ERROR_MESSAGES;
 
@@ -80,7 +83,9 @@ const mockNodeTypes: INodeTypes = {
 	},
 	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);
 	},
@@ -93,6 +98,8 @@ export class CredentialsHelper extends ICredentialsHelper {
 		private readonly credentialTypes: CredentialTypes,
 		private readonly nodeTypes: NodeTypes,
 		private readonly credentialsOverwrites: CredentialsOverwrites,
+		private readonly credentialsRepository: CredentialsRepository,
+		private readonly sharedCredentialsRepository: SharedCredentialsRepository,
 	) {
 		super();
 	}
@@ -106,7 +113,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);
@@ -131,20 +137,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
@@ -221,12 +220,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;
@@ -236,7 +234,6 @@ export class CredentialsHelper extends ICredentialsHelper {
 			node,
 			parameterValue,
 			'internal',
-			defaultTimezone,
 			additionalKeys,
 			undefined,
 			'',
@@ -258,9 +255,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,
@@ -268,20 +262,25 @@ 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(
@@ -294,14 +293,12 @@ export class CredentialsHelper extends ICredentialsHelper {
 
 	/**
 	 * 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) {
@@ -337,17 +334,13 @@ 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> {
@@ -367,7 +360,7 @@ export class CredentialsHelper extends ICredentialsHelper {
 			decryptedDataOriginal,
 			type,
 			mode,
-			defaultTimezone,
+			executeData,
 			expressionResolveValues,
 			canUseSecrets,
 		);
@@ -381,7 +374,7 @@ export class CredentialsHelper extends ICredentialsHelper {
 		decryptedDataOriginal: ICredentialDataDecryptedObject,
 		type: string,
 		mode: WorkflowExecuteMode,
-		defaultTimezone: string,
+		executeData?: IExecuteData,
 		expressionResolveValues?: ICredentialsExpressionResolveValues,
 		canUseSecrets?: boolean,
 	): ICredentialDataDecryptedObject {
@@ -413,8 +406,6 @@ export class CredentialsHelper extends ICredentialsHelper {
 		});
 
 		if (expressionResolveValues) {
-			const timezone = expressionResolveValues.workflow.settings.timezone ?? defaultTimezone;
-
 			try {
 				decryptedData = expressionResolveValues.workflow.expression.getParameterValue(
 					decryptedData as INodeParameters,
@@ -424,9 +415,8 @@ export class CredentialsHelper extends ICredentialsHelper {
 					expressionResolveValues.node.name,
 					expressionResolveValues.connectionInputData,
 					mode,
-					timezone,
 					additionalKeys,
-					undefined,
+					executeData,
 					false,
 					decryptedData,
 				) as ICredentialDataDecryptedObject;
@@ -447,7 +437,6 @@ export class CredentialsHelper extends ICredentialsHelper {
 				mockNode,
 				decryptedData as INodeParameters,
 				mode,
-				defaultTimezone,
 				additionalKeys,
 				undefined,
 				undefined,
@@ -460,10 +449,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,
@@ -484,7 +469,7 @@ export class CredentialsHelper extends ICredentialsHelper {
 			type,
 		};
 
-		await Db.collections.Credentials.update(findQuery, newCredentialsData);
+		await this.credentialsRepository.update(findQuery, newCredentialsData);
 	}
 
 	private static hasAccessToken(credentialsDecrypted: ICredentialsDecrypted) {
@@ -506,8 +491,8 @@ export class CredentialsHelper extends ICredentialsHelper {
 			};
 		}
 
-		const nodeTypesToTestWith = this.credentialTypes.getNodeTypesToTestWith(credentialType);
-		for (const nodeName of nodeTypesToTestWith) {
+		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
@@ -597,9 +582,9 @@ export class CredentialsHelper extends ICredentialsHelper {
 					credentialsDecrypted.data,
 					credentialType,
 					'internal' as WorkflowExecuteMode,
-					additionalData.timezone,
 					undefined,
-					user.isOwner,
+					undefined,
+					user.hasGlobalScope('externalSecret:use'),
 				);
 			} catch (error) {
 				this.logger.debug('Credential test failed', error);
@@ -796,7 +781,7 @@ export class CredentialsHelper extends ICredentialsHelper {
 			return false;
 		}
 
-		const credential = await Db.collections.SharedCredentials.findOne({
+		const credential = await this.sharedCredentialsRepository.findOne({
 			where: {
 				role: {
 					scope: 'credential',
@@ -822,36 +807,6 @@ export class CredentialsHelper extends ICredentialsHelper {
 	}
 }
 
-/**
- * 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,
diff --git a/packages/cli/src/Db.ts b/packages/cli/src/Db.ts
index daebfa031d..c53419ac76 100644
--- a/packages/cli/src/Db.ts
+++ b/packages/cli/src/Db.ts
@@ -1,12 +1,9 @@
 /* eslint-disable @typescript-eslint/restrict-template-expressions */
-
 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 { ErrorReporterProxy as ErrorReporter } from 'n8n-workflow';
-
-import type { IDatabaseCollections } from '@/Interfaces';
+import { ApplicationError, ErrorReporterProxy as ErrorReporter } from 'n8n-workflow';
 
 import config from '@/config';
 
@@ -21,28 +18,6 @@ import {
 import { inTest } from '@/constants';
 import { wrapMigration } from '@db/utils/migrationHelpers';
 import type { DatabaseType, Migration } from '@db/types';
-import {
-	AuthIdentityRepository,
-	AuthProviderSyncHistoryRepository,
-	CredentialsRepository,
-	EventDestinationsRepository,
-	ExecutionDataRepository,
-	ExecutionMetadataRepository,
-	ExecutionRepository,
-	InstalledNodesRepository,
-	InstalledPackagesRepository,
-	RoleRepository,
-	SettingsRepository,
-	SharedCredentialsRepository,
-	SharedWorkflowRepository,
-	UserRepository,
-	VariablesRepository,
-	WorkflowRepository,
-	WorkflowStatisticsRepository,
-	WorkflowTagMappingRepository,
-} from '@db/repositories';
-
-export const collections = {} as IDatabaseCollections;
 
 let connection: Connection;
 
@@ -118,7 +93,7 @@ export function getConnectionOptions(dbType: DatabaseType): ConnectionOptions {
 			return getSqliteConnectionOptions();
 
 		default:
-			throw new Error(`The database "${dbType}" is currently not supported!`);
+			throw new ApplicationError('Database type currently not supported', { extra: { dbType } });
 	}
 }
 
@@ -165,32 +140,6 @@ export async function init(testConnectionOptions?: ConnectionOptions): Promise<v
 	}
 
 	connectionState.connected = true;
-
-	/**
-	 * @important Do not add to these collections. Inject the repository as a dependency instead.
-	 */
-	collections.AuthIdentity = Container.get(AuthIdentityRepository);
-	collections.AuthProviderSyncHistory = Container.get(AuthProviderSyncHistoryRepository);
-	collections.EventDestinations = Container.get(EventDestinationsRepository);
-	collections.Execution = Container.get(ExecutionRepository);
-	collections.ExecutionData = Container.get(ExecutionDataRepository);
-	collections.ExecutionMetadata = Container.get(ExecutionMetadataRepository);
-	collections.InstalledNodes = Container.get(InstalledNodesRepository);
-	collections.InstalledPackages = Container.get(InstalledPackagesRepository);
-	collections.SharedCredentials = Container.get(SharedCredentialsRepository);
-	collections.SharedWorkflow = Container.get(SharedWorkflowRepository);
-	collections.Variables = Container.get(VariablesRepository);
-	collections.WorkflowStatistics = Container.get(WorkflowStatisticsRepository);
-	collections.WorkflowTagMapping = Container.get(WorkflowTagMappingRepository);
-
-	/**
-	 * @important Do not remove these collections until cloud hooks are backwards compatible.
-	 */
-	collections.Role = Container.get(RoleRepository);
-	collections.User = Container.get(UserRepository);
-	collections.Settings = Container.get(SettingsRepository);
-	collections.Credentials = Container.get(CredentialsRepository);
-	collections.Workflow = Container.get(WorkflowRepository);
 }
 
 export async function migrate() {
diff --git a/packages/cli/src/ErrorReporting.ts b/packages/cli/src/ErrorReporting.ts
index e850b6e4fa..33a1da0c39 100644
--- a/packages/cli/src/ErrorReporting.ts
+++ b/packages/cli/src/ErrorReporting.ts
@@ -1,6 +1,6 @@
 import { createHash } from 'crypto';
 import config from '@/config';
-import { ErrorReporterProxy, ExecutionBaseError } from 'n8n-workflow';
+import { ErrorReporterProxy, ApplicationError } from 'n8n-workflow';
 
 let initialized = false;
 
@@ -12,7 +12,7 @@ export const initErrorHandling = async () => {
 	});
 
 	const dsn = config.getEnv('diagnostics.config.sentry.dsn');
-	if (!config.getEnv('diagnostics.enabled') || !dsn) {
+	if (!dsn) {
 		initialized = true;
 		return;
 	}
@@ -20,31 +20,63 @@ export const initErrorHandling = async () => {
 	// Collect longer stacktraces
 	Error.stackTraceLimit = 50;
 
-	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, addGlobalEventProcessor } = 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,
+				},
+			}),
+		],
 	});
 
 	const seenErrors = new Set<string>();
-	addGlobalEventProcessor((event, { originalException }) => {
-		if (originalException instanceof ExecutionBaseError && originalException.severity === 'warning')
-			return null;
-		if (!event.exception) return null;
-		const eventHash = createHash('sha1').update(JSON.stringify(event.exception)).digest('base64');
+	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;
 	});
 
diff --git a/packages/cli/src/ExpressionEvalator.ts b/packages/cli/src/ExpressionEvaluator.ts
similarity index 100%
rename from packages/cli/src/ExpressionEvalator.ts
rename to packages/cli/src/ExpressionEvaluator.ts
diff --git a/packages/cli/src/ExternalHooks.ts b/packages/cli/src/ExternalHooks.ts
index 315131284b..eea5f1f4cf 100644
--- a/packages/cli/src/ExternalHooks.ts
+++ b/packages/cli/src/ExternalHooks.ts
@@ -1,22 +1,38 @@
 /* eslint-disable @typescript-eslint/no-var-requires */
-
 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 { 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,
+	) {
+		/* eslint-disable @typescript-eslint/naming-convention */
+		this.dbCollections = {
+			User: userRepository,
+			Settings: settingsRepository,
+			Credentials: credentialsRepository,
+			Workflow: workflowRepository,
+		};
+		/* eslint-enable @typescript-eslint/naming-convention */
+	}
 
 	async init(): Promise<void> {
 		if (this.initDidRun) {
@@ -52,12 +68,13 @@ export class ExternalHooks implements IExternalHooksClass {
 
 					const hookFile = require(hookFilePath) as IExternalHooksFileData;
 					this.loadHooks(hookFile);
-				} catch (error) {
-					throw new Error(
-						// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-						`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,
+					});
 				}
 			}
 		}
@@ -82,16 +99,15 @@ 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]) {
 			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
index 10eed808a6..0cc8a6c086 100644
--- a/packages/cli/src/ExternalSecrets/ExternalSecrets.controller.ee.ts
+++ b/packages/cli/src/ExternalSecrets/ExternalSecrets.controller.ee.ts
@@ -1,28 +1,29 @@
-import { Authorized, Get, Post, RestController } from '@/decorators';
+import { Authorized, Get, Post, RestController, RequireGlobalScope } from '@/decorators';
 import { ExternalSecretsRequest } from '@/requests';
-import { NotFoundError } from '@/ResponseHelper';
 import { Response } from 'express';
-import { Service } from 'typedi';
-import { ProviderNotFoundError, ExternalSecretsService } from './ExternalSecrets.service.ee';
+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';
 
-@Service()
-@Authorized(['global', 'owner'])
+@Authorized()
 @RestController('/external-secrets')
 export class ExternalSecretsController {
 	constructor(private readonly secretsService: ExternalSecretsService) {}
 
 	@Get('/providers')
+	@RequireGlobalScope('externalSecretsProvider:list')
 	async getProviders() {
 		return this.secretsService.getProviders();
 	}
 
 	@Get('/providers/:provider')
+	@RequireGlobalScope('externalSecretsProvider:read')
 	async getProvider(req: ExternalSecretsRequest.GetProvider) {
 		const providerName = req.params.provider;
 		try {
 			return this.secretsService.getProvider(providerName);
 		} catch (e) {
-			if (e instanceof ProviderNotFoundError) {
+			if (e instanceof ExternalSecretsProviderNotFoundError) {
 				throw new NotFoundError(`Could not find provider "${e.providerName}"`);
 			}
 			throw e;
@@ -30,6 +31,7 @@ export class ExternalSecretsController {
 	}
 
 	@Post('/providers/:provider/test')
+	@RequireGlobalScope('externalSecretsProvider:read')
 	async testProviderSettings(req: ExternalSecretsRequest.TestProviderSettings, res: Response) {
 		const providerName = req.params.provider;
 		try {
@@ -41,7 +43,7 @@ export class ExternalSecretsController {
 			}
 			return result;
 		} catch (e) {
-			if (e instanceof ProviderNotFoundError) {
+			if (e instanceof ExternalSecretsProviderNotFoundError) {
 				throw new NotFoundError(`Could not find provider "${e.providerName}"`);
 			}
 			throw e;
@@ -49,12 +51,13 @@ export class ExternalSecretsController {
 	}
 
 	@Post('/providers/:provider')
+	@RequireGlobalScope('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 ProviderNotFoundError) {
+			if (e instanceof ExternalSecretsProviderNotFoundError) {
 				throw new NotFoundError(`Could not find provider "${e.providerName}"`);
 			}
 			throw e;
@@ -63,12 +66,13 @@ export class ExternalSecretsController {
 	}
 
 	@Post('/providers/:provider/connect')
+	@RequireGlobalScope('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 ProviderNotFoundError) {
+			if (e instanceof ExternalSecretsProviderNotFoundError) {
 				throw new NotFoundError(`Could not find provider "${e.providerName}"`);
 			}
 			throw e;
@@ -77,6 +81,7 @@ export class ExternalSecretsController {
 	}
 
 	@Post('/providers/:provider/update')
+	@RequireGlobalScope('externalSecretsProvider:sync')
 	async updateProvider(req: ExternalSecretsRequest.UpdateProvider, res: Response) {
 		const providerName = req.params.provider;
 		try {
@@ -88,7 +93,7 @@ export class ExternalSecretsController {
 			}
 			return { updated: resp };
 		} catch (e) {
-			if (e instanceof ProviderNotFoundError) {
+			if (e instanceof ExternalSecretsProviderNotFoundError) {
 				throw new NotFoundError(`Could not find provider "${e.providerName}"`);
 			}
 			throw e;
@@ -96,6 +101,7 @@ export class ExternalSecretsController {
 	}
 
 	@Get('/secrets')
+	@RequireGlobalScope('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
index 9952c8a9b8..1087443ddb 100644
--- a/packages/cli/src/ExternalSecrets/ExternalSecrets.service.ee.ts
+++ b/packages/cli/src/ExternalSecrets/ExternalSecrets.service.ee.ts
@@ -5,12 +5,7 @@ import type { IDataObject } from 'n8n-workflow';
 import { deepCopy } from 'n8n-workflow';
 import Container, { Service } from 'typedi';
 import { ExternalSecretsManager } from './ExternalSecretsManager.ee';
-
-export class ProviderNotFoundError extends Error {
-	constructor(public providerName: string) {
-		super(undefined);
-	}
-}
+import { ExternalSecretsProviderNotFoundError } from '@/errors/external-secrets-provider-not-found.error';
 
 @Service()
 export class ExternalSecretsService {
@@ -18,7 +13,7 @@ export class ExternalSecretsService {
 		const providerAndSettings =
 			Container.get(ExternalSecretsManager).getProviderWithSettings(providerName);
 		if (!providerAndSettings) {
-			throw new ProviderNotFoundError(providerName);
+			throw new ExternalSecretsProviderNotFoundError(providerName);
 		}
 		const { provider, settings } = providerAndSettings;
 		return {
@@ -76,7 +71,6 @@ export class ExternalSecretsService {
 		return copiedData;
 	}
 
-	// eslint-disable-next-line @typescript-eslint/no-explicit-any
 	private unredactRestoreValues(unmerged: any, replacement: any) {
 		// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
 		for (const [key, value] of Object.entries(unmerged)) {
@@ -111,7 +105,7 @@ export class ExternalSecretsService {
 		const providerAndSettings =
 			Container.get(ExternalSecretsManager).getProviderWithSettings(providerName);
 		if (!providerAndSettings) {
-			throw new ProviderNotFoundError(providerName);
+			throw new ExternalSecretsProviderNotFoundError(providerName);
 		}
 		const { settings } = providerAndSettings;
 		const newData = this.unredact(data, settings.settings);
@@ -122,7 +116,7 @@ export class ExternalSecretsService {
 		const providerAndSettings =
 			Container.get(ExternalSecretsManager).getProviderWithSettings(providerName);
 		if (!providerAndSettings) {
-			throw new ProviderNotFoundError(providerName);
+			throw new ExternalSecretsProviderNotFoundError(providerName);
 		}
 		await Container.get(ExternalSecretsManager).setProviderConnected(providerName, connected);
 		return this.getProvider(providerName);
@@ -136,7 +130,7 @@ export class ExternalSecretsService {
 		const providerAndSettings =
 			Container.get(ExternalSecretsManager).getProviderWithSettings(providerName);
 		if (!providerAndSettings) {
-			throw new ProviderNotFoundError(providerName);
+			throw new ExternalSecretsProviderNotFoundError(providerName);
 		}
 		const { settings } = providerAndSettings;
 		const newData = this.unredact(data, settings.settings);
@@ -147,7 +141,7 @@ export class ExternalSecretsService {
 		const providerAndSettings =
 			Container.get(ExternalSecretsManager).getProviderWithSettings(providerName);
 		if (!providerAndSettings) {
-			throw new ProviderNotFoundError(providerName);
+			throw new ExternalSecretsProviderNotFoundError(providerName);
 		}
 		return Container.get(ExternalSecretsManager).updateProvider(providerName);
 	}
diff --git a/packages/cli/src/ExternalSecrets/ExternalSecretsManager.ee.ts b/packages/cli/src/ExternalSecrets/ExternalSecretsManager.ee.ts
index 16b58feb0f..90f8145f1c 100644
--- a/packages/cli/src/ExternalSecrets/ExternalSecretsManager.ee.ts
+++ b/packages/cli/src/ExternalSecrets/ExternalSecretsManager.ee.ts
@@ -1,4 +1,4 @@
-import { SettingsRepository } from '@/databases/repositories';
+import { SettingsRepository } from '@db/repositories/settings.repository';
 import type {
 	ExternalSecretsSettings,
 	SecretsProvider,
@@ -10,16 +10,13 @@ import Container, { Service } from 'typedi';
 
 import { Logger } from '@/Logger';
 
-import { jsonParse, type IDataObject } from 'n8n-workflow';
-import {
-	EXTERNAL_SECRETS_INITIAL_BACKOFF,
-	EXTERNAL_SECRETS_MAX_BACKOFF,
-	EXTERNAL_SECRETS_UPDATE_INTERVAL,
-} from './constants';
+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 { OrchestrationMainService } from '@/services/orchestration/main/orchestration.main.service';
+import { SingleMainSetup } from '@/services/orchestration/main/SingleMainSetup';
 
 @Service()
 export class ExternalSecretsManager {
@@ -51,10 +48,7 @@ export class ExternalSecretsManager {
 					this.initialized = true;
 					resolve();
 					this.initializingPromise = undefined;
-					this.updateInterval = setInterval(
-						async () => this.updateSecrets(),
-						EXTERNAL_SECRETS_UPDATE_INTERVAL,
-					);
+					this.updateInterval = setInterval(async () => this.updateSecrets(), updateIntervalTime());
 				});
 			}
 			return this.initializingPromise;
@@ -82,7 +76,7 @@ export class ExternalSecretsManager {
 	}
 
 	async broadcastReloadExternalSecretsProviders() {
-		await Container.get(OrchestrationMainService).broadcastReloadExternalSecretsProviders();
+		await Container.get(SingleMainSetup).broadcastReloadExternalSecretsProviders();
 	}
 
 	private decryptSecretsSettings(value: string): ExternalSecretsSettings {
@@ -90,7 +84,7 @@ export class ExternalSecretsManager {
 		try {
 			return jsonParse(decryptedData);
 		} catch (e) {
-			throw new Error(
+			throw new ApplicationError(
 				'External Secrets Settings could not be decrypted. The likely reason is that a different "encryptionKey" was used to encrypt the data.',
 			);
 		}
diff --git a/packages/cli/src/ExternalSecrets/constants.ts b/packages/cli/src/ExternalSecrets/constants.ts
index 534b4ceb72..3408cfac0b 100644
--- a/packages/cli/src/ExternalSecrets/constants.ts
+++ b/packages/cli/src/ExternalSecrets/constants.ts
@@ -1,6 +1,5 @@
 export const EXTERNAL_SECRETS_DB_KEY = 'feature.externalSecrets';
-export const EXTERNAL_SECRETS_UPDATE_INTERVAL = 5 * 60 * 1000;
 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_]+$/;
+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
index 54885664ff..b498216744 100644
--- a/packages/cli/src/ExternalSecrets/externalSecretsHelper.ee.ts
+++ b/packages/cli/src/ExternalSecrets/externalSecretsHelper.ee.ts
@@ -1,6 +1,10 @@
 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/infisical.ts b/packages/cli/src/ExternalSecrets/providers/infisical.ts
index 39a0eb92d4..0d700486a7 100644
--- a/packages/cli/src/ExternalSecrets/providers/infisical.ts
+++ b/packages/cli/src/ExternalSecrets/providers/infisical.ts
@@ -2,7 +2,7 @@ import type { SecretsProvider, SecretsProviderSettings, SecretsProviderState } f
 import InfisicalClient from 'infisical-node';
 import { populateClientWorkspaceConfigsHelper } from 'infisical-node/lib/helpers/key';
 import { getServiceTokenData } from 'infisical-node/lib/api/serviceTokenData';
-import type { IDataObject, INodeProperties } from 'n8n-workflow';
+import { ApplicationError, type IDataObject, type INodeProperties } from 'n8n-workflow';
 import { EXTERNAL_SECRETS_NAME_REGEX } from '../constants';
 
 export interface InfisicalSettings {
@@ -74,10 +74,10 @@ export class InfisicalProvider implements SecretsProvider {
 
 	async update(): Promise<void> {
 		if (!this.client) {
-			throw new Error('Updated attempted on Infisical when initialization failed');
+			throw new ApplicationError('Updated attempted on Infisical when initialization failed');
 		}
 		if (!(await this.test())[0]) {
-			throw new Error('Infisical provider test failed during update');
+			throw new ApplicationError('Infisical provider test failed during update');
 		}
 		const secrets = (await this.client.getAllSecrets({
 			environment: this.environment,
@@ -120,7 +120,7 @@ export class InfisicalProvider implements SecretsProvider {
 		if (serviceTokenData.scopes) {
 			return serviceTokenData.scopes[0].environment;
 		}
-		throw new Error("Couldn't find environment for Infisical");
+		throw new ApplicationError("Couldn't find environment for Infisical");
 	}
 
 	async test(): Promise<[boolean] | [boolean, string]> {
diff --git a/packages/cli/src/ExternalSecrets/providers/vault.ts b/packages/cli/src/ExternalSecrets/providers/vault.ts
index 365684e6e4..6b1046402a 100644
--- a/packages/cli/src/ExternalSecrets/providers/vault.ts
+++ b/packages/cli/src/ExternalSecrets/providers/vault.ts
@@ -5,6 +5,7 @@ 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';
@@ -250,19 +251,15 @@ export class VaultProvider extends SecretsProvider {
 		this.#http = axios.create({ baseURL: baseURL.toString() });
 		if (this.settings.namespace) {
 			this.#http.interceptors.request.use((config) => {
-				return {
-					...config,
-					// eslint-disable-next-line @typescript-eslint/naming-convention, @typescript-eslint/no-unsafe-assignment
-					headers: { ...config.headers, 'X-Vault-Namespace': this.settings.namespace },
-				};
+				config.headers['X-Vault-Namespace'] = this.settings.namespace;
+				return config;
 			});
 		}
 		this.#http.interceptors.request.use((config) => {
-			if (!this.#currentToken) {
-				return config;
+			if (this.#currentToken) {
+				config.headers['X-Vault-Token'] = this.#currentToken;
 			}
-			// eslint-disable-next-line @typescript-eslint/naming-convention, @typescript-eslint/no-unsafe-assignment
-			return { ...config, headers: { ...config.headers, 'X-Vault-Token': this.#currentToken } };
+			return config;
 		});
 	}
 
@@ -422,10 +419,14 @@ export class VaultProvider extends SecretsProvider {
 		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: listPath,
-				// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-explicit-any
-				method: 'LIST' as any,
+				url,
+				// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+				method,
 			});
 		} catch {
 			return null;
diff --git a/packages/cli/src/GenericHelpers.ts b/packages/cli/src/GenericHelpers.ts
index 63edec827f..92c7ad71ca 100644
--- a/packages/cli/src/GenericHelpers.ts
+++ b/packages/cli/src/GenericHelpers.ts
@@ -1,39 +1,11 @@
 import type express from 'express';
-import type {
-	ExecutionError,
-	INode,
-	IRunExecutionData,
-	Workflow,
-	WorkflowExecuteMode,
-} from 'n8n-workflow';
 import { validate } from 'class-validator';
-import { Container } from 'typedi';
-import { Like } from 'typeorm';
-import config from '@/config';
-import * as Db from '@/Db';
-import type { ExecutionPayload, ICredentialsDb, IWorkflowDb } from '@/Interfaces';
-import * as ResponseHelper from '@/ResponseHelper';
 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';
-import { ExecutionRepository } from '@db/repositories';
-
-/**
- * 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}`;
-}
+import type { UserRoleChangePayload, UserUpdatePayload } from '@/requests';
+import { BadRequestError } from './errors/response-errors/bad-request.error';
 
 /**
  * Returns the session id if one is set
@@ -42,60 +14,14 @@ 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.
- */
-
-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]);
-
-		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}`;
-}
-
 export async function validateEntity(
-	entity: WorkflowEntity | CredentialsEntity | TagEntity | User | UserUpdatePayload,
+	entity:
+		| WorkflowEntity
+		| CredentialsEntity
+		| TagEntity
+		| User
+		| UserUpdatePayload
+		| UserRoleChangePayload,
 ): Promise<void> {
 	const errors = await validate(entity);
 
@@ -108,89 +34,8 @@ export async function validateEntity(
 		.join(' | ');
 
 	if (errorMessages) {
-		throw new ResponseHelper.BadRequestError(errorMessages);
+		throw new BadRequestError(errorMessages);
 	}
 }
 
-/**
- * Create an error execution
- *
- * @param {INode} node
- * @param {IWorkflowDb} workflowData
- * @param {Workflow} workflow
- * @param {WorkflowExecuteMode} mode
- * @returns
- * @memberof ActiveWorkflowRunner
- */
-
-export async function createErrorExecution(
-	error: ExecutionError,
-	node: INode,
-	workflowData: IWorkflowDb,
-	workflow: Workflow,
-	mode: WorkflowExecuteMode,
-): Promise<void> {
-	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 Container.get(ExecutionRepository).createNewExecution(fullExecutionData);
-}
-
 export const DEFAULT_EXECUTIONS_GET_ALL_LIMIT = 20;
diff --git a/packages/cli/src/Interfaces.ts b/packages/cli/src/Interfaces.ts
index f5838df115..88a0c2f610 100644
--- a/packages/cli/src/Interfaces.ts
+++ b/packages/cli/src/Interfaces.ts
@@ -16,7 +16,6 @@ import type {
 	IWorkflowBase,
 	CredentialLoadingDetails,
 	Workflow,
-	WorkflowActivateMode,
 	WorkflowExecuteMode,
 	ExecutionStatus,
 	IExecutionsSummary,
@@ -31,7 +30,6 @@ import type { ActiveWorkflowRunner } from '@/ActiveWorkflowRunner';
 import type { WorkflowExecute } from 'n8n-core';
 
 import type PCancelable from 'p-cancelable';
-import type { FindOperator, Repository } from 'typeorm';
 
 import type { ChildProcess } from 'child_process';
 
@@ -41,42 +39,15 @@ 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,
-	ExecutionDataRepository,
-	ExecutionMetadataRepository,
-	ExecutionRepository,
-	InstalledNodesRepository,
-	InstalledPackagesRepository,
-	RoleRepository,
-	SettingsRepository,
-	SharedCredentialsRepository,
-	SharedWorkflowRepository,
-	UserRepository,
-	VariablesRepository,
-	WorkflowRepository,
-	WorkflowStatisticsRepository,
-	WorkflowTagMappingRepository,
-} from '@db/repositories';
+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 { ExternalHooks } from './ExternalHooks';
 import type { LICENSE_FEATURES, LICENSE_QUOTAS } from './constants';
 import type { WorkflowWithSharingsAndCredentials } from './workflows/workflows.types';
-
-export interface IActivationError {
-	time: number;
-	error: {
-		message: string;
-	};
-}
-
-export interface IQueuedWorkflowActivations {
-	activationMode: WorkflowActivateMode;
-	lastTimeout: number;
-	timeout: NodeJS.Timeout;
-	workflowData: IWorkflowDb;
-}
+import type { WorkerJobStatusSummary } from './services/orchestration/worker/types';
+import type { Scope } from '@n8n/permissions';
 
 export interface ICredentialsTypeData {
 	[key: string]: CredentialLoadingDetails;
@@ -86,33 +57,6 @@ export interface ICredentialsOverwrite {
 	[key: string]: ICredentialDataDecryptedObject;
 }
 
-/**
- * @important Do not add to these collections. Inject the repository as a dependency instead.
- */
-
-/* eslint-disable @typescript-eslint/naming-convention */
-export interface IDatabaseCollections extends Record<string, Repository<any>> {
-	AuthIdentity: AuthIdentityRepository;
-	AuthProviderSyncHistory: AuthProviderSyncHistoryRepository;
-	Credentials: CredentialsRepository;
-	EventDestinations: EventDestinationsRepository;
-	Execution: ExecutionRepository;
-	ExecutionData: ExecutionDataRepository;
-	ExecutionMetadata: ExecutionMetadataRepository;
-	InstalledNodes: InstalledNodesRepository;
-	InstalledPackages: InstalledPackagesRepository;
-	Role: RoleRepository;
-	Settings: SettingsRepository;
-	SharedCredentials: SharedCredentialsRepository;
-	SharedWorkflow: SharedWorkflowRepository;
-	User: UserRepository;
-	Variables: VariablesRepository;
-	Workflow: WorkflowRepository;
-	WorkflowStatistics: WorkflowStatisticsRepository;
-	WorkflowTagMapping: WorkflowTagMappingRepository;
-}
-/* eslint-enable @typescript-eslint/naming-convention */
-
 // ----------------------------------
 //               tags
 // ----------------------------------
@@ -137,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[];
 }
 
@@ -175,18 +118,18 @@ export interface IExecutionBase {
 	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;
 }
 
 /**
@@ -204,7 +147,6 @@ export interface IExecutionResponse extends IExecutionBase {
 	data: IRunExecutionData;
 	retryOf?: string;
 	retrySuccessId?: string;
-	waitTill?: Date | null;
 	workflowData: IWorkflowBase | WorkflowWithSharingsAndCredentials;
 }
 
@@ -218,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 {
@@ -295,31 +235,46 @@ 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;
-}
-
-export interface IExternalHooksClass {
-	init(): Promise<void>;
-	// eslint-disable-next-line @typescript-eslint/no-explicit-any
-	run(hookName: string, hookParameters?: any[]): Promise<void>;
+	dbCollections: {
+		/* eslint-disable @typescript-eslint/naming-convention */
+		User: UserRepository;
+		Settings: SettingsRepository;
+		Credentials: CredentialsRepository;
+		Workflow: WorkflowRepository;
+		/* eslint-enable @typescript-eslint/naming-convention */
+	};
 }
 
 export type WebhookCORSRequest = Request & { method: 'OPTIONS' };
 
-export type WebhookRequest = Request<{ path: string }> & { method: IHttpRequestMethods };
+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 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>;
 }
 
@@ -349,6 +304,7 @@ export interface IDiagnosticInfo {
 	ldap_allowed: boolean;
 	saml_enabled: boolean;
 	binary_data_s3: boolean;
+	multi_main_setup_enabled: boolean;
 	licensePlanName?: string;
 	licenseTenantId?: number;
 }
@@ -361,127 +317,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>;
-	onExternalSecretsProviderSettingsSaved(saveData: {
-		user_id?: string;
-		vault_type: string;
-		is_valid: boolean;
-		is_new: boolean;
-		error_message?: string;
-	}): Promise<void>;
-}
-
 export interface IVersionNotificationSettings {
 	enabled: boolean;
 	endpoint: string;
@@ -518,58 +353,111 @@ export type IPushData =
 	| PushDataRemoveNodeType
 	| PushDataTestWebhook
 	| PushDataNodeDescriptionUpdated
-	| PushDataExecutionRecovered;
+	| PushDataExecutionRecovered
+	| PushDataActiveWorkflowUsersChanged
+	| PushDataWorkerStatusMessage
+	| PushDataWorkflowActivated
+	| PushDataWorkflowDeactivated
+	| PushDataWorkflowFailedToActivate;
 
-type PushDataExecutionRecovered = {
+type PushDataWorkflowFailedToActivate = {
+	data: IWorkflowFailedToActivate;
+	type: 'workflowFailedToActivate';
+};
+
+type PushDataWorkflowActivated = {
+	data: IActiveWorkflowChanged;
+	type: 'workflowActivated';
+};
+
+type PushDataWorkflowDeactivated = {
+	data: IActiveWorkflowChanged;
+	type: 'workflowDeactivated';
+};
+
+type PushDataActiveWorkflowUsersChanged = {
+	data: IActiveWorkflowUsersChanged;
+	type: 'activeWorkflowUsersChanged';
+};
+
+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;
 }
@@ -620,6 +508,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;
@@ -635,7 +547,6 @@ export interface INodesTypeData {
 }
 
 export interface IWorkflowErrorData {
-	// eslint-disable-next-line @typescript-eslint/no-explicit-any
 	[key: string]: any;
 	execution?: {
 		id?: string;
@@ -657,7 +568,6 @@ export interface IWorkflowErrorData {
 
 export interface IProcessMessageDataHook {
 	hook: string;
-	// eslint-disable-next-line @typescript-eslint/no-explicit-any
 	parameters: any[];
 }
 
@@ -690,8 +600,6 @@ export interface IWorkflowStatisticsDataLoaded {
 	dataLoaded: boolean;
 }
 
-export type WhereClause = Record<string, { [key: string]: string | FindOperator<unknown> }>;
-
 // ----------------------------------
 //          community nodes
 // ----------------------------------
@@ -780,6 +688,7 @@ export interface PublicUser {
 	isPending: boolean;
 	hasRecoveryCodesLeft: boolean;
 	globalRole?: Role;
+	globalScopes?: Scope[];
 	signInType: AuthProviderType;
 	disabled: boolean;
 	settings?: IUserSettings | null;
@@ -791,7 +700,7 @@ export interface PublicUser {
 export interface N8nApp {
 	app: Application;
 	restEndpoint: string;
-	externalHooks: IExternalHooksClass;
+	externalHooks: ExternalHooks;
 	activeWorkflowRunner: ActiveWorkflowRunner;
 }
 
diff --git a/packages/cli/src/InternalHooks.ts b/packages/cli/src/InternalHooks.ts
index 4f4c365b19..c2829fb061 100644
--- a/packages/cli/src/InternalHooks.ts
+++ b/packages/cli/src/InternalHooks.ts
@@ -13,7 +13,6 @@ import { TelemetryHelpers } from 'n8n-workflow';
 import { get as pslGet } from 'psl';
 import type {
 	IDiagnosticInfo,
-	IInternalHooksClass,
 	ITelemetryUserDeletionData,
 	IWorkflowDb,
 	IExecutionTrackProperties,
@@ -27,7 +26,6 @@ import type { User } from '@db/entities/User';
 import { N8N_VERSION } from '@/constants';
 import { NodeTypes } from './NodeTypes';
 import type { ExecutionMetadata } from '@db/entities/ExecutionMetadata';
-import { ExecutionRepository } from '@db/repositories';
 import { RoleService } from './services/role.service';
 import type { EventPayloadWorkflow } from './eventbus/EventMessageClasses/EventMessageWorkflow';
 import { determineFinalExecutionStatus } from './executionLifecycleHooks/shared/sharedHookFunctions';
@@ -50,12 +48,11 @@ function userToPayload(user: User): {
 }
 
 @Service()
-export class InternalHooks implements IInternalHooksClass {
+export class InternalHooks {
 	constructor(
 		private telemetry: Telemetry,
 		private nodeTypes: NodeTypes,
 		private roleService: RoleService,
-		private executionRepository: ExecutionRepository,
 		eventsService: EventsService,
 		private readonly instanceSettings: InstanceSettings,
 	) {
@@ -256,15 +253,10 @@ export class InternalHooks implements IInternalHooksClass {
 				workflowName: (data as IWorkflowBase).name,
 			};
 		}
-		void Promise.all([
-			this.executionRepository.updateExistingExecution(executionId, {
-				status: 'running',
-			}),
-			eventBus.sendWorkflowEvent({
-				eventName: 'n8n.workflow.started',
-				payload,
-			}),
-		]);
+		void eventBus.sendWorkflowEvent({
+			eventName: 'n8n.workflow.started',
+			payload,
+		});
 	}
 
 	async onWorkflowCrashed(
@@ -505,6 +497,7 @@ 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({
@@ -514,15 +507,28 @@ export class InternalHooks implements IInternalHooksClass {
 					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;
diff --git a/packages/cli/src/Ldap/LdapManager.ee.ts b/packages/cli/src/Ldap/LdapManager.ee.ts
deleted file mode 100644
index d4e4a39511..0000000000
--- 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 216af1da33..0000000000
--- a/packages/cli/src/Ldap/LdapService.ee.ts
+++ /dev/null
@@ -1,104 +0,0 @@
-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 02b8b6d9be..0000000000
--- a/packages/cli/src/Ldap/LdapSync.ee.ts
+++ /dev/null
@@ -1,215 +0,0 @@
-import type { Entry as LdapUser } from 'ldapts';
-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';
-import { Logger } from '@/Logger';
-
-export class LdapSync {
-	private intervalId: NodeJS.Timeout | undefined = undefined;
-
-	private _config: LdapConfig;
-
-	private _ldapService: LdapService;
-
-	private readonly logger: Logger;
-
-	constructor() {
-		this.logger = Container.get(Logger);
-	}
-
-	/**
-	 * 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> {
-		this.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),
-			);
-
-			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 role = await getLdapUserRole();
-
-		const { usersToCreate, usersToUpdate, usersToDisable } = this.getUsersToProcess(
-			adUsers,
-			localAdUsers,
-			role,
-		);
-
-		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 Container.get(InternalHooks).onLdapSyncFinished({
-			type: !this.intervalId ? '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
-	 */
-	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 999c28d5b3..cd618600ed 100644
--- a/packages/cli/src/Ldap/helpers.ts
+++ b/packages/cli/src/Ldap/helpers.ts
@@ -2,7 +2,6 @@
 import type { Entry as LdapUser } from 'ldapts';
 import { Filter } from 'ldapts/filters/Filter';
 import { Container } from 'typedi';
-import { Cipher } from 'n8n-core';
 import { validate } from 'jsonschema';
 import * as Db from '@/Db';
 import config from '@/config';
@@ -10,28 +9,19 @@ import type { Role } from '@db/entities/Role';
 import { User } from '@db/entities/User';
 import { AuthIdentity } from '@db/entities/AuthIdentity';
 import type { AuthProviderSyncHistory } from '@db/entities/AuthProviderSyncHistory';
-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 } from 'n8n-workflow';
 import { License } from '@/License';
-import { InternalHooks } from '@/InternalHooks';
-import {
-	getCurrentAuthenticationMethod,
-	isEmailCurrentAuthenticationMethod,
-	isLdapCurrentAuthenticationMethod,
-	setCurrentAuthenticationMethod,
-} from '@/sso/ssoHelpers';
-import { InternalServerError } from '../ResponseHelper';
 import { RoleService } from '@/services/role.service';
-import { Logger } from '@/Logger';
+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
@@ -40,37 +30,6 @@ 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
  */
@@ -110,29 +69,7 @@ export const validateLdapConfigurationSchema = (
 	return { valid, message };
 };
 
-/**
- * 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 = Container.get(Cipher).decrypt(
-		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]) => {
@@ -145,59 +82,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 = Container.get(Cipher).encrypt(ldapConfig.bindingAdminPassword);
-
-	if (!ldapConfig.loginEnabled) {
-		ldapConfig.synchronizationEnabled = false;
-		const ldapUsers = await getLdapUsers();
-		if (ldapUsers.length) {
-			await deleteAllLdapIdentities();
-		}
-	}
-
-	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()) return;
-
-	const ldapConfig = await getLdapConfig();
-
-	try {
-		await setGlobalLdapConfigVariables(ldapConfig);
-	} catch (error) {
-		Container.get(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,
-		);
-	}
-
-	// 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) {
@@ -211,76 +95,13 @@ 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,
-			});
-			Container.get(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) {
-			Container.get(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({
+	return Container.get(AuthIdentityRepository).findOne({
 		relations: ['user', 'user.globalRole'],
 		where: {
 			providerId: idAttributeValue,
@@ -290,7 +111,7 @@ export const getAuthIdentityByLdapId = async (
 };
 
 export const getUserByEmail = async (email: string): Promise<User | null> => {
-	return Db.collections.User.findOne({
+	return Container.get(UserRepository).findOne({
 		where: { email },
 		relations: ['globalRole'],
 	});
@@ -318,7 +139,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',
@@ -328,7 +149,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',
@@ -405,7 +226,7 @@ export const processUsers = async (
 export const saveLdapSynchronization = async (
 	data: Omit<AuthProviderSyncHistory, 'id' | 'providerType'>,
 ): Promise<void> => {
-	await Db.collections.AuthProviderSyncHistory.save({
+	await Container.get(AuthProviderSyncHistoryRepository).save({
 		...data,
 		providerType: 'ldap',
 	});
@@ -419,7 +240,7 @@ export const getLdapSynchronizations = async (
 	perPage: number,
 ): Promise<AuthProviderSyncHistory[]> => {
 	const _page = Math.abs(page);
-	return Db.collections.AuthProviderSyncHistory.find({
+	return Container.get(AuthProviderSyncHistoryRepository).find({
 		where: { providerType: 'ldap' },
 		order: { id: 'DESC' },
 		take: perPage,
@@ -446,11 +267,11 @@ export const getMappingAttributes = (ldapConfig: LdapConfig): string[] => {
 };
 
 export const createLdapAuthIdentity = async (user: User, ldapId: string) => {
-	return Db.collections.AuthIdentity.save(AuthIdentity.create(user, ldapId));
+	return Container.get(AuthIdentityRepository).save(AuthIdentity.create(user, ldapId));
 };
 
 export const createLdapUserOnLocalDb = async (role: Role, data: Partial<User>, ldapId: string) => {
-	const user = await Db.collections.User.save({
+	const user = await Container.get(UserRepository).save({
 		password: randomPassword(),
 		globalRole: role,
 		...data,
@@ -462,10 +283,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 Container.get(AuthIdentityRepository).delete({ providerType: 'ldap' });
 };
diff --git a/packages/cli/src/controllers/ldap.controller.ts b/packages/cli/src/Ldap/ldap.controller.ts
similarity index 56%
rename from packages/cli/src/controllers/ldap.controller.ts
rename to packages/cli/src/Ldap/ldap.controller.ts
index 25c19d5d21..441c5c993b 100644
--- a/packages/cli/src/controllers/ldap.controller.ts
+++ b/packages/cli/src/Ldap/ldap.controller.ts
@@ -1,28 +1,29 @@
 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 { Authorized, Get, Post, Put, RestController, RequireGlobalScope } from '@/decorators';
 import { InternalHooks } from '@/InternalHooks';
+import { BadRequestError } from '@/errors/response-errors/bad-request.error';
 
-@Authorized(['global', 'owner'])
+import { NON_SENSIBLE_LDAP_CONFIG_PROPERTIES } from './constants';
+import { getLdapSynchronizations } from './helpers';
+import { LdapConfiguration } from './types';
+import { LdapService } from './ldap.service';
+
+@Authorized()
 @RestController('/ldap')
 export class LdapController {
 	constructor(
-		private ldapService: LdapService,
-		private ldapSync: LdapSync,
-		private internalHooks: InternalHooks,
+		private readonly internalHooks: InternalHooks,
+		private readonly ldapService: LdapService,
 	) {}
 
 	@Get('/config')
+	@RequireGlobalScope('ldap:manage')
 	async getConfig() {
-		return getLdapConfig();
+		return this.ldapService.loadConfig();
 	}
 
 	@Post('/test-connection')
+	@RequireGlobalScope('ldap:manage')
 	async testConnection() {
 		try {
 			await this.ldapService.testConnection();
@@ -32,14 +33,15 @@ export class LdapController {
 	}
 
 	@Put('/config')
+	@RequireGlobalScope('ldap:manage')
 	async updateConfig(req: LdapConfiguration.Update) {
 		try {
-			await updateLdapConfig(req.body);
+			await this.ldapService.updateConfig(req.body);
 		} catch (error) {
 			throw new BadRequestError((error as { message: string }).message);
 		}
 
-		const data = await getLdapConfig();
+		const data = await this.ldapService.loadConfig();
 
 		void this.internalHooks.onUserUpdatedLdapSettings({
 			user_id: req.user.id,
@@ -50,15 +52,17 @@ export class LdapController {
 	}
 
 	@Get('/sync')
+	@RequireGlobalScope('ldap:sync')
 	async getLdapSync(req: LdapConfiguration.GetSync) {
 		const { page = '0', perPage = '20' } = req.query;
 		return getLdapSynchronizations(parseInt(page, 10), parseInt(perPage, 10));
 	}
 
 	@Post('/sync')
+	@RequireGlobalScope('ldap:sync')
 	async syncLdap(req: LdapConfiguration.Sync) {
 		try {
-			await this.ldapSync.run(req.body.type);
+			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 0000000000..5d3af3fb86
--- /dev/null
+++ b/packages/cli/src/Ldap/ldap.service.ts
@@ -0,0 +1,449 @@
+import { Service } from 'typedi';
+import { QueryFailedError } from '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 { Role } from '@db/entities/Role';
+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,
+	getLdapUserRole,
+	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 role = await getLdapUserRole();
+
+		const { usersToCreate, usersToUpdate, usersToDisable } = this.getUsersToProcess(
+			adUsers,
+			localAdUsers,
+			role,
+		);
+
+		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[],
+		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/License.ts b/packages/cli/src/License.ts
index 89f955502d..e10bacd77e 100644
--- a/packages/cli/src/License.ts
+++ b/packages/cli/src/License.ts
@@ -4,7 +4,6 @@ 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,
@@ -12,10 +11,13 @@ import {
 	SETTINGS_LICENSE_CERT_KEY,
 	UNLIMITED_LICENSE_QUOTA,
 } from './constants';
-import { WorkflowRepository } from '@/databases/repositories';
+import { SettingsRepository } from '@db/repositories/settings.repository';
+import { WorkflowRepository } from '@db/repositories/workflow.repository';
 import type { BooleanLicenseFeature, N8nInstanceType, NumericLicenseFeature } from './Interfaces';
 import type { RedisServicePubSubPublisher } from './services/redis/RedisServicePubSubPublisher';
 import { RedisService } from './services/redis.service';
+import { MultiMainSetup } from '@/services/orchestration/main/MultiMainSetup.ee';
+import { OnShutdown } from '@/decorators/OnShutdown';
 
 type FeatureReturnType = Partial<
 	{
@@ -29,15 +31,27 @@ export class License {
 
 	private redisPublisher: RedisServicePubSubPublisher;
 
+	private isShuttingDown = false;
+
 	constructor(
 		private readonly logger: Logger,
 		private readonly instanceSettings: InstanceSettings,
+		private readonly multiMainSetup: MultiMainSetup,
+		private readonly settingsRepository: SettingsRepository,
+		private readonly workflowRepository: WorkflowRepository,
 	) {}
 
 	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;
+		}
+
+		await this.multiMainSetup.init();
 
 		const isMainInstance = instanceType === 'main';
 		const server = config.getEnv('license.serverUrl');
@@ -83,7 +97,7 @@ export class License {
 		return [
 			{
 				name: 'activeWorkflows',
-				value: await Container.get(WorkflowRepository).count({ where: { active: true } }),
+				value: await this.workflowRepository.count({ where: { active: true } }),
 			},
 		];
 	}
@@ -94,7 +108,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,
 			},
@@ -104,6 +118,27 @@ export class License {
 	}
 
 	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.multiMainSetup.setLicensed(isMultiMainLicensed ?? false);
+
+			if (this.multiMainSetup.isEnabled && this.multiMainSetup.isFollower) {
+				this.logger.debug(
+					'[Multi-main setup] Instance is follower, skipping sending of "reloadLicense" command...',
+				);
+				return;
+			}
+
+			if (this.multiMainSetup.isEnabled && !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 supporst this feature.',
+				);
+			}
+		}
+
 		if (config.getEnv('executions.mode') === 'queue') {
 			if (!this.redisPublisher) {
 				this.logger.debug('Initializing Redis publisher for License Service');
@@ -130,7 +165,7 @@ export class License {
 	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,
@@ -164,7 +199,12 @@ export class License {
 		await this.manager.renew();
 	}
 
+	@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;
 		}
@@ -196,6 +236,10 @@ 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);
 	}
@@ -204,6 +248,10 @@ export class License {
 		return this.isFeatureEnabled(LICENSE_FEATURES.BINARY_DATA_S3);
 	}
 
+	isMultipleMainInstancesLicensed() {
+		return this.isFeatureEnabled(LICENSE_FEATURES.MULTIPLE_MAIN_INSTANCES);
+	}
+
 	isVariablesEnabled() {
 		return this.isFeatureEnabled(LICENSE_FEATURES.VARIABLES);
 	}
@@ -224,6 +272,10 @@ export class License {
 		return this.isFeatureEnabled(LICENSE_FEATURES.API_DISABLED);
 	}
 
+	isWorkerViewLicensed() {
+		return this.isFeatureEnabled(LICENSE_FEATURES.WORKER_VIEW);
+	}
+
 	getCurrentEntitlements() {
 		return this.manager?.getCurrentEntitlements() ?? [];
 	}
diff --git a/packages/cli/src/LoadNodesAndCredentials.ts b/packages/cli/src/LoadNodesAndCredentials.ts
index 64cab58c05..7912679e1c 100644
--- a/packages/cli/src/LoadNodesAndCredentials.ts
+++ b/packages/cli/src/LoadNodesAndCredentials.ts
@@ -3,7 +3,7 @@ import { Container, Service } from 'typedi';
 import path from 'path';
 import fsPromises from 'fs/promises';
 
-import type { DirectoryLoader, Types } from 'n8n-core';
+import type { Class, DirectoryLoader, Types } from 'n8n-core';
 import {
 	CUSTOM_EXTENSION_ENV,
 	InstanceSettings,
@@ -17,7 +17,7 @@ import type {
 	INodeTypeData,
 	ICredentialTypeData,
 } from 'n8n-workflow';
-import { ErrorReporterProxy as ErrorReporter } from 'n8n-workflow';
+import { ApplicationError, ErrorReporterProxy as ErrorReporter } from 'n8n-workflow';
 
 import config from '@/config';
 import {
@@ -56,7 +56,7 @@ export class LoadNodesAndCredentials {
 	) {}
 
 	async init() {
-		if (inTest) throw new Error('Not available in tests');
+		if (inTest) throw new ApplicationError('Not available in tests');
 
 		// Make sure the imported modules can resolve dependencies fine.
 		const delimiter = process.platform === 'win32' ? ';' : ':';
@@ -82,6 +82,7 @@ export class LoadNodesAndCredentials {
 
 		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
@@ -249,7 +250,7 @@ export class LoadNodesAndCredentials {
 	 * 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);
@@ -290,15 +291,15 @@ export class LoadNodesAndCredentials {
 				const {
 					className,
 					sourcePath,
-					nodesToTestWith,
+					supportedNodes,
 					extends: extendsArr,
 				} = known.credentials[type];
 				this.known.credentials[type] = {
 					className,
 					sourcePath: path.join(directory, sourcePath),
-					nodesToTestWith:
+					supportedNodes:
 						loader instanceof PackageDirectoryLoader
-							? nodesToTestWith?.map((nodeName) => `${loader.packageName}.${nodeName}`)
+							? supportedNodes?.map((nodeName) => `${loader.packageName}.${nodeName}`)
 							: undefined,
 					extends: extendsArr,
 				};
@@ -316,7 +317,7 @@ export class LoadNodesAndCredentials {
 		const { default: debounce } = await import('lodash/debounce');
 		// eslint-disable-next-line import/no-extraneous-dependencies
 		const { watch } = await import('chokidar');
-		// eslint-disable-next-line @typescript-eslint/naming-convention
+
 		const { Push } = await import('@/push');
 		const push = Container.get(Push);
 
@@ -340,7 +341,7 @@ export class LoadNodesAndCredentials {
 				loader.reset();
 				await loader.loadAll();
 				await this.postProcessLoaders();
-				push.send('nodeDescriptionUpdated', undefined);
+				push.broadcast('nodeDescriptionUpdated');
 			}, 100);
 
 			const toWatch = loader.isLazyLoaded
diff --git a/packages/cli/src/Logger.ts b/packages/cli/src/Logger.ts
index 44f370f589..dc23a6f347 100644
--- a/packages/cli/src/Logger.ts
+++ b/packages/cli/src/Logger.ts
@@ -89,7 +89,6 @@ export class Logger {
 		// 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) {
diff --git a/packages/cli/src/Mfa/helpers.ts b/packages/cli/src/Mfa/helpers.ts
index 8484572533..34d117ed5c 100644
--- a/packages/cli/src/Mfa/helpers.ts
+++ b/packages/cli/src/Mfa/helpers.ts
@@ -1,13 +1,14 @@
+import Container from 'typedi';
 import config from '@/config';
-import * as Db from '@/Db';
 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 () =>
-	Db.collections.User.count({ where: { mfaEnabled: true } });
+	Container.get(UserRepository).count({ where: { mfaEnabled: true } });
 
 export const handleMfaDisable = async () => {
 	if (isMfaFeatureDisabled()) {
diff --git a/packages/cli/src/Mfa/mfa.service.ts b/packages/cli/src/Mfa/mfa.service.ts
index 7e2ce1dd82..452a3d7071 100644
--- a/packages/cli/src/Mfa/mfa.service.ts
+++ b/packages/cli/src/Mfa/mfa.service.ts
@@ -1,7 +1,7 @@
 import { v4 as uuid } from 'uuid';
 import { Service } from 'typedi';
 import { Cipher } from 'n8n-core';
-import { UserRepository } from '@db/repositories';
+import { UserRepository } from '@db/repositories/user.repository';
 import { TOTPService } from './totp.service';
 
 @Service()
diff --git a/packages/cli/src/NodeTypes.ts b/packages/cli/src/NodeTypes.ts
index 7831f3bd2c..6ab17f0d97 100644
--- a/packages/cli/src/NodeTypes.ts
+++ b/packages/cli/src/NodeTypes.ts
@@ -6,13 +6,13 @@ 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 {
@@ -30,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);
@@ -67,7 +67,8 @@ 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);
 	}
 
 	async getNodeTranslationPath({
diff --git a/packages/cli/src/PublicApi/index.ts b/packages/cli/src/PublicApi/index.ts
index 32860e930a..d4cb53b26a 100644
--- a/packages/cli/src/PublicApi/index.ts
+++ b/packages/cli/src/PublicApi/index.ts
@@ -1,4 +1,5 @@
 /* eslint-disable @typescript-eslint/naming-convention */
+import { Container } from 'typedi';
 import type { Router } from 'express';
 import express from 'express';
 import fs from 'fs/promises';
@@ -11,11 +12,11 @@ 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';
 
 async function createApiRouter(
 	version: string,
@@ -29,7 +30,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();
@@ -95,7 +96,7 @@ async function createApiRouter(
 						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'],
 						});
@@ -147,9 +148,11 @@ export const loadPublicApiVersions = async (
 		}),
 	);
 
+	const version = versions.pop()?.charAt(1);
+
 	return {
 		apiRouters,
-		apiLatestVersion: Number(versions.pop()?.charAt(1)) ?? 1,
+		apiLatestVersion: version ? Number(version) : 1,
 	};
 };
 
diff --git a/packages/cli/src/PublicApi/types.ts b/packages/cli/src/PublicApi/types.ts
index cae8e64b77..fe40fdf63a 100644
--- a/packages/cli/src/PublicApi/types.ts
+++ b/packages/cli/src/PublicApi/types.ts
@@ -9,7 +9,7 @@ import type { WorkflowEntity } from '@db/entities/WorkflowEntity';
 
 import type { UserManagementMailer } from '@/UserManagement/email';
 
-import type { Risk } from '@/audit/types';
+import type { Risk } from '@/security-audit/types';
 
 export type AuthlessRequest<
 	RouteParams = {},
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 89e4479944..2f9f4892b4 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(['owner', '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 fb4b8f2f38..a31656be19 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(['owner', 'admin', 'member']),
 		validCredentialType,
 		validCredentialsProperties,
 		async (
@@ -47,7 +47,7 @@ export = {
 		},
 	],
 	deleteCredential: [
-		authorize(['owner', 'member']),
+		authorize(['owner', 'admin', 'member']),
 		async (
 			req: CredentialRequest.Delete,
 			res: express.Response,
@@ -55,7 +55,7 @@ export = {
 			const { id: credentialId } = req.params;
 			let credential: CredentialsEntity | undefined;
 
-			if (req.user.globalRole.name !== 'owner') {
+			if (!['owner', 'admin'].includes(req.user.globalRole.name)) {
 				const shared = await getSharedCredentials(req.user.id, credentialId, [
 					'credentials',
 					'role',
@@ -78,7 +78,7 @@ export = {
 	],
 
 	getCredentialType: [
-		authorize(['owner', 'member']),
+		authorize(['owner', 'admin', 'member']),
 		async (req: CredentialTypeRequest.Get, res: express.Response): Promise<express.Response> => {
 			const { credentialTypeName } = req.params;
 
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 25ab1e6dba..398254be59 100644
--- a/packages/cli/src/PublicApi/v1/handlers/credentials/credentials.service.ts
+++ b/packages/cli/src/PublicApi/v1/handlers/credentials/credentials.service.ts
@@ -10,9 +10,11 @@ import type { IDependency, IJsonSchema } from '../../../types';
 import type { CredentialRequest } from '@/requests';
 import { Container } from 'typedi';
 import { RoleService } from '@/services/role.service';
+import { CredentialsRepository } from '@db/repositories/credentials.repository';
+import { SharedCredentialsRepository } from '@db/repositories/sharedCredentials.repository';
 
 export async function getCredentials(credentialId: string): Promise<ICredentialsDb | null> {
-	return Db.collections.Credentials.findOneBy({ id: credentialId });
+	return Container.get(CredentialsRepository).findOneBy({ id: credentialId });
 }
 
 export async function getSharedCredentials(
@@ -20,7 +22,7 @@ export async function getSharedCredentials(
 	credentialId: string,
 	relations?: string[],
 ): Promise<SharedCredentials | null> {
-	return Db.collections.SharedCredentials.findOne({
+	return Container.get(SharedCredentialsRepository).findOne({
 		where: {
 			userId,
 			credentialsId: credentialId,
@@ -83,7 +85,7 @@ export async function saveCredential(
 
 export async function removeCredential(credentials: CredentialsEntity): Promise<ICredentialsDb> {
 	await Container.get(ExternalHooks).run('credentials.delete', [credentials.id]);
-	return Db.collections.Credentials.remove(credentials);
+	return Container.get(CredentialsRepository).remove(credentials);
 }
 
 export async function encryptCredential(credential: CredentialsEntity): Promise<ICredentialsDb> {
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 111638d716..4acad28696 100644
--- a/packages/cli/src/PublicApi/v1/handlers/executions/executions.handler.ts
+++ b/packages/cli/src/PublicApi/v1/handlers/executions/executions.handler.ts
@@ -1,4 +1,6 @@
 import type express from 'express';
+import { Container } from 'typedi';
+import { replaceCircularReferences } from 'n8n-workflow';
 
 import { getExecutions, getExecutionInWorkflows, getExecutionsCount } from './executions.service';
 import { ActiveExecutions } from '@/ActiveExecutions';
@@ -6,13 +8,12 @@ import { authorize, validCursor } from '../../shared/middlewares/global.middlewa
 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 '@/databases/repositories';
+import { ExecutionRepository } from '@db/repositories/execution.repository';
 
 export = {
 	deleteExecution: [
-		authorize(['owner', 'member']),
+		authorize(['owner', 'admin', 'member']),
 		async (req: ExecutionRequest.Delete, res: express.Response): Promise<express.Response> => {
 			const sharedWorkflowsIds = await getSharedWorkflowIds(req.user);
 
@@ -32,17 +33,17 @@ export = {
 			}
 
 			await Container.get(ExecutionRepository).hardDelete({
-				workflowId: execution.workflowId as string,
+				workflowId: execution.workflowId,
 				executionId: execution.id,
 			});
 
 			execution.id = id;
 
-			return res.json(execution);
+			return res.json(replaceCircularReferences(execution));
 		},
 	],
 	getExecution: [
-		authorize(['owner', 'member']),
+		authorize(['owner', 'admin', 'member']),
 		async (req: ExecutionRequest.Get, res: express.Response): Promise<express.Response> => {
 			const sharedWorkflowsIds = await getSharedWorkflowIds(req.user);
 
@@ -67,11 +68,11 @@ export = {
 				public_api: true,
 			});
 
-			return res.json(execution);
+			return res.json(replaceCircularReferences(execution));
 		},
 	],
 	getExecutions: [
-		authorize(['owner', 'member']),
+		authorize(['owner', 'admin', 'member']),
 		validCursor,
 		async (req: ExecutionRequest.GetAll, res: express.Response): Promise<express.Response> => {
 			const {
@@ -118,7 +119,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
index de08c9095a..b2811bdcda 100644
--- a/packages/cli/src/PublicApi/v1/handlers/executions/executions.service.ts
+++ b/packages/cli/src/PublicApi/v1/handlers/executions/executions.service.ts
@@ -3,9 +3,8 @@ import { In, Not, Raw, LessThan } from 'typeorm';
 import { Container } from 'typedi';
 import type { ExecutionStatus } from 'n8n-workflow';
 
-import * as Db from '@/Db';
 import type { IExecutionBase, IExecutionFlattedDb } from '@/Interfaces';
-import { ExecutionRepository } from '@db/repositories';
+import { ExecutionRepository } from '@db/repositories/execution.repository';
 
 function getStatusCondition(status: ExecutionStatus) {
 	const condition: Pick<FindOptionsWhere<IExecutionFlattedDb>, 'status'> = {};
@@ -83,7 +82,7 @@ export async function getExecutionsCount(data: {
 	excludedWorkflowIds?: string[];
 }): Promise<number> {
 	// TODO: Consider moving this to the repository as well
-	const executions = await Db.collections.Execution.count({
+	const executions = await Container.get(ExecutionRepository).count({
 		where: {
 			...(data.lastId && { id: LessThan(data.lastId) }),
 			...(data.status && { ...getStatusCondition(data.status) }),
diff --git a/packages/cli/src/PublicApi/v1/handlers/sourceControl/sourceControl.handler.ts b/packages/cli/src/PublicApi/v1/handlers/sourceControl/sourceControl.handler.ts
index e0d06b93a8..d19741f82b 100644
--- a/packages/cli/src/PublicApi/v1/handlers/sourceControl/sourceControl.handler.ts
+++ b/packages/cli/src/PublicApi/v1/handlers/sourceControl/sourceControl.handler.ts
@@ -14,7 +14,7 @@ import { InternalHooks } from '@/InternalHooks';
 
 export = {
 	pull: [
-		authorize(['owner', 'member']),
+		authorize(['owner', 'admin']),
 		async (
 			req: PublicSourceControlRequest.Pull,
 			res: express.Response,
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
index 26a801e74d..f9611fa29f 100644
--- a/packages/cli/src/PublicApi/v1/handlers/users/users.handler.ee.ts
+++ b/packages/cli/src/PublicApi/v1/handlers/users/users.handler.ee.ts
@@ -15,7 +15,7 @@ import { InternalHooks } from '@/InternalHooks';
 export = {
 	getUser: [
 		validLicenseWithUserQuota,
-		authorize(['owner']),
+		authorize(['owner', 'admin']),
 		async (req: UserRequest.Get, res: express.Response) => {
 			const { includeRole = false } = req.query;
 			const { id } = req.params;
@@ -41,7 +41,7 @@ export = {
 	getUsers: [
 		validLicenseWithUserQuota,
 		validCursor,
-		authorize(['owner']),
+		authorize(['owner', 'admin']),
 		async (req: UserRequest.Get, res: express.Response) => {
 			const { offset = 0, limit = 100, includeRole = false } = req.query;
 
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
index 69c2fa8515..678727e693 100644
--- a/packages/cli/src/PublicApi/v1/handlers/users/users.service.ee.ts
+++ b/packages/cli/src/PublicApi/v1/handlers/users/users.service.ee.ts
@@ -1,5 +1,5 @@
 import { Container } from 'typedi';
-import { UserRepository } from '@db/repositories';
+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';
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 b05a105b90..6f5fe2b759 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/workflows.handler.ts b/packages/cli/src/PublicApi/v1/handlers/workflows/workflows.handler.ts
index a6f58d44eb..67f9b908a2 100644
--- a/packages/cli/src/PublicApi/v1/handlers/workflows/workflows.handler.ts
+++ b/packages/cli/src/PublicApi/v1/handlers/workflows/workflows.handler.ts
@@ -18,20 +18,20 @@ import {
 	setWorkflowAsActive,
 	setWorkflowAsInactive,
 	updateWorkflow,
-	getSharedWorkflows,
 	createWorkflow,
-	getWorkflowIdsViaTags,
 	parseTagNames,
-	getWorkflowsAndCount,
 } from './workflows.service';
-import { WorkflowsService } from '@/workflows/workflows.services';
+import { WorkflowService } from '@/workflows/workflow.service';
 import { InternalHooks } from '@/InternalHooks';
 import { RoleService } from '@/services/role.service';
 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(['owner', 'admin', 'member']),
 		async (req: WorkflowRequest.Create, res: express.Response): Promise<express.Response> => {
 			const workflow = req.body;
 
@@ -59,11 +59,11 @@ export = {
 		},
 	],
 	deleteWorkflow: [
-		authorize(['owner', 'member']),
+		authorize(['owner', 'admin', '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
@@ -74,7 +74,7 @@ export = {
 		},
 	],
 	getWorkflow: [
-		authorize(['owner', 'member']),
+		authorize(['owner', 'admin', 'member']),
 		async (req: WorkflowRequest.Get, res: express.Response): Promise<express.Response> => {
 			const { id } = req.params;
 
@@ -95,7 +95,7 @@ export = {
 		},
 	],
 	getWorkflows: [
-		authorize(['owner', 'member']),
+		authorize(['owner', 'admin', 'member']),
 		validCursor,
 		async (req: WorkflowRequest.GetAll, res: express.Response): Promise<express.Response> => {
 			const { offset = 0, limit = 100, active = undefined, tags = undefined } = req.query;
@@ -104,19 +104,26 @@ export = {
 				...(active !== undefined && { active }),
 			};
 
-			if (req.user.isOwner) {
+			if (['owner', 'admin'].includes(req.user.globalRole.name)) {
 				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({
@@ -129,7 +136,7 @@ export = {
 				where.id = In(workflowsIds);
 			}
 
-			const [workflows, count] = await getWorkflowsAndCount({
+			const [workflows, count] = await Container.get(WorkflowRepository).findAndCount({
 				skip: offset,
 				take: limit,
 				where,
@@ -152,7 +159,7 @@ export = {
 		},
 	],
 	updateWorkflow: [
-		authorize(['owner', 'member']),
+		authorize(['owner', 'admin', 'member']),
 		async (req: WorkflowRequest.Update, res: express.Response): Promise<express.Response> => {
 			const { id } = req.params;
 			const updateData = new WorkflowEntity();
@@ -214,7 +221,7 @@ export = {
 		},
 	],
 	activateWorkflow: [
-		authorize(['owner', 'member']),
+		authorize(['owner', 'admin', 'member']),
 		async (req: WorkflowRequest.Activate, res: express.Response): Promise<express.Response> => {
 			const { id } = req.params;
 
@@ -248,7 +255,7 @@ export = {
 		},
 	],
 	deactivateWorkflow: [
-		authorize(['owner', 'member']),
+		authorize(['owner', 'admin', 'member']),
 		async (req: WorkflowRequest.Activate, res: express.Response): Promise<express.Response> => {
 			const { id } = req.params;
 
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 e2dd27bf71..607aeb31d6 100644
--- a/packages/cli/src/PublicApi/v1/handlers/workflows/workflows.service.ts
+++ b/packages/cli/src/PublicApi/v1/handlers/workflows/workflows.service.ts
@@ -1,23 +1,20 @@
-import type { FindManyOptions, UpdateResult } from 'typeorm';
-import { In } from 'typeorm';
-import intersection from 'lodash/intersection';
-
 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 type { Role } from '@db/entities/Role';
 import config from '@/config';
-import { TagService } from '@/services/tag.service';
 import Container from 'typedi';
+import { WorkflowRepository } from '@db/repositories/workflow.repository';
+import { SharedWorkflowRepository } from '@db/repositories/sharedWorkflow.repository';
 
 function insertIf(condition: boolean, elements: string[]): string[] {
 	return condition ? elements : [];
 }
 
 export async function getSharedWorkflowIds(user: User): Promise<string[]> {
-	const where = user.globalRole.name === 'owner' ? {} : { userId: user.id };
-	const sharedWorkflows = await Db.collections.SharedWorkflow.find({
+	const where = ['owner', 'admin'].includes(user.globalRole.name) ? {} : { userId: user.id };
+	const sharedWorkflows = await Container.get(SharedWorkflowRepository).find({
 		where,
 		select: ['workflowId'],
 	});
@@ -28,52 +25,21 @@ export async function getSharedWorkflow(
 	user: User,
 	workflowId?: string | undefined,
 ): Promise<SharedWorkflow | null> {
-	return Db.collections.SharedWorkflow.findOne({
+	return Container.get(SharedWorkflowRepository).findOne({
 		where: {
-			...(!user.isOwner && { userId: user.id }),
+			...(!['owner', 'admin'].includes(user.globalRole.name) && { 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: {
-			...(!user.isOwner && { 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 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 Container.get(TagService).findMany({
-		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,
@@ -96,29 +62,26 @@ 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 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);
+	return Container.get(WorkflowRepository).remove(workflow);
 }
 
-export async function getWorkflowsAndCount(
-	options: FindManyOptions<WorkflowEntity>,
-): Promise<[WorkflowEntity[], number]> {
-	return Db.collections.Workflow.findAndCount(options);
-}
-
-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 Container.get(WorkflowRepository).update(workflowId, updateData);
 }
 
 export function parseTagNames(tags: string): string[] {
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 d57aa3071b..7335ca4cd8 100644
--- a/packages/cli/src/PublicApi/v1/shared/middlewares/global.middleware.ts
+++ b/packages/cli/src/PublicApi/v1/shared/middlewares/global.middleware.ts
@@ -6,11 +6,12 @@ import { Container } from 'typedi';
 import type { AuthenticatedRequest, PaginatedRequest } from '../../../types';
 import { decodeCursor } from '../services/pagination.service';
 import { License } from '@/License';
+import type { RoleNames } from '@/databases/entities/Role';
 
 const UNLIMITED_USERS_QUOTA = -1;
 
 export const authorize =
-	(authorizedRoles: readonly string[]) =>
+	(authorizedRoles: readonly RoleNames[]) =>
 	(
 		req: AuthenticatedRequest,
 		res: express.Response,
diff --git a/packages/cli/src/Queue.ts b/packages/cli/src/Queue.ts
index dda0d64f02..88cad41488 100644
--- a/packages/cli/src/Queue.ts
+++ b/packages/cli/src/Queue.ts
@@ -1,6 +1,10 @@
 import type Bull from 'bull';
 import { Service } from 'typedi';
-import type { ExecutionError, IExecuteResponsePromiseData } from 'n8n-workflow';
+import {
+	ApplicationError,
+	type ExecutionError,
+	type IExecuteResponsePromiseData,
+} from 'n8n-workflow';
 import { ActiveExecutions } from '@/ActiveExecutions';
 import { decodeWebhookResponse } from '@/helpers/decodeWebhookResponse';
 
@@ -43,9 +47,9 @@ export class Queue {
 		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');
-		// eslint-disable-next-line @typescript-eslint/naming-convention
+
 		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
@@ -54,6 +58,7 @@ export class Queue {
 		// More here: https://github.com/OptimalBits/bull/issues/890
 		this.jobQueue = new Bull('jobs', {
 			prefix,
+			settings: config.get('queue.bull.settings'),
 			createClient: (type, clientConfig) =>
 				usesRedisCluster
 					? getRedisClusterClient(Redis, clientConfig, (type + '(bull)') as RedisClientType)
@@ -95,7 +100,7 @@ export class Queue {
 	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 Error('Queue is not initialized yet!');
+			throw new ApplicationError('Queue is not initialized yet!');
 		}
 		return this.jobQueue;
 	}
diff --git a/packages/cli/src/ResponseHelper.ts b/packages/cli/src/ResponseHelper.ts
index 3a3510e83d..e9e27d02be 100644
--- a/packages/cli/src/ResponseHelper.ts
+++ b/packages/cli/src/ResponseHelper.ts
@@ -1,90 +1,15 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
-
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
-
 import type { Request, Response } from 'express';
-import { parse, stringify } from 'flatted';
 import picocolors from 'picocolors';
-import { ErrorReporterProxy as ErrorReporter, NodeApiError } from 'n8n-workflow';
+import {
+	ErrorReporterProxy as ErrorReporter,
+	FORM_TRIGGER_PATH_IDENTIFIER,
+	NodeApiError,
+} from 'n8n-workflow';
 import { Readable } from 'node:stream';
-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, errorCode?: number) {
-		super(message, 401, errorCode);
-	}
-}
-
-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, hint: string | undefined = undefined) {
-		super(message, 422, 422, hint);
-	}
-}
-
-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);
-	}
-}
+import { ResponseError } from './errors/response-errors/abstract/response.error';
 
 export function sendSuccessResponse(
 	res: Response,
@@ -119,6 +44,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;
@@ -134,11 +81,25 @@ 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);
 		}
 
+		//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;
 
 		if (error.errorCode) {
@@ -205,68 +166,6 @@ export function send<T, R extends Request, S extends Response>(
 	};
 }
 
-/**
- * Flattens the Execution data.
- * As it contains a lot of references which normally would be saved as duplicate data
- * with regular JSON.stringify it gets flattened which keeps the references in place.
- *
- * @param {IExecutionDb} fullExecutionData The data to flatten
- */
-// TODO: Remove this functions since it's purpose should be fulfilled by the execution repository
-export function flattenExecutionData(fullExecutionData: IExecutionDb): IExecutionFlatted {
-	// Flatten the data
-	const returnData: IExecutionFlatted = {
-		data: stringify(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,
-
-		workflowData: fullExecutionData.workflowData!,
-		status: fullExecutionData.status,
-	};
-
-	if (fullExecutionData.id !== undefined) {
-		returnData.id = fullExecutionData.id;
-	}
-
-	if (fullExecutionData.retryOf !== undefined) {
-		returnData.retryOf = fullExecutionData.retryOf.toString();
-	}
-
-	if (fullExecutionData.retrySuccessId !== undefined) {
-		returnData.retrySuccessId = fullExecutionData.retrySuccessId.toString();
-	}
-
-	return returnData;
-}
-
-/**
- * Unflattens the Execution data.
- *
- * @param {IExecutionFlattedDb} fullExecutionData The data to unflatten
- */
-// TODO: Remove this functions since it's purpose should be fulfilled by the execution repository
-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 + '.' : '';
diff --git a/packages/cli/src/Server.ts b/packages/cli/src/Server.ts
index 55bf84cc0b..1de23822f3 100644
--- a/packages/cli/src/Server.ts
+++ b/packages/cli/src/Server.ts
@@ -1,18 +1,14 @@
 /* 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-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 { Container, Service } from 'typedi';
 import assert from 'assert';
 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 { join as pathJoin } from 'path';
 import { promisify } from 'util';
 import cookieParser from 'cookie-parser';
 import express from 'express';
@@ -20,32 +16,10 @@ import { engine as expressHandlebars } from 'express-handlebars';
 import type { ServeStaticOptions } from 'serve-static';
 import type { FindManyOptions, FindOptionsWhere } 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 {
-	Credentials,
-	LoadMappingOptions,
-	LoadNodeParameterOptions,
-	LoadNodeListSearch,
-} from 'n8n-core';
+import { type Class, InstanceSettings } from 'n8n-core';
 
-import type {
-	INodeCredentials,
-	INodeCredentialsDetails,
-	INodeListSearchResult,
-	INodeParameters,
-	INodePropertyOptions,
-	INodeTypeNameVersion,
-	WorkflowExecuteMode,
-	ICredentialTypes,
-	ExecutionStatus,
-	IExecutionsSummary,
-	ResourceMapperFields,
-	IN8nUISettings,
-} from 'n8n-workflow';
+import type { ExecutionStatus, IExecutionsSummary, IN8nUISettings } from 'n8n-workflow';
 import { jsonParse } from 'n8n-workflow';
 
 // @ts-ignore
@@ -56,106 +30,82 @@ import config from '@/config';
 import { Queue } from '@/Queue';
 import { getSharedWorkflowIds } from '@/WorkflowHelpers';
 
-import { workflowsController } from '@/workflows/workflows.controller';
+import { WorkflowsController } from '@/workflows/workflows.controller';
 import {
 	EDITOR_UI_DIST_DIR,
-	GENERATED_STATIC_DIR,
 	inDevelopment,
 	inE2ETests,
 	N8N_VERSION,
-	RESPONSE_ERROR_MESSAGES,
 	TEMPLATES_DIR,
 } from '@/constants';
 import { credentialsController } from '@/credentials/credentials.controller';
-import { oauth2CredentialController } from '@/credentials/oauth2Credential.api';
-import type {
-	CurlHelper,
-	ExecutionRequest,
-	NodeListSearchRequest,
-	NodeParameterOptionsRequest,
-	OAuthRequest,
-	ResourceMapperRequest,
-	WorkflowRequest,
-} from '@/requests';
+import type { CurlHelper, ExecutionRequest } from '@/requests';
 import { registerController } from '@/decorators';
-import {
-	AuthController,
-	LdapController,
-	MeController,
-	MFAController,
-	NodeTypesController,
-	OwnerController,
-	PasswordResetController,
-	TagsController,
-	TranslationController,
-	UsersController,
-	WorkflowStatisticsController,
-} from '@/controllers';
-
-import { BinaryDataController } from './controllers/binaryData.controller';
+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 { whereClause } from '@/UserManagement/UserManagementHelper';
-import { UserManagementMailer } from '@/UserManagement/email';
-import * as Db from '@/Db';
-import type {
-	ICredentialsDb,
-	ICredentialsOverwrite,
-	IDiagnosticInfo,
-	IExecutionsStopData,
-} from '@/Interfaces';
+import type { ICredentialsOverwrite, IDiagnosticInfo, IExecutionsStopData } from '@/Interfaces';
 import { ActiveExecutions } from '@/ActiveExecutions';
-import {
-	CredentialsHelper,
-	getCredentialForUser,
-	getCredentialWithoutUser,
-} from '@/CredentialsHelper';
 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 { EventBusControllerEE } from '@/eventbus/eventBus.controller.ee';
-import { licenseController } from './license/license.controller';
+import { LicenseController } from '@/license/license.controller';
 import { setupPushServer, setupPushHandler } from '@/push';
 import { setupAuthMiddlewares } from './middlewares';
-import { handleLdapInit, isLdapEnabled } from './Ldap/helpers';
+import { isLdapEnabled } from './Ldap/helpers';
 import { AbstractServer } from './AbstractServer';
 import { PostHogClient } from './posthog';
 import { eventBus } from './eventbus';
-import { Container } from 'typedi';
 import { InternalHooks } from './InternalHooks';
 import { License } from './License';
 import { getStatusUsingPreviousExecutionStatusMethod } from './executions/executionHelpers';
 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 { VariablesController } from './environments/variables/variables.controller.ee';
 import {
 	isLdapCurrentAuthenticationMethod,
 	isSamlCurrentAuthenticationMethod,
 } from './sso/ssoHelpers';
 import { SourceControlService } from '@/environments/sourceControl/sourceControl.service.ee';
 import { SourceControlController } from '@/environments/sourceControl/sourceControl.controller.ee';
-import { ExecutionRepository, SettingsRepository } from '@db/repositories';
+
 import type { ExecutionEntity } from '@db/entities/ExecutionEntity';
-import { MfaService } from './Mfa/mfa.service';
+import { ExecutionRepository } from '@db/repositories/execution.repository';
+import { WorkflowRepository } from '@db/repositories/workflow.repository';
+
 import { handleMfaDisable, isMfaFeatureEnabled } from './Mfa/helpers';
 import type { FrontendService } from './services/frontend.service';
-import { JwtService } from './services/jwt.service';
-import { RoleService } from './services/role.service';
-import { UserService } from './services/user.service';
+import { ActiveWorkflowsController } from './controllers/activeWorkflows.controller';
 import { OrchestrationController } from './controllers/orchestration.controller';
 import { WorkflowHistoryController } from './workflows/workflowHistory/workflowHistory.controller.ee';
+import { InvitationController } from './controllers/invitation.controller';
+import { CollaborationService } from './collaboration/collaboration.service';
+import { RoleController } from './controllers/role.controller';
+import { BadRequestError } from './errors/response-errors/bad-request.error';
+import { NotFoundError } from './errors/response-errors/not-found.error';
+import { MultiMainSetup } from './services/orchestration/main/MultiMainSetup.ee';
 
 const exec = promisify(callbackExec);
 
+@Service()
 export class Server extends AbstractServer {
 	private endpointPresetCredentials: string;
 
@@ -167,14 +117,8 @@ export class Server extends AbstractServer {
 
 	private loadNodesAndCredentials: LoadNodesAndCredentials;
 
-	private nodeTypes: NodeTypes;
-
-	private credentialTypes: ICredentialTypes;
-
 	private frontendService?: FrontendService;
 
-	private postHog: PostHogClient;
-
 	constructor() {
 		super('main');
 
@@ -188,8 +132,6 @@ export class Server extends AbstractServer {
 
 	async start() {
 		this.loadNodesAndCredentials = Container.get(LoadNodesAndCredentials);
-		this.credentialTypes = Container.get(CredentialTypes);
-		this.nodeTypes = Container.get(NodeTypes);
 
 		if (!config.getEnv('endpoints.disableUi')) {
 			// eslint-disable-next-line @typescript-eslint/no-var-requires
@@ -198,7 +140,6 @@ export class Server extends AbstractServer {
 
 		this.activeExecutionsInstance = Container.get(ActiveExecutions);
 		this.waitTracker = Container.get(WaitTracker);
-		this.postHog = Container.get(PostHogClient);
 
 		this.presetCredentialsLoaded = false;
 		this.endpointPresetCredentials = config.getEnv('credentials.overwrite.endpoint');
@@ -252,6 +193,7 @@ export class Server extends AbstractServer {
 			ldap_allowed: isLdapCurrentAuthenticationMethod(),
 			saml_enabled: isSamlCurrentAuthenticationMethod(),
 			binary_data_s3: isS3Available && isS3Selected && isS3Licensed,
+			multi_main_setup_enabled: config.getEnv('multiMainSetup.enabled'),
 			licensePlanName: Container.get(License).getPlanName(),
 			licenseTenantId: config.getEnv('license.tenantId'),
 		};
@@ -260,104 +202,86 @@ export class Server extends AbstractServer {
 			void this.loadNodesAndCredentials.setupHotReload();
 		}
 
-		void Db.collections.Workflow.findOne({
-			select: ['createdAt'],
-			order: { createdAt: 'ASC' },
-			where: {},
-		}).then(async (workflow) =>
-			Container.get(InternalHooks).onServerStarted(diagnosticInfo, workflow?.createdAt),
-		);
+		void Container.get(WorkflowRepository)
+			.findOne({
+				select: ['createdAt'],
+				order: { createdAt: 'ASC' },
+				where: {},
+			})
+			.then(async (workflow) =>
+				Container.get(InternalHooks).onServerStarted(diagnosticInfo, workflow?.createdAt),
+			);
+
+		Container.get(CollaborationService);
 	}
 
 	private async registerControllers(ignoredEndpoints: Readonly<string[]>) {
-		const { app, externalHooks, activeWorkflowRunner, nodeTypes, logger } = this;
-		const repositories = Db.collections;
+		const { app } = this;
 		setupAuthMiddlewares(app, ignoredEndpoints, this.restEndpoint);
 
-		const internalHooks = Container.get(InternalHooks);
-		const mailer = Container.get(UserManagementMailer);
-		const userService = Container.get(UserService);
-		const jwtService = Container.get(JwtService);
-		const postHog = this.postHog;
-		const mfaService = Container.get(MfaService);
-
-		const controllers: object[] = [
-			new EventBusController(),
-			new EventBusControllerEE(),
-			Container.get(AuthController),
-			new OwnerController(
-				config,
-				logger,
-				internalHooks,
-				Container.get(SettingsRepository),
-				userService,
-				postHog,
-			),
-			Container.get(MeController),
-			new NodeTypesController(config, nodeTypes),
-			new PasswordResetController(
-				logger,
-				externalHooks,
-				internalHooks,
-				mailer,
-				userService,
-				jwtService,
-				mfaService,
-			),
-			Container.get(TagsController),
-			new TranslationController(config, this.credentialTypes),
-			new UsersController(
-				config,
-				logger,
-				externalHooks,
-				internalHooks,
-				repositories.SharedCredentials,
-				repositories.SharedWorkflow,
-				activeWorkflowRunner,
-				mailer,
-				jwtService,
-				Container.get(RoleService),
-				userService,
-				postHog,
-			),
-			Container.get(SamlController),
-			Container.get(SourceControlController),
-			Container.get(WorkflowStatisticsController),
-			Container.get(ExternalSecretsController),
-			Container.get(OrchestrationController),
-			Container.get(WorkflowHistoryController),
-			Container.get(BinaryDataController),
+		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,
+			RoleController,
+			ActiveWorkflowsController,
+			WorkflowsController,
 		];
 
+		if (process.env.NODE_ENV !== 'production' && Container.get(MultiMainSetup).isEnabled) {
+			const { DebugController } = await import('@/controllers/debug.controller');
+			controllers.push(DebugController);
+		}
+
 		if (isLdapEnabled()) {
-			const { service, sync } = LdapManager.getInstance();
-			controllers.push(new LdapController(service, sync, internalHooks));
+			const { LdapService } = await import('@/Ldap/ldap.service');
+			const { LdapController } = await require('@/Ldap/ldap.controller');
+			await Container.get(LdapService).init();
+			controllers.push(LdapController);
 		}
 
 		if (config.getEnv('nodes.communityPackages.enabled')) {
-			// eslint-disable-next-line @typescript-eslint/naming-convention
 			const { CommunityPackagesController } = await import(
 				'@/controllers/communityPackages.controller'
 			);
-			controllers.push(Container.get(CommunityPackagesController));
+			controllers.push(CommunityPackagesController);
 		}
 
 		if (inE2ETests) {
-			// eslint-disable-next-line @typescript-eslint/naming-convention
 			const { E2EController } = await import('./controllers/e2e.controller');
-			controllers.push(Container.get(E2EController));
+			controllers.push(E2EController);
 		}
 
 		if (isMfaFeatureEnabled()) {
-			controllers.push(new MFAController(mfaService));
+			controllers.push(MFAController);
 		}
 
-		controllers.forEach((controller) => registerController(app, config, controller));
+		controllers.forEach((controller) => registerController(app, controller));
 	}
 
 	async configure(): Promise<void> {
 		if (config.getEnv('endpoints.metrics.enable')) {
-			// eslint-disable-next-line @typescript-eslint/naming-convention
 			const { MetricsService } = await import('@/services/metrics.service');
 			await Container.get(MetricsService).configureMetrics(this.app);
 		}
@@ -374,7 +298,7 @@ export class Server extends AbstractServer {
 			await this.externalHooks.run('frontend.settings', [frontendService.getSettings()]);
 		}
 
-		await this.postHog.init();
+		await Container.get(PostHogClient).init();
 
 		const publicApiEndpoint = config.getEnv('publicApi.path');
 		const excludeEndpoints = config.getEnv('security.excludeEndpoints');
@@ -429,24 +353,12 @@ export class Server extends AbstractServer {
 			await Container.get(Queue).init();
 		}
 
-		await handleLdapInit();
-
 		await handleMfaDisable();
 
 		await 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);
-
 		// ----------------------------------------
 		// SAML
 		// ----------------------------------------
@@ -459,12 +371,6 @@ export class Server extends AbstractServer {
 			this.logger.warn(`SAML initialization failed: ${error.message}`);
 		}
 
-		// ----------------------------------------
-		// Variables
-		// ----------------------------------------
-
-		this.app.use(`/${this.restEndpoint}/variables`, variablesController);
-
 		// ----------------------------------------
 		// Source Control
 		// ----------------------------------------
@@ -474,487 +380,23 @@ export class Server extends AbstractServer {
 			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.');
-				},
-			),
-		);
-
-		this.app.get(
-			`/${this.restEndpoint}/get-mapping-fields`,
-			ResponseHelper.send(
-				async (
-					req: ResourceMapperRequest,
-					res: express.Response,
-				): Promise<ResourceMapperFields | 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 loadMappingOptionsInstance = new LoadMappingOptions(
-						nodeTypeAndVersion,
-						this.nodeTypes,
-						path,
-						currentNodeParameters,
-						credentials,
-					);
-
-					const additionalData = await WorkflowExecuteAdditionalData.getBase(
-						req.user.id,
-						currentNodeParameters,
-					);
-
-					const fields = await loadMappingOptionsInstance.getOptionsViaMethodName(
-						methodName,
-						additionalData,
-					);
-
-					return fields;
-				},
-			),
-		);
-
-		// ----------------------------------------
-		// Active Workflows
-		// ----------------------------------------
-
-		// Returns the active workflow ids
-		this.app.get(
-			`/${this.restEndpoint}/active`,
-			ResponseHelper.send(async (req: WorkflowRequest.GetAllActive) => {
-				return this.activeWorkflowRunner.getActiveWorkflows(req.user);
-			}),
-		);
-
-		// 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 = await Db.collections.SharedWorkflow.findOne({
-					relations: ['workflow'],
-					where: whereClause({
-						user: req.user,
-						entityType: 'workflow',
-						entityId: workflowId,
-					}),
-				});
-
-				if (!shared) {
-					this.logger.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 ?? '';
+			ResponseHelper.send(async (req: CurlHelper.ToJson) => {
+				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) {
-					this.logger.error('OAuth1 credential authorization failed due to missing credential ID');
-					throw new ResponseHelper.BadRequestError('Required credential ID is missing');
+				try {
+					const parameters = toHttpNodeParameters(curlCommand);
+					return ResponseHelper.flattenObject(parameters, 'parameters');
+				} catch (e) {
+					throw new BadRequestError('Invalid cURL command');
 				}
-
-				const credential = await getCredentialForUser(credentialId, req.user);
-
-				if (!credential) {
-					this.logger.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);
-				}
-
-				const additionalData = await WorkflowExecuteAdditionalData.getBase(req.user.id);
-
-				const mode: WorkflowExecuteMode = 'internal';
-				const timezone = config.getEnv('generic.timezone');
-				const credentialsHelper = Container.get(CredentialsHelper);
-				const decryptedDataOriginal = await credentialsHelper.getDecrypted(
-					additionalData,
-					credential as INodeCredentialsDetails,
-					credential.type,
-					mode,
-					timezone,
-					true,
-				);
-
-				const oauthCredentials = credentialsHelper.applyDefaultsAndOverwrites(
-					additionalData,
-					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) {
-						let algorithm: string;
-						switch (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');
-					},
-				};
-
-				const oauthRequestData = {
-					oauth_callback: `${WebhookHelpers.getWebhookBaseUrl()}${
-						this.restEndpoint
-					}/oauth1-credential/callback?cid=${credentialId}`,
-				};
-
-				await this.externalHooks.run('oauth1.authenticate', [oAuthOptions, oauthRequestData]);
-
-				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 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.data);
-
-				const responseJson = Object.fromEntries(paramsParser.entries());
-
-				const returnUri = `${oauthCredentials.authUrl as string}?oauth_token=${
-					responseJson.oauth_token
-				}`;
-
-				// Encrypt the data
-				const credentials = new Credentials(
-					credential as INodeCredentialsDetails,
-					credential.type,
-					credential.nodesAccess,
-				);
-
-				credentials.setData(decryptedDataOriginal);
-				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);
-
-				this.logger.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,
-							)}`,
-						);
-						this.logger.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) {
-						this.logger.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);
-					}
-
-					const additionalData = await WorkflowExecuteAdditionalData.getBase(req.user.id);
-
-					const mode: WorkflowExecuteMode = 'internal';
-					const timezone = config.getEnv('generic.timezone');
-					const credentialsHelper = Container.get(CredentialsHelper);
-					const decryptedDataOriginal = await credentialsHelper.getDecrypted(
-						additionalData,
-						credential as INodeCredentialsDetails,
-						credential.type,
-						mode,
-						timezone,
-						true,
-					);
-					const oauthCredentials = credentialsHelper.applyDefaultsAndOverwrites(
-						additionalData,
-						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) {
-						this.logger.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);
-					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);
-
-					this.logger.verbose('OAuth1 callback successful for new credential', {
-						userId: req.user?.id,
-						credentialId,
-					});
-					res.sendFile(pathResolve(TEMPLATES_DIR, 'oauth-callback.html'));
-				} catch (error) {
-					this.logger.error('OAuth1 callback failed because of insufficient user permissions', {
-						userId: req.user?.id,
-						credentialId: req.query.cid,
-					});
-					// Error response
-					return ResponseHelper.sendErrorResponse(res, error);
-				}
-			},
-		);
-
-		// ----------------------------------------
-		// OAuth2-Credential
-		// ----------------------------------------
-
-		this.app.use(`/${this.restEndpoint}/oauth2-credential`, oauth2CredentialController);
-
 		// ----------------------------------------
 		// Executions
 		// ----------------------------------------
@@ -1082,7 +524,7 @@ export class Server extends AbstractServer {
 				const sharedWorkflowIds = await getSharedWorkflowIds(req.user);
 
 				if (!sharedWorkflowIds.length) {
-					throw new ResponseHelper.NotFoundError('Execution not found');
+					throw new NotFoundError('Execution not found');
 				}
 
 				const fullExecutionData = await Container.get(ExecutionRepository).findSingleExecution(
@@ -1095,7 +537,7 @@ export class Server extends AbstractServer {
 				);
 
 				if (!fullExecutionData) {
-					throw new ResponseHelper.NotFoundError('Execution not found');
+					throw new NotFoundError('Execution not found');
 				}
 
 				if (config.getEnv('executions.mode') === 'queue') {
@@ -1127,7 +569,9 @@ export class Server extends AbstractServer {
 					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.`);
+						this.logger.debug('Could not stop job because it is no longer in queue', {
+							jobId: req.params.id,
+						});
 					} else {
 						await queue.stopJob(job);
 					}
@@ -1173,9 +617,7 @@ export 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;
-			}),
+			ResponseHelper.send(async () => timezones),
 		);
 
 		// ----------------------------------------
@@ -1187,13 +629,8 @@ export class Server extends AbstractServer {
 			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 frontendService.getSettings();
-					},
+					async (req: express.Request): Promise<IN8nUISettings> =>
+						frontendService.getSettings(req.headers.sessionid as string),
 				),
 			);
 		}
@@ -1238,11 +675,12 @@ export class Server extends AbstractServer {
 			);
 		}
 
+		const { staticCacheDir } = Container.get(InstanceSettings);
 		if (frontendService) {
 			const staticOptions: ServeStaticOptions = {
 				cacheControl: false,
 				setHeaders: (res: express.Response, path: string) => {
-					const isIndex = path === pathJoin(GENERATED_STATIC_DIR, 'index.html');
+					const isIndex = path === pathJoin(staticCacheDir, 'index.html');
 					const cacheControl = isIndex
 						? 'no-cache, no-store, must-revalidate'
 						: 'max-age=86400, immutable';
@@ -1251,6 +689,7 @@ export class Server extends AbstractServer {
 			};
 
 			const serveIcons: express.RequestHandler = async (req, res) => {
+				// eslint-disable-next-line prefer-const
 				let { scope, packageName } = req.params;
 				if (scope) packageName = `@${scope}/${packageName}`;
 				const filePath = this.loadNodesAndCredentials.resolveIcon(packageName, req.originalUrl);
@@ -1268,7 +707,7 @@ export class Server extends AbstractServer {
 
 			this.app.use(
 				'/',
-				express.static(GENERATED_STATIC_DIR),
+				express.static(staticCacheDir),
 				express.static(EDITOR_UI_DIST_DIR, staticOptions),
 			);
 
@@ -1278,7 +717,7 @@ export class Server extends AbstractServer {
 				next();
 			});
 		} else {
-			this.app.use('/', express.static(GENERATED_STATIC_DIR));
+			this.app.use('/', express.static(staticCacheDir));
 		}
 	}
 
diff --git a/packages/cli/src/TestWebhooks.ts b/packages/cli/src/TestWebhooks.ts
index 8ffa9ad7ad..e46be34dde 100644
--- a/packages/cli/src/TestWebhooks.ts
+++ b/packages/cli/src/TestWebhooks.ts
@@ -1,124 +1,104 @@
 import type express from 'express';
 import { Service } from 'typedi';
-
+import { WebhookPathTakenError, Workflow } from 'n8n-workflow';
 import type {
 	IWebhookData,
 	IWorkflowExecuteAdditionalData,
 	IHttpRequestMethods,
-	Workflow,
-	WorkflowActivateMode,
-	WorkflowExecuteMode,
+	IRunData,
 } from 'n8n-workflow';
-
-import { ActiveWebhooks } from '@/ActiveWebhooks';
 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 { webhookNotFoundErrorMessage } from './utils';
-
-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)";
+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 { MultiMainSetup } from './services/orchestration/main/MultiMainSetup.ee';
+import * as WorkflowExecuteAdditionalData from '@/WorkflowExecuteAdditionalData';
 
 @Service()
 export class TestWebhooks implements IWebhookManager {
-	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;
-	}
+		private readonly push: Push,
+		private readonly nodeTypes: NodeTypes,
+		private readonly registrations: TestWebhookRegistrationsService,
+		private readonly multiMainSetup: MultiMainSetup,
+	) {}
+
+	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 executeWebhook(
 		request: WebhookRequest,
 		response: express.Response,
 	): Promise<IResponseCallbackData> {
 		const httpMethod = request.method;
-		let path = request.params.path;
 
-		// Reset request parameters
+		let path = removeTrailingSlash(request.params.path);
+
 		request.params = {} as WebhookRequest['params'];
 
-		// Remove trailing slash
-		if (path.endsWith('/')) {
-			path = path.slice(0, -1);
-		}
+		let webhook = await this.getActiveWebhook(httpMethod, path);
 
-		const { activeWebhooks, push, testWebhookData } = this;
+		if (!webhook) {
+			// no static webhook, so check if dynamic
+			// e.g. `/webhook-test/<uuid>/user/:id/create`
 
-		let webhookData: IWebhookData | undefined = activeWebhooks.get(httpMethod, path);
+			const [webhookId, ...segments] = path.split('/');
 
-		// check if path is dynamic
-		if (webhookData === undefined) {
-			const pathElements = path.split('/');
-			const webhookId = pathElements.shift();
+			webhook = await this.getActiveWebhook(httpMethod, segments.join('/'), webhookId);
 
-			webhookData = activeWebhooks.get(httpMethod, pathElements.join('/'), webhookId);
-			if (webhookData === undefined) {
-				// The requested webhook is not registered
-				const methods = await this.getWebhookMethods(path);
-				throw new ResponseHelper.NotFoundError(
-					webhookNotFoundErrorMessage(path, httpMethod, methods),
-					WEBHOOK_TEST_UNREGISTERED_HINT,
-				);
-			}
+			if (!webhook)
+				throw new WebhookNotFoundError({
+					path,
+					httpMethod,
+					webhookMethods: await this.getWebhookMethods(path),
+				});
 
-			path = webhookData.path;
-			// extracting params from path
-			path.split('/').forEach((ele, index) => {
-				if (ele.startsWith(':')) {
-					// write params to req.params
-					// @ts-ignore
-					request.params[ele.slice(1)] = pathElements[index];
+			path = webhook.path;
+
+			path.split('/').forEach((segment, index) => {
+				if (segment.startsWith(':')) {
+					request.params[segment.slice(1)] = segments[index];
 				}
 			});
 		}
 
-		const { workflowId } = webhookData;
-		const webhookKey = `${activeWebhooks.getWebhookKey(
-			webhookData.httpMethod,
-			webhookData.path,
-			webhookData.webhookId,
-		)}|${workflowId}`;
+		const key = this.registrations.toKey(webhook);
 
-		// TODO: Clean that duplication up one day and improve code generally
-		if (testWebhookData[webhookKey] === undefined) {
-			// The requested webhook is not registered
-			const methods = await this.getWebhookMethods(path);
-			throw new ResponseHelper.NotFoundError(
-				webhookNotFoundErrorMessage(path, httpMethod, methods),
-				WEBHOOK_TEST_UNREGISTERED_HINT,
-			);
+		const registration = await this.registrations.get(key);
+
+		if (!registration) {
+			throw new WebhookNotFoundError({
+				path,
+				httpMethod,
+				webhookMethods: await this.getWebhookMethods(path),
+			});
 		}
 
-		const { destinationNode, sessionId, workflow, workflowData, timeout } =
-			testWebhookData[webhookKey];
+		const { destinationNode, sessionId, workflowEntity } = registration;
+
+		const workflow = this.toWorkflow(workflowEntity);
+
+		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.');
 		}
 
 		return new Promise(async (resolve, reject) => {
@@ -126,13 +106,13 @@ export class TestWebhooks implements IWebhookManager {
 				const executionMode = 'manual';
 				const executionId = await WebhookHelpers.executeWebhook(
 					workflow,
-					webhookData!,
-					workflowData,
+					webhook!,
+					workflowEntity,
 					workflowStartNode,
 					executionMode,
 					sessionId,
-					undefined,
-					undefined,
+					undefined, // IRunExecutionData
+					undefined, // executionId
 					request,
 					response,
 					(error: Error | null, data: IResponseCallbackData) => {
@@ -149,95 +129,157 @@ export class TestWebhooks implements IWebhookManager {
 
 				// Inform editor-ui that webhook got received
 				if (sessionId !== undefined) {
-					push.send('testWebhookReceived', { workflowId, executionId }, sessionId);
+					this.push.send(
+						'testWebhookReceived',
+						{ workflowId: webhook?.workflowId, executionId },
+						sessionId,
+					);
 				}
 			} 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.multiMainSetup.isEnabled &&
+				sessionId &&
+				!this.push.getBackend().hasSessionId(sessionId)
+			) {
+				const payload = { webhookKey: key, workflowEntity, sessionId };
+				void this.multiMainSetup.publish('clear-test-webhooks', payload);
+				return;
+			}
 
-			await activeWebhooks.removeWorkflow(workflow);
+			this.clearTimeout(key);
+
+			await this.deactivateWebhooks(workflow);
 		});
 	}
 
-	/**
-	 * Gets all request methods associated with a single test webhook
-	 */
-	async getWebhookMethods(path: string): Promise<IHttpRequestMethods[]> {
-		const webhookMethods = this.activeWebhooks.getWebhookMethods(path);
-		if (!webhookMethods.length) {
-			// The requested webhook is not registered
-			throw new ResponseHelper.NotFoundError(
-				webhookNotFoundErrorMessage(path),
-				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,
+		runData?: IRunData,
 		sessionId?: 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 (!webhooks.some((w) => w.webhookDescription.restartWebhook !== true)) {
+			return false; // no webhooks found to start a workflow
 		}
 
-		if (workflow.id === undefined) {
-			throw new Error('Webhooks can only be added for saved workflows as an id is needed!');
-		}
+		const timeout = setTimeout(async () => this.cancelWebhook(workflow.id), TEST_WEBHOOK_TIMEOUT);
 
-		// Remove test-webhooks automatically if they do not get called (after 120 seconds)
-		const timeout = setTimeout(() => {
-			this.cancelTestWebhook(workflowData.id);
-		}, 120000);
+		for (const webhook of webhooks) {
+			const key = this.registrations.toKey(webhook);
+			const isAlreadyRegistered = await this.registrations.get(key);
 
-		const { activeWebhooks, testWebhookData } = this;
+			if (runData && webhook.node in runData) {
+				return false;
+			}
 
-		let key: string;
-		const activatedKey: string[] = [];
+			if (isAlreadyRegistered && !webhook.webhookId) {
+				throw new WebhookPathTakenError(webhook.node);
+			}
 
-		for (const webhookData of webhooks) {
-			key = `${activeWebhooks.getWebhookKey(
-				webhookData.httpMethod,
-				webhookData.path,
-				webhookData.webhookId,
-			)}|${workflowData.id}`;
+			webhook.path = removeTrailingSlash(webhook.path);
+			webhook.isTest = true;
 
-			activatedKey.push(key);
+			/**
+			 * Additional data cannot be cached because of circular refs.
+			 * Hence store the `userId` and recreate additional data when needed.
+			 */
+			const { workflowExecuteAdditionalData: _, ...cacheableWebhook } = webhook;
 
-			testWebhookData[key] = {
+			cacheableWebhook.userId = userId;
+
+			const registration: TestWebhookRegistration = {
 				sessionId,
-				timeout,
-				workflow,
-				workflowData,
+				workflowEntity,
 				destinationNode,
+				webhook: cacheableWebhook as IWebhookData,
 			};
 
 			try {
-				await activeWebhooks.add(workflow, webhookData, mode, activation);
-			} catch (error) {
-				activatedKey.forEach((deleteKey) => delete testWebhookData[deleteKey]);
+				/**
+				 * 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) {
+				await this.deactivateWebhooks(workflow);
+
+				delete this.timeouts[key];
 
-				await activeWebhooks.removeWorkflow(workflow);
 				throw error;
 			}
 		}
@@ -245,38 +287,35 @@ export class TestWebhooks implements IWebhookManager {
 		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;
 
-		for (const webhookKey of Object.keys(testWebhookData)) {
-			const { sessionId, timeout, workflow, workflowData } = testWebhookData[webhookKey];
+		const allWebhookKeys = await this.registrations.getAllKeys();
 
-			if (workflowData.id !== workflowId) {
-				continue;
-			}
+		for (const key of allWebhookKeys) {
+			const registration = await this.registrations.get(key);
 
-			clearTimeout(timeout);
+			if (!registration) continue;
+
+			const { sessionId, workflowEntity } = registration;
+
+			const workflow = this.toWorkflow(workflowEntity);
+
+			if (workflowEntity.id !== workflowId) continue;
+
+			this.clearTimeout(key);
 
-			// Inform editor-ui that webhook got received
 			if (sessionId !== undefined) {
 				try {
-					push.send('testWebhookDeleted', { workflowId }, sessionId);
+					this.push.send('testWebhookDeleted', { workflowId }, sessionId);
 				} 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
-				void activeWebhooks.removeWorkflow(workflow);
+				void this.deactivateWebhooks(workflow);
 			}
 
 			foundWebhook = true;
@@ -285,11 +324,93 @@ export class TestWebhooks implements IWebhookManager {
 		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;
+	}
+
 	/**
-	 * Removes all the currently active test webhooks
+	 * Deactivate all registered test webhooks of a workflow.
 	 */
-	async removeAll(): Promise<void> {
-		const workflows = Object.values(this.testWebhookData).map(({ workflow }) => workflow);
-		return this.activeWebhooks.removeAll(workflows);
+	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();
+	}
+
+	/**
+	 * Convert a `WorkflowEntity` from `typeorm` to a temporary `Workflow` from `n8n-workflow`.
+	 */
+	toWorkflow(workflowEntity: IWorkflowDb) {
+		return new Workflow({
+			id: workflowEntity.id,
+			name: workflowEntity.name,
+			nodes: workflowEntity.nodes,
+			connections: workflowEntity.connections,
+			active: false,
+			nodeTypes: this.nodeTypes,
+
+			/**
+			 * `staticData` in the original workflow entity has production webhook IDs.
+			 * Since we are creating here a temporary workflow only for a test webhook,
+			 * `staticData` from the original workflow entity should not be transferred.
+			 */
+			staticData: undefined,
+
+			settings: workflowEntity.settings,
+		});
 	}
 }
diff --git a/packages/cli/src/UserManagement/PermissionChecker.ts b/packages/cli/src/UserManagement/PermissionChecker.ts
index 4f4eb2bed3..a5e1ffdb8a 100644
--- a/packages/cli/src/UserManagement/PermissionChecker.ts
+++ b/packages/cli/src/UserManagement/PermissionChecker.ts
@@ -1,20 +1,13 @@
 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 { NodeOperationError, WorkflowOperationError } from 'n8n-workflow';
 import config from '@/config';
-import type { SharedCredentials } from '@db/entities/SharedCredentials';
 import { isSharingEnabled } from './UserManagementHelper';
-import { WorkflowsService } from '@/workflows/workflows.services';
-import { UserService } from '@/services/user.service';
 import { OwnershipService } from '@/services/ownership.service';
 import Container from 'typedi';
 import { RoleService } from '@/services/role.service';
+import { UserRepository } from '@db/repositories/user.repository';
+import { SharedCredentialsRepository } from '@db/repositories/sharedCredentials.repository';
+import { SharedWorkflowRepository } from '@db/repositories/sharedWorkflow.repository';
 
 export class PermissionChecker {
 	/**
@@ -31,12 +24,12 @@ export class PermissionChecker {
 
 		// allow if requesting user is instance owner
 
-		const user = await Db.collections.User.findOneOrFail({
+		const user = await Container.get(UserRepository).findOneOrFail({
 			where: { id: userId },
 			relations: ['globalRole'],
 		});
 
-		if (user.globalRole.name === 'owner') return;
+		if (user.hasGlobalScope('workflow:execute')) return;
 
 		// allow if all creds used in this workflow are a subset of
 		// all creds accessible to users who have access to this workflow
@@ -44,7 +37,7 @@ export class PermissionChecker {
 		let workflowUserIds = [userId];
 
 		if (workflow.id && isSharingEnabled()) {
-			const workflowSharings = await Db.collections.SharedWorkflow.find({
+			const workflowSharings = await Container.get(SharedWorkflowRepository).find({
 				relations: ['workflow'],
 				where: { workflowId: workflow.id },
 				select: ['userId'],
@@ -52,17 +45,12 @@ export class PermissionChecker {
 			workflowUserIds = workflowSharings.map((s) => s.userId);
 		}
 
-		const credentialsWhere: FindOptionsWhere<SharedCredentials> = { userId: In(workflowUserIds) };
+		const roleId = await Container.get(RoleService).findCredentialOwnerRoleId();
 
-		if (!isSharingEnabled()) {
-			const role = await Container.get(RoleService).findCredentialOwnerRole();
-			// If credential sharing is not enabled, get only credentials owned by this user
-			credentialsWhere.roleId = role.id;
-		}
-
-		const credentialSharings = await Db.collections.SharedCredentials.find({
-			where: credentialsWhere,
-		});
+		const credentialSharings = await Container.get(SharedCredentialsRepository).findSharings(
+			workflowUserIds,
+			roleId,
+		);
 
 		const accessibleCredIds = credentialSharings.map((s) => s.credentialsId);
 
@@ -76,14 +64,14 @@ export class PermissionChecker {
 
 		throw new NodeOperationError(nodeToFlag, 'Node has no access to credential', {
 			description: 'Please recreate the credential or ask its owner to share it with you.',
-			severity: 'warning',
+			level: 'warning',
 		});
 	}
 
 	static 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.
@@ -105,15 +93,22 @@ export class PermissionChecker {
 			policy = 'workflowsFromSameOwner';
 		}
 
+		const parentWorkflowOwner =
+			await Container.get(OwnershipService).getWorkflowOwnerCached(parentWorkflowId);
+
 		const subworkflowOwner = await Container.get(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') {
@@ -134,17 +129,8 @@ export class PermissionChecker {
 			}
 		}
 
-		if (policy === 'workflowsFromSameOwner') {
-			const user = await Container.get(UserService).findOne({ where: { 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;
 		}
 	}
 
@@ -157,6 +143,7 @@ export class PermissionChecker {
 					if (!cred.id) {
 						throw new NodeOperationError(node, 'Node uses invalid credential', {
 							description: 'Please recreate the credential.',
+							level: 'warning',
 						});
 					}
 
diff --git a/packages/cli/src/UserManagement/UserManagementHelper.ts b/packages/cli/src/UserManagement/UserManagementHelper.ts
index 724943f573..97557c45f9 100644
--- a/packages/cli/src/UserManagement/UserManagementHelper.ts
+++ b/packages/cli/src/UserManagement/UserManagementHelper.ts
@@ -1,154 +1,6 @@
-import { In } from 'typeorm';
-import { compare, genSaltSync, hash } from 'bcryptjs';
 import { Container } from 'typedi';
-
-import * as Db from '@/Db';
-import * as ResponseHelper from '@/ResponseHelper';
-import type { WhereClause } from '@/Interfaces';
-import type { User } from '@db/entities/User';
-import { MAX_PASSWORD_LENGTH, MIN_PASSWORD_LENGTH } from '@db/entities/User';
-import config from '@/config';
 import { License } from '@/License';
-import { getWebhookBaseUrl } from '@/WebhookHelpers';
-import { RoleService } from '@/services/role.service';
 
 export function isSharingEnabled(): boolean {
 	return Container.get(License).isSharingEnabled();
 }
-
-export async function getInstanceOwner() {
-	const globalOwnerRole = await Container.get(RoleService).findGlobalOwnerRole();
-
-	return Db.collections.User.findOneOrFail({
-		relations: ['globalRole'],
-		where: {
-			globalRoleId: globalOwnerRole.id,
-		},
-	});
-}
-
-/**
- * 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;
-}
-
-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) => {
-		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/UserManagementMailer.ts b/packages/cli/src/UserManagement/email/UserManagementMailer.ts
index 64f72099fe..9aa8efa314 100644
--- a/packages/cli/src/UserManagement/email/UserManagementMailer.ts
+++ b/packages/cli/src/UserManagement/email/UserManagementMailer.ts
@@ -6,6 +6,7 @@ import { Container, Service } from 'typedi';
 import config from '@/config';
 import type { InviteEmailData, PasswordResetData, SendEmailResult } from './Interfaces';
 import { NodeMailer } from './NodeMailer';
+import { ApplicationError } from 'n8n-workflow';
 
 type Template = HandlebarsTemplateDelegate<unknown>;
 type TemplateName = 'invite' | 'passwordReset';
@@ -50,7 +51,7 @@ export class UserManagementMailer {
 	}
 
 	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();
 	}
diff --git a/packages/cli/src/UserManagement/email/templates/passwordReset.html b/packages/cli/src/UserManagement/email/templates/passwordReset.html
index e7f5bce5da..865072275e 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/WaitTracker.ts b/packages/cli/src/WaitTracker.ts
index 6742efd424..435b6f5b94 100644
--- a/packages/cli/src/WaitTracker.ts
+++ b/packages/cli/src/WaitTracker.ts
@@ -1,20 +1,12 @@
-import { ErrorReporterProxy as ErrorReporter, WorkflowOperationError } from 'n8n-workflow';
+import {
+	ApplicationError,
+	ErrorReporterProxy as ErrorReporter,
+	WorkflowOperationError,
+} from 'n8n-workflow';
 import { Container, 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 ResponseHelper from '@/ResponseHelper';
-import type {
-	IExecutionResponse,
-	IExecutionsStopData,
-	IWorkflowExecutionDataProcess,
-} from '@/Interfaces';
+import type { IExecutionsStopData, IWorkflowExecutionDataProcess } from '@/Interfaces';
 import { WorkflowRunner } from '@/WorkflowRunner';
-import { recoverExecutionDataFromEventLogMessages } from './eventbus/MessageEventBus/recoverEvents';
-import { ExecutionRepository } from '@db/repositories';
-import type { ExecutionEntity } from '@db/entities/ExecutionEntity';
+import { ExecutionRepository } from '@db/repositories/execution.repository';
 import { OwnershipService } from './services/ownership.service';
 import { Logger } from '@/Logger';
 
@@ -44,28 +36,8 @@ export class WaitTracker {
 
 	async getWaitingExecutions() {
 		this.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<ExecutionEntity> = {
-			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)),
-			);
-		}
-
-		const executions = await this.executionRepository.findMultipleExecutions(findQuery);
+		const executions = await this.executionRepository.getWaitingExecutions();
 
 		if (executions.length === 0) {
 			return;
@@ -101,38 +73,22 @@ export class WaitTracker {
 		}
 
 		// Also check in database
-		const execution = await this.executionRepository.findSingleExecution(executionId, {
+		const fullExecutionData = await this.executionRepository.findSingleExecution(executionId, {
 			includeData: true,
+			unflattenData: true,
 		});
 
-		if (!execution) {
-			throw new Error(`The execution ID "${executionId}" could not be found.`);
+		if (!fullExecutionData) {
+			throw new ApplicationError('Execution not found.', {
+				extra: { executionId },
+			});
 		}
 
-		if (!['new', 'unknown', 'waiting', 'running'].includes(execution.status)) {
-			throw new Error(
-				`Only running or waiting executions can be stopped and ${executionId} is currently ${execution.status}.`,
+		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}.`,
 			);
 		}
-		let fullExecutionData: IExecutionResponse;
-		try {
-			fullExecutionData = ResponseHelper.unflattenExecutionData(execution);
-		} catch (error) {
-			// if the execution ended in an unforseen, non-cancelable state, try to recover it
-			await recoverExecutionDataFromEventLogMessages(executionId, [], true);
-			// find recovered data
-			const restoredExecution = await Container.get(ExecutionRepository).findSingleExecution(
-				executionId,
-				{
-					includeData: true,
-					unflattenData: true,
-				},
-			);
-			if (!restoredExecution) {
-				throw new Error(`Execution ${executionId} could not be recovered or canceled.`);
-			}
-			fullExecutionData = restoredExecution;
-		}
 		// Set in execution in DB as failed and remove waitTill time
 		const error = new WorkflowOperationError('Workflow-Execution has been canceled!');
 
@@ -172,14 +128,14 @@ export class WaitTracker {
 			});
 
 			if (!fullExecutionData) {
-				throw new Error(`The execution with the id "${executionId}" does not exist.`);
+				throw new ApplicationError('Execution does not exist.', { extra: { executionId } });
 			}
 			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 workflowId = fullExecutionData.workflowData.id;
 			const user = await this.ownershipService.getWorkflowOwnerCached(workflowId);
@@ -202,4 +158,11 @@ export class WaitTracker {
 			);
 		});
 	}
+
+	shutdown() {
+		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 0000000000..0625acd7e4
--- /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 501724dffb..223fc92820 100644
--- a/packages/cli/src/WaitingWebhooks.ts
+++ b/packages/cli/src/WaitingWebhooks.ts
@@ -2,24 +2,28 @@ import { NodeHelpers, Workflow } from 'n8n-workflow';
 import { Service } from 'typedi';
 import type express from 'express';
 
-import * as ResponseHelper from '@/ResponseHelper';
 import * as WebhookHelpers from '@/WebhookHelpers';
 import { NodeTypes } from '@/NodeTypes';
 import type {
+	IExecutionResponse,
 	IResponseCallbackData,
 	IWebhookManager,
 	IWorkflowDb,
 	WaitingWebhookRequest,
 } from '@/Interfaces';
 import * as WorkflowExecuteAdditionalData from '@/WorkflowExecuteAdditionalData';
-import { ExecutionRepository } from '@db/repositories';
+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 implements IWebhookManager {
+	protected includeForms = false;
+
 	constructor(
-		private readonly logger: Logger,
+		protected readonly logger: Logger,
 		private readonly nodeTypes: NodeTypes,
 		private readonly executionRepository: ExecutionRepository,
 		private readonly ownershipService: OwnershipService,
@@ -27,12 +31,21 @@ export class WaitingWebhooks implements IWebhookManager {
 
 	// TODO: implement `getWebhookMethods` for CORS support
 
+	protected logReceivedWebhook(method: string, executionId: string) {
+		this.logger.debug(`Received waiting-webhook "${method}" for execution "${executionId}"`);
+	}
+
+	protected disableNode(execution: IExecutionResponse, _method?: string) {
+		execution.data.executionData!.nodeExecutionStack[0].node.disabled = true;
+	}
+
 	async executeWebhook(
 		req: WaitingWebhookRequest,
 		res: express.Response,
 	): Promise<IResponseCallbackData> {
 		const { path: executionId, suffix } = req.params;
-		this.logger.debug(`Received waiting-webhook "${req.method}" for execution "${executionId}"`);
+
+		this.logReceivedWebhook(req.method, executionId);
 
 		// Reset request parameters
 		req.params = {} as WaitingWebhookRequest['params'];
@@ -43,18 +56,18 @@ export class WaitingWebhooks implements IWebhookManager {
 		});
 
 		if (!execution) {
-			throw new ResponseHelper.NotFoundError(`The execution "${executionId} does not exist.`);
+			throw new NotFoundError(`The execution "${executionId} does not exist.`);
 		}
 
 		if (execution.finished || execution.data.resultData.error) {
-			throw new ResponseHelper.ConflictError(`The execution "${executionId} has finished already.`);
+			throw new ConflictError(`The execution "${executionId} has finished already.`);
 		}
 
 		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
-		execution.data.executionData!.nodeExecutionStack[0].node.disabled = true;
+		this.disableNode(execution, req.method);
 
 		// Remove waitTill information else the execution would stop
 		execution.data.waitTill = undefined;
@@ -65,7 +78,7 @@ export class WaitingWebhooks implements IWebhookManager {
 		const { workflowData } = execution;
 
 		const workflow = new Workflow({
-			id: workflowData.id!,
+			id: workflowData.id,
 			name: workflowData.name,
 			nodes: workflowData.nodes,
 			connections: workflowData.connections,
@@ -77,14 +90,14 @@ export class WaitingWebhooks implements IWebhookManager {
 
 		let workflowOwner;
 		try {
-			workflowOwner = await this.ownershipService.getWorkflowOwnerCached(workflowData.id!);
+			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 workflowStartNode = workflow.getNode(lastNodeExecuted);
 		if (workflowStartNode === null) {
-			throw new ResponseHelper.NotFoundError('Could not find node to process webhook.');
+			throw new NotFoundError('Could not find node to process webhook.');
 		}
 
 		const additionalData = await WorkflowExecuteAdditionalData.getBase(workflowOwner.id);
@@ -96,14 +109,15 @@ export class WaitingWebhooks implements IWebhookManager {
 			(webhook) =>
 				webhook.httpMethod === req.method &&
 				webhook.path === (suffix ?? '') &&
-				webhook.webhookDescription.restartWebhook === true,
+				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 workflow for execution "${executionId}" does not contain a waiting webhook with a matching path/method.`;
-			throw new ResponseHelper.NotFoundError(errorMessage);
+			throw new NotFoundError(errorMessage);
 		}
 
 		const runExecutionData = execution.data;
diff --git a/packages/cli/src/WebhookHelpers.ts b/packages/cli/src/WebhookHelpers.ts
index c976c7067b..538030ecd1 100644
--- a/packages/cli/src/WebhookHelpers.ts
+++ b/packages/cli/src/WebhookHelpers.ts
@@ -4,7 +4,6 @@
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable id-denylist */
 /* eslint-disable prefer-spread */
-/* eslint-disable @typescript-eslint/prefer-nullish-coalescing */
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/restrict-template-expressions */
 import type express from 'express';
@@ -26,6 +25,7 @@ import type {
 	IHttpRequestMethods,
 	IN8nHttpFullResponse,
 	INode,
+	IPinData,
 	IRunExecutionData,
 	IWebhookData,
 	IWebhookResponseData,
@@ -38,7 +38,6 @@ import {
 	BINARY_ENCODING,
 	createDeferredPromise,
 	ErrorReporterProxy as ErrorReporter,
-	FORM_TRIGGER_PATH_IDENTIFIER,
 	NodeHelpers,
 } from 'n8n-workflow';
 
@@ -51,7 +50,6 @@ import type {
 	WebhookCORSRequest,
 	WebhookRequest,
 } from '@/Interfaces';
-import * as GenericHelpers from '@/GenericHelpers';
 import * as ResponseHelper from '@/ResponseHelper';
 import * as WorkflowHelpers from '@/WorkflowHelpers';
 import { WorkflowRunner } from '@/WorkflowRunner';
@@ -62,8 +60,10 @@ import type { WorkflowEntity } from '@db/entities/WorkflowEntity';
 import { EventsService } from '@/services/events.service';
 import { OwnershipService } from './services/ownership.service';
 import { parseBody } from './middlewares';
-import { WorkflowsService } from './workflows/workflows.services';
 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';
 
 const pipeline = promisify(stream.pipeline);
 
@@ -99,7 +99,28 @@ export const webhookRequestHandler =
 					return ResponseHelper.sendErrorResponse(res, error as Error);
 				}
 			}
-			res.header('Access-Control-Allow-Origin', req.headers.origin);
+
+			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 ?? {};
+
+				res.header(
+					'Access-Control-Allow-Origin',
+					!allowedOrigins || allowedOrigins === '*' ? req.headers.origin : allowedOrigins,
+				);
+
+				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') {
@@ -110,16 +131,7 @@ export const webhookRequestHandler =
 		try {
 			response = await webhookManager.executeWebhook(req, res);
 		} catch (error) {
-			if (
-				error.errorCode === 404 &&
-				(error.message as string).includes(FORM_TRIGGER_PATH_IDENTIFIER)
-			) {
-				const isTestWebhook = req.originalUrl.includes('webhook-test');
-				res.status(404);
-				return res.render('form-trigger-404', { isTestWebhook });
-			} else {
-				return ResponseHelper.sendErrorResponse(res, error as Error);
-			}
+			return ResponseHelper.sendErrorResponse(res, error as Error);
 		}
 
 		// Don't respond, if already responded
@@ -217,7 +229,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 = {
@@ -234,7 +246,7 @@ export async function executeWebhook(
 		try {
 			user = await Container.get(OwnershipService).getWorkflowOwnerCached(workflowData.id);
 		} catch (error) {
-			throw new ResponseHelper.NotFoundError('Cannot find workflow');
+			throw new NotFoundError('Cannot find workflow');
 		}
 	}
 
@@ -246,7 +258,6 @@ export async function executeWebhook(
 		workflowStartNode,
 		webhookData.webhookDescription.responseMode,
 		executionMode,
-		additionalData.timezone,
 		additionalKeys,
 		undefined,
 		'onReceived',
@@ -255,7 +266,6 @@ export async function executeWebhook(
 		workflowStartNode,
 		webhookData.webhookDescription.responseCode,
 		executionMode,
-		additionalData.timezone,
 		additionalKeys,
 		undefined,
 		200,
@@ -265,7 +275,6 @@ export async function executeWebhook(
 		workflowStartNode,
 		webhookData.webhookDescription.responseData,
 		executionMode,
-		additionalData.timezone,
 		additionalKeys,
 		undefined,
 		'firstEntryJson',
@@ -277,22 +286,27 @@ export async function executeWebhook(
 		// 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;
 
-	const binaryData = workflow.expression.getSimpleParameterValue(
-		workflowStartNode,
-		'={{$parameter["options"]["binaryData"]}}',
-		executionMode,
-		additionalData.timezone,
-		additionalKeys,
-		undefined,
-		false,
-	);
+	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 = {};
@@ -302,6 +316,7 @@ export async function executeWebhook(
 		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') {
@@ -318,7 +333,19 @@ export async function executeWebhook(
 					});
 				});
 			} else {
-				await parseBody(req);
+				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);
+				}
 			}
 		}
 
@@ -358,9 +385,6 @@ export async function executeWebhook(
 			};
 		}
 
-		// Save static data if it changed
-		await WorkflowsService.saveStaticData(workflow);
-
 		const additionalKeys: IWorkflowDataProxyAdditionalKeys = {
 			$executionId: executionId,
 		};
@@ -370,7 +394,6 @@ export async function executeWebhook(
 				workflowStartNode,
 				webhookData.webhookDescription.responseHeaders,
 				executionMode,
-				additionalData.timezone,
 				additionalKeys,
 				undefined,
 				undefined,
@@ -492,11 +515,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,
 			workflowData,
+			pinData,
 			userId: user.id,
 		};
 
@@ -523,10 +554,27 @@ export async function executeWebhook(
 					} 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,
 						});
 					}
 
@@ -576,8 +624,8 @@ export async function executeWebhook(
 						return undefined;
 					}
 
-					if (workflowData.pinData) {
-						data.data.resultData.pinData = workflowData.pinData;
+					if (usePinData) {
+						data.data.resultData.pinData = pinData;
 					}
 
 					const returnData = WorkflowHelpers.getDataLastExecutedNodeData(data);
@@ -644,7 +692,6 @@ export async function executeWebhook(
 								workflowStartNode,
 								webhookData.webhookDescription.responsePropertyName,
 								executionMode,
-								additionalData.timezone,
 								additionalKeys,
 								undefined,
 								undefined,
@@ -658,7 +705,6 @@ export async function executeWebhook(
 								workflowStartNode,
 								webhookData.webhookDescription.responseContentType,
 								executionMode,
-								additionalData.timezone,
 								additionalKeys,
 								undefined,
 								undefined,
@@ -704,7 +750,6 @@ export async function executeWebhook(
 								workflowStartNode,
 								webhookData.webhookDescription.responseBinaryPropertyName,
 								executionMode,
-								additionalData.timezone,
 								additionalKeys,
 								undefined,
 								'data',
@@ -769,13 +814,13 @@ export async function executeWebhook(
 						responseCallback(new Error('There was a problem executing the workflow'), {});
 					}
 
-					throw new ResponseHelper.InternalServerError(e.message);
+					throw new InternalServerError(e.message);
 				});
 		}
 		return executionId;
 	} catch (e) {
 		const error =
-			e instanceof ResponseHelper.UnprocessableRequestError
+			e instanceof UnprocessableRequestError
 				? e
 				: new Error('There was a problem executing the workflow', { cause: e });
 		if (didSendResponse) throw error;
@@ -783,14 +828,3 @@ export async function executeWebhook(
 		return;
 	}
 }
-
-/**
- * Returns the base URL of the webhooks
- */
-export function getWebhookBaseUrl() {
-	let urlBaseWebhook = process.env.WEBHOOK_URL ?? GenericHelpers.getBaseUrl();
-	if (!urlBaseWebhook.endsWith('/')) {
-		urlBaseWebhook += '/';
-	}
-	return urlBaseWebhook;
-}
diff --git a/packages/cli/src/WebhookServer.ts b/packages/cli/src/WebhookServer.ts
index a8daadc51a..60f59f606d 100644
--- a/packages/cli/src/WebhookServer.ts
+++ b/packages/cli/src/WebhookServer.ts
@@ -1,5 +1,7 @@
+import { Service } from 'typedi';
 import { AbstractServer } from '@/AbstractServer';
 
+@Service()
 export class WebhookServer extends AbstractServer {
 	constructor() {
 		super('webhook');
diff --git a/packages/cli/src/WorkflowCredentials.ts b/packages/cli/src/WorkflowCredentials.ts
deleted file mode 100644
index cb0fc4c4b7..0000000000
--- a/packages/cli/src/WorkflowCredentials.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-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;
-
-	for (node of nodes) {
-		if (node.disabled === true || !node.credentials) {
-			continue;
-		}
-
-		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]) {
-				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}".`,
-					);
-				}
-
-				returnCredentials[type][nodeCredentials.id] = foundCredentials;
-			}
-		}
-	}
-
-	return returnCredentials;
-}
diff --git a/packages/cli/src/WorkflowExecuteAdditionalData.ts b/packages/cli/src/WorkflowExecuteAdditionalData.ts
index f4f10472a2..143ef169a4 100644
--- a/packages/cli/src/WorkflowExecuteAdditionalData.ts
+++ b/packages/cli/src/WorkflowExecuteAdditionalData.ts
@@ -1,6 +1,5 @@
 /* eslint-disable @typescript-eslint/no-unsafe-argument */
 /* eslint-disable @typescript-eslint/no-use-before-define */
-/* eslint-disable @typescript-eslint/prefer-nullish-coalescing */
 /* eslint-disable id-denylist */
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-unused-vars */
@@ -24,8 +23,10 @@ import type {
 	IWorkflowSettings,
 	WorkflowExecuteMode,
 	ExecutionStatus,
+	ExecutionError,
 } from 'n8n-workflow';
 import {
+	ApplicationError,
 	ErrorReporterProxy as ErrorReporter,
 	NodeOperationError,
 	Workflow,
@@ -47,13 +48,11 @@ import type {
 } from '@/Interfaces';
 import { NodeTypes } from '@/NodeTypes';
 import { Push } from '@/push';
-import * as WebhookHelpers from '@/WebhookHelpers';
 import * as WorkflowHelpers from '@/WorkflowHelpers';
 import { findSubworkflowStart, isWorkflowIdValid } from '@/utils';
 import { PermissionChecker } from './UserManagement/PermissionChecker';
-import { WorkflowsService } from './workflows/workflows.services';
 import { InternalHooks } from '@/InternalHooks';
-import { ExecutionRepository } from '@db/repositories';
+import { ExecutionRepository } from '@db/repositories/execution.repository';
 import { EventsService } from '@/services/events.service';
 import { SecretsHelper } from './SecretsHelpers';
 import { OwnershipService } from './services/ownership.service';
@@ -63,7 +62,12 @@ import {
 	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';
 
 const ERROR_TRIGGER_TYPE = config.getEnv('nodes.errorTriggerType');
 
@@ -90,6 +94,12 @@ export function objectToError(errorObject: unknown, workflow: Workflow): Error {
 			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;
@@ -123,7 +133,7 @@ export function executeErrorWorkflow(
 	// 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}`;
 	}
@@ -357,98 +367,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 fullExecutionData = await Container.get(ExecutionRepository).findSingleExecution(
-						this.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(
-						this.executionId,
-						fullExecutionData,
-					);
-				} 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.sessionId,
+				);
 			},
 		],
 	};
@@ -485,9 +411,7 @@ function hookFunctionsSave(parentProcessMode?: string): IWorkflowExecuteHooks {
 					workflowId: this.workflowData.id,
 				});
 
-				if (this.mode === 'webhook' && config.getEnv('binaryDataManager.mode') !== 'default') {
-					await restoreBinaryDataId(fullRunData, this.executionId);
-				}
+				await restoreBinaryDataId(fullRunData, this.executionId, this.mode);
 
 				const isManualMode = [this.mode, parentProcessMode].includes('manual');
 
@@ -495,8 +419,8 @@ function hookFunctionsSave(parentProcessMode?: string): IWorkflowExecuteHooks {
 					if (!isManualMode && isWorkflowIdValid(this.workflowData.id) && newStaticData) {
 						// Workflow is saved so update in database
 						try {
-							await WorkflowsService.saveStaticDataById(
-								this.workflowData.id as string,
+							await Container.get(WorkflowStaticDataService).saveStaticDataById(
+								this.workflowData.id,
 								newStaticData,
 							);
 						} catch (e) {
@@ -508,40 +432,29 @@ function hookFunctionsSave(parentProcessMode?: string): IWorkflowExecuteHooks {
 						}
 					}
 
-					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) {
-						await Container.get(ExecutionRepository).hardDelete({
-							workflowId: this.workflowData.id as string,
-							executionId: 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 executionStatus = determineFinalExecutionStatus(fullRunData);
+					const shouldNotSave =
+						(executionStatus === 'success' && !saveSettings.success) ||
+						(executionStatus !== 'success' && !saveSettings.error);
 
-					const workflowStatusFinal = determineFinalExecutionStatus(fullRunData);
-
-					if (
-						(workflowStatusFinal === 'success' && saveDataSuccessExecution === 'none') ||
-						(workflowStatusFinal !== 'success' && saveDataErrorExecution === 'none')
-					) {
+					if (shouldNotSave) {
 						if (!fullRunData.waitTill && !isManualMode) {
 							executeErrorWorkflow(
 								this.workflowData,
@@ -551,7 +464,7 @@ function hookFunctionsSave(parentProcessMode?: string): IWorkflowExecuteHooks {
 								this.retryOf,
 							);
 							await Container.get(ExecutionRepository).hardDelete({
-								workflowId: this.workflowData.id as string,
+								workflowId: this.workflowData.id,
 								executionId: this.executionId,
 							});
 
@@ -564,13 +477,13 @@ function hookFunctionsSave(parentProcessMode?: string): IWorkflowExecuteHooks {
 					const fullExecutionData = prepareExecutionDataForDbUpdate({
 						runData: fullRunData,
 						workflowData: this.workflowData,
-						workflowStatusFinal,
+						workflowStatusFinal: executionStatus,
 						retryOf: this.retryOf,
 					});
 
 					await updateExistingExecution({
 						executionId: this.executionId,
-						workflowId: this.workflowData.id as string,
+						workflowId: this.workflowData.id,
 						executionData: fullExecutionData,
 					});
 
@@ -652,8 +565,8 @@ function hookFunctionsSaveWorker(): IWorkflowExecuteHooks {
 					if (isWorkflowIdValid(this.workflowData.id) && newStaticData) {
 						// Workflow is saved so update in database
 						try {
-							await WorkflowsService.saveStaticDataById(
-								this.workflowData.id as string,
+							await Container.get(WorkflowStaticDataService).saveStaticDataById(
+								this.workflowData.id,
 								newStaticData,
 							);
 						} catch (e) {
@@ -688,7 +601,7 @@ function hookFunctionsSaveWorker(): IWorkflowExecuteHooks {
 
 					await updateExistingExecution({
 						executionId: this.executionId,
-						workflowId: this.workflowData.id as string,
+						workflowId: this.workflowData.id,
 						executionData: fullExecutionData,
 					});
 				} catch (error) {
@@ -711,6 +624,21 @@ function hookFunctionsSaveWorker(): IWorkflowExecuteHooks {
 				// 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, newStaticData: IDataObject) {
+				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);
+						console.error('There was a problem running hook "workflow.postExecute"', error);
+					}
+				}
+			},
 		],
 		nodeFetchedData: [
 			async (workflowId: string, node: INode) => {
@@ -774,11 +702,11 @@ 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"!',
 		);
 	}
@@ -787,10 +715,15 @@ export async function getWorkflowData(
 	if (workflowInfo.id !== undefined) {
 		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 || workflowData === null) {
-			throw new Error(`The workflow with the id "${workflowInfo.id}" does not exist.`);
+			throw new ApplicationError('Workflow does not exist.', {
+				extra: { workflowId: workflowInfo.id },
+			});
 		}
 	} else {
 		workflowData = workflowInfo.code ?? null;
@@ -814,7 +747,8 @@ async function executeWorkflow(
 	workflowInfo: IExecuteWorkflowInfo,
 	additionalData: IWorkflowExecuteAdditionalData,
 	options: {
-		parentWorkflowId?: string;
+		node?: INode;
+		parentWorkflowId: string;
 		inputData?: INodeExecutionData[];
 		parentExecutionId?: string;
 		loadedWorkflowData?: IWorkflowBase;
@@ -835,7 +769,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,
@@ -854,10 +788,7 @@ async function executeWorkflow(
 	if (options.parentExecutionId !== undefined) {
 		executionId = options.parentExecutionId;
 	} else {
-		executionId =
-			options.parentExecutionId !== undefined
-				? options.parentExecutionId
-				: await activeExecutions.add(runData);
+		executionId = options.parentExecutionId ?? (await activeExecutions.add(runData));
 	}
 
 	void internalHooks.onWorkflowBeforeExecute(executionId || '', runData);
@@ -867,8 +798,8 @@ async function executeWorkflow(
 		await PermissionChecker.check(workflow, additionalData.userId);
 		await PermissionChecker.checkSubworkflowExecutePolicy(
 			workflow,
-			additionalData.userId,
 			options.parentWorkflowId,
+			options.node,
 		);
 
 		// Create new additionalData to have different workflow loaded and to call
@@ -919,10 +850,11 @@ async function executeWorkflow(
 		}
 		data = await workflowExecute.processRunExecutionData(workflow);
 	} catch (error) {
+		const executionError = error ? (error as ExecutionError) : undefined;
 		const fullRunData: IRun = {
 			data: {
 				resultData: {
-					error,
+					error: executionError,
 					runData: {},
 				},
 			},
@@ -944,6 +876,7 @@ async function executeWorkflow(
 			stoppedAt: fullRunData.stoppedAt,
 			status: fullRunData.status,
 			workflowData,
+			workflowId: workflowData.id,
 		};
 		if (workflowData.id) {
 			fullExecutionData.workflowId = workflowData.id;
@@ -958,9 +891,9 @@ async function executeWorkflow(
 		);
 		throw objectToError(
 			{
-				...error,
-				stack: error.stack,
-				message: error.message,
+				...executionError,
+				stack: executionError?.stack,
+				message: executionError?.message,
 			},
 			workflow,
 		);
@@ -970,7 +903,8 @@ async function executeWorkflow(
 
 	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
 
 		activeExecutions.remove(executionId, data);
@@ -978,13 +912,14 @@ async function executeWorkflow(
 		return returnData!.data!.main;
 	}
 	activeExecutions.remove(executionId, data);
+
 	// Workflow did fail
 	const { error } = data.data.resultData;
-	// eslint-disable-next-line @typescript-eslint/no-throw-literal
+
 	throw objectToError(
 		{
 			...error,
-			stack: error!.stack,
+			stack: error?.stack,
 		},
 		workflow,
 	);
@@ -1022,19 +957,19 @@ export function sendDataToUI(type: string, data: IDataObject | IDataObject[]) {
 
 /**
  * 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 variables = await WorkflowHelpers.getVariables();
 
@@ -1042,8 +977,8 @@ export async function getBase(
 		credentialsHelper: Container.get(CredentialsHelper),
 		executeWorkflow,
 		restApiUrl: urlBaseWebhook + config.getEnv('endpoints.rest'),
-		timezone,
 		instanceBaseUrl: urlBaseWebhook,
+		formWaitingBaseUrl,
 		webhookBaseUrl,
 		webhookWaitingBaseUrl,
 		webhookTestBaseUrl,
@@ -1097,6 +1032,7 @@ export function getWorkflowHooksWorkerExecuter(
 		}
 		hookFunctions[key]!.push.apply(hookFunctions[key], preExecuteFunctions[key]);
 	}
+
 	return new WorkflowHooks(hookFunctions, mode, executionId, workflowData, optionalParameters);
 }
 
@@ -1135,25 +1071,16 @@ export function getWorkflowHooksWorkerMain(
 			fullRunData: IRun,
 			newStaticData: IDataObject,
 		): Promise<void> {
-			// 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 executionStatus = determineFinalExecutionStatus(fullRunData);
+			const saveSettings = toSaveSettings(this.workflowData.settings);
 
-			const workflowStatusFinal = determineFinalExecutionStatus(fullRunData);
+			const shouldNotSave =
+				(executionStatus === 'success' && !saveSettings.success) ||
+				(executionStatus !== 'success' && !saveSettings.error);
 
-			if (
-				(workflowStatusFinal === 'success' && saveDataSuccessExecution === 'none') ||
-				(workflowStatusFinal !== 'success' && saveDataErrorExecution === 'none')
-			) {
+			if (shouldNotSave) {
 				await Container.get(ExecutionRepository).hardDelete({
-					workflowId: this.workflowData.id as string,
+					workflowId: this.workflowData.id,
 					executionId: this.executionId,
 				});
 			}
diff --git a/packages/cli/src/WorkflowHelpers.ts b/packages/cli/src/WorkflowHelpers.ts
index bd518a49c3..010dee308a 100644
--- a/packages/cli/src/WorkflowHelpers.ts
+++ b/packages/cli/src/WorkflowHelpers.ts
@@ -21,28 +21,29 @@ import {
 	Workflow,
 } from 'n8n-workflow';
 import { v4 as uuid } from 'uuid';
-import * as Db from '@/Db';
+import omit from 'lodash/omit';
 import type {
 	ExecutionPayload,
 	IWorkflowErrorData,
 	IWorkflowExecutionDataProcess,
 } from '@/Interfaces';
 import { NodeTypes } from '@/NodeTypes';
-// eslint-disable-next-line import/no-cycle
 import { WorkflowRunner } from '@/WorkflowRunner';
 import config from '@/config';
 import type { WorkflowEntity } from '@db/entities/WorkflowEntity';
 import type { User } from '@db/entities/User';
-import omit from 'lodash/omit';
-// eslint-disable-next-line import/no-cycle
 import { PermissionChecker } from './UserManagement/PermissionChecker';
 import { UserService } from './services/user.service';
+import type { CredentialsEntity } from '@db/entities/CredentialsEntity';
 import type { SharedWorkflow } from '@db/entities/SharedWorkflow';
 import type { RoleNames } from '@db/entities/Role';
+import { CredentialsRepository } from '@db/repositories/credentials.repository';
+import { ExecutionRepository } from '@db/repositories/execution.repository';
+import { RoleRepository } from '@db/repositories/role.repository';
+import { SharedWorkflowRepository } from '@db/repositories/sharedWorkflow.repository';
+import { WorkflowRepository } from '@db/repositories/workflow.repository';
 import { RoleService } from './services/role.service';
-import { ExecutionRepository, RoleRepository } from './databases/repositories';
-import { VariablesService } from './environments/variables/variables.service';
-import type { CredentialsEntity } from './databases/entities/CredentialsEntity';
+import { VariablesService } from './environments/variables/variables.service.ee';
 import { Logger } from './Logger';
 
 const ERROR_TRIGGER_TYPE = config.getEnv('nodes.errorTriggerType');
@@ -146,7 +147,7 @@ export async function executeErrorWorkflow(
 	const logger = Container.get(Logger);
 	// 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 });
+		const workflowData = await Container.get(WorkflowRepository).findOneBy({ id: workflowId });
 
 		if (workflowData === null) {
 			// The error workflow could not be found
@@ -172,10 +173,13 @@ export async function executeErrorWorkflow(
 		});
 
 		try {
+			const failedNode = workflowErrorData.execution?.lastNodeExecuted
+				? workflowInstance.getNode(workflowErrorData.execution?.lastNodeExecuted)
+				: undefined;
 			await PermissionChecker.checkSubworkflowExecutePolicy(
 				workflowInstance,
-				runningUser.id,
-				workflowErrorData.workflow.id,
+				workflowErrorData.workflow.id!,
+				failedNode ?? undefined,
 			);
 		} catch (error) {
 			const initialNode = workflowInstance.getStartNode();
@@ -284,7 +288,7 @@ export async function executeErrorWorkflow(
  * Returns the static data of workflow
  */
 export async function getStaticDataById(workflowId: string) {
-	const workflowData = await Db.collections.Workflow.findOne({
+	const workflowData = await Container.get(WorkflowRepository).findOne({
 		select: ['staticData'],
 		where: { id: workflowId },
 	});
@@ -332,7 +336,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,
 					});
@@ -368,7 +372,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,
 				});
@@ -382,7 +386,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,
 				});
@@ -414,24 +418,19 @@ export async function replaceInvalidCredentials(workflow: WorkflowEntity): Promi
 
 /**
  * Get the IDs of the workflows that have been shared with the user.
- * Returns all IDs if user is global owner (see `whereClause`)
+ * Returns all IDs if user has the 'workflow:read' scope.
  */
-export async function getSharedWorkflowIds(user: User, roles?: RoleNames[]): Promise<string[]> {
+export async function getSharedWorkflowIds(user: User, roleNames?: RoleNames[]): Promise<string[]> {
 	const where: FindOptionsWhere<SharedWorkflow> = {};
-	if (user.globalRole?.name !== 'owner') {
+	if (!user.hasGlobalScope('workflow:read')) {
 		where.userId = user.id;
 	}
-	if (roles?.length) {
-		const roleIds = await Container.get(RoleRepository)
-			.find({
-				select: ['id'],
-				where: { name: In(roles), scope: 'workflow' },
-			})
-			.then((role) => role.map(({ id }) => id));
+	if (roleNames?.length) {
+		const roleIds = await Container.get(RoleRepository).getIdsInScopeWorkflowByNames(roleNames);
 
 		where.roleId = In(roleIds);
 	}
-	const sharedWorkflows = await Db.collections.SharedWorkflow.find({
+	const sharedWorkflows = await Container.get(SharedWorkflowRepository).find({
 		where,
 		select: ['workflowId'],
 	});
@@ -446,19 +445,21 @@ export async function isBelowOnboardingThreshold(user: User): Promise<boolean> {
 	const skippedTypes = ['n8n-nodes-base.start', 'n8n-nodes-base.stickyNote'];
 
 	const workflowOwnerRole = await Container.get(RoleService).findWorkflowOwnerRole();
-	const ownedWorkflowsIds = await Db.collections.SharedWorkflow.find({
-		where: {
-			userId: user.id,
-			roleId: workflowOwnerRole?.id,
-		},
-		select: ['workflowId'],
-	}).then((ownedWorkflows) => ownedWorkflows.map(({ workflowId }) => workflowId));
+	const ownedWorkflowsIds = await Container.get(SharedWorkflowRepository)
+		.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({
+		const workflows = await Container.get(WorkflowRepository).find({
 			where: { id: In(ownedWorkflowsIds) },
 			select: ['nodes'],
 		});
diff --git a/packages/cli/src/WorkflowRunner.ts b/packages/cli/src/WorkflowRunner.ts
index c4ceb4c290..1242bc876d 100644
--- a/packages/cli/src/WorkflowRunner.ts
+++ b/packages/cli/src/WorkflowRunner.ts
@@ -12,6 +12,7 @@ import type {
 	ExecutionError,
 	IDeferredPromise,
 	IExecuteResponsePromiseData,
+	IPinData,
 	IRun,
 	WorkflowExecuteMode,
 	WorkflowHooks,
@@ -37,22 +38,18 @@ import type {
 } from '@/Interfaces';
 import { NodeTypes } from '@/NodeTypes';
 import type { Job, JobData, JobResponse } from '@/Queue';
-// eslint-disable-next-line import/no-cycle
+
 import { Queue } from '@/Queue';
 import { decodeWebhookResponse } from '@/helpers/decodeWebhookResponse';
-// eslint-disable-next-line import/no-cycle
 import * as WorkflowHelpers from '@/WorkflowHelpers';
-// eslint-disable-next-line import/no-cycle
 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 { ExecutionRepository } from '@db/repositories';
+import { ExecutionRepository } from '@db/repositories/execution.repository';
 import { Logger } from './Logger';
 
 export class WorkflowRunner {
@@ -73,8 +70,8 @@ export class WorkflowRunner {
 	/**
 	 * The process did send a hook message so execute the appropriate hook
 	 */
-	processHookMessage(workflowHooks: WorkflowHooks, hookData: IProcessMessageDataHook) {
-		void workflowHooks.executeHookFunctions(hookData.hook, hookData.parameters);
+	async processHookMessage(workflowHooks: WorkflowHooks, hookData: IProcessMessageDataHook) {
+		await workflowHooks.executeHookFunctions(hookData.hook, hookData.parameters);
 	}
 
 	/**
@@ -131,9 +128,13 @@ export class WorkflowRunner {
 		// does contain those messages.
 		try {
 			// Search for messages for this executionId in event logs
+			const { eventBus } = await import('./eventbus');
 			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 { recoverExecutionDataFromEventLogMessages } = await import(
+					'./eventbus/MessageEventBus/recoverEvents'
+				);
 				const eventLogExecutionData = await recoverExecutionDataFromEventLogMessages(
 					executionId,
 					eventLogMessages,
@@ -217,7 +218,11 @@ export class WorkflowRunner {
 
 		// 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 (executionsMode !== 'queue' || data.executionMode === 'manual') {
+		if (
+			executionsMode !== 'queue' ||
+			config.getEnv('generic.instanceType') === 'worker' ||
+			data.executionMode === 'manual'
+		) {
 			const postExecutePromise = this.activeExecutions.getPostExecutePromise(executionId);
 			const externalHooks = Container.get(ExternalHooks);
 			postExecutePromise
@@ -280,6 +285,11 @@ 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,
@@ -289,6 +299,7 @@ export class WorkflowRunner {
 			nodeTypes,
 			staticData: data.workflowData.staticData,
 			settings: workflowSettings,
+			pinData,
 		});
 		const additionalData = await WorkflowExecuteAdditionalData.getBase(
 			data.userId,
@@ -306,13 +317,9 @@ export class WorkflowRunner {
 			{ executionId },
 		);
 		let workflowExecution: PCancelable<IRun>;
+		await Container.get(ExecutionRepository).updateStatus(executionId, 'running');
 
 		try {
-			this.logger.verbose(
-				`Execution for workflow ${data.workflowData.name} was assigned id ${executionId}`,
-				{ executionId },
-			);
-
 			additionalData.hooks = WorkflowExecuteAdditionalData.getWorkflowHooksMain(
 				data,
 				executionId,
@@ -563,11 +570,8 @@ export class WorkflowRunner {
 					};
 				}
 
-				let racingPromisesResult: JobResponse = {
-					success: false,
-				};
 				try {
-					racingPromisesResult = await Promise.race(racingPromises);
+					await Promise.race(racingPromises);
 					if (clearWatchdogInterval !== undefined) {
 						clearWatchdogInterval();
 					}
@@ -621,6 +625,7 @@ export class WorkflowRunner {
 					mode: fullExecutionData.mode,
 					startedAt: fullExecutionData.startedAt,
 					stoppedAt: fullExecutionData.stoppedAt,
+					status: fullExecutionData.status,
 				} as IRun;
 
 				if (executionHasPostExecutionPromises) {
@@ -635,31 +640,6 @@ export class WorkflowRunner {
 				// Normally also static data should be supplied here but as it only used for sending
 				// data to editor-UI is not needed.
 				await 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 = !racingPromisesResult.error;
-					if (
-						(workflowDidSucceed && saveDataSuccessExecution === 'none') ||
-						(!workflowDidSucceed && saveDataErrorExecution === 'none')
-					) {
-						await Container.get(ExecutionRepository).hardDelete({
-							workflowId: data.workflowData.id as string,
-							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);
-				}
 
 				resolve(runData);
 			},
@@ -701,6 +681,7 @@ export class WorkflowRunner {
 		const executionId = await this.activeExecutions.add(data, subprocess, restartExecutionId);
 
 		(data as unknown as IWorkflowExecutionDataProcessWithExecution).executionId = executionId;
+		await Container.get(ExecutionRepository).updateStatus(executionId, 'running');
 
 		const workflowHooks = WorkflowExecuteAdditionalData.getWorkflowHooksMain(data, executionId);
 
@@ -777,7 +758,7 @@ export class WorkflowRunner {
 					workflowHooks,
 				);
 			} else if (message.type === 'processHook') {
-				this.processHookMessage(workflowHooks, message.data as IProcessMessageDataHook);
+				await 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!');
diff --git a/packages/cli/src/WorkflowRunnerProcess.ts b/packages/cli/src/WorkflowRunnerProcess.ts
index 8a828398b0..4bb8ba24cc 100644
--- a/packages/cli/src/WorkflowRunnerProcess.ts
+++ b/packages/cli/src/WorkflowRunnerProcess.ts
@@ -178,7 +178,7 @@ class WorkflowRunnerProcess {
 		additionalData.setExecutionStatus = WorkflowExecuteAdditionalData.setExecutionStatus.bind({
 			executionId: inputData.executionId,
 		});
-		// eslint-disable-next-line @typescript-eslint/no-explicit-any
+
 		additionalData.sendDataToUI = async (type: string, data: IDataObject | IDataObject[]) => {
 			if (workflowRunner.data!.executionMode !== 'manual') {
 				return;
@@ -197,16 +197,16 @@ class WorkflowRunnerProcess {
 		additionalData.executeWorkflow = async (
 			workflowInfo: IExecuteWorkflowInfo,
 			additionalData: IWorkflowExecuteAdditionalData,
-			options?: {
-				parentWorkflowId?: string;
+			options: {
+				parentWorkflowId: string;
 				inputData?: INodeExecutionData[];
 				parentWorkflowSettings?: IWorkflowSettings;
 			},
 		): Promise<Array<INodeExecutionData[] | null> | IRun> => {
 			const workflowData = await WorkflowExecuteAdditionalData.getWorkflowData(
 				workflowInfo,
-				options?.parentWorkflowId,
-				options?.parentWorkflowSettings,
+				options.parentWorkflowId,
+				options.parentWorkflowSettings,
 			);
 			const runData = await WorkflowExecuteAdditionalData.getRunData(
 				workflowData,
@@ -309,9 +309,7 @@ class WorkflowRunnerProcess {
 
 	/**
 	 * Sends hook data to the parent process that it executes them
-	 *
 	 */
-	// eslint-disable-next-line @typescript-eslint/no-explicit-any
 	async sendHookToParentProcess(hook: string, parameters: any[]) {
 		try {
 			await sendToParentProcess('processHook', {
@@ -384,7 +382,6 @@ class WorkflowRunnerProcess {
  * @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!(
diff --git a/packages/cli/src/audit/index.ts b/packages/cli/src/audit/index.ts
deleted file mode 100644
index a8c3e79e18..0000000000
--- 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 80d145e750..0000000000
--- a/packages/cli/src/audit/risks/credentials.risk.ts
+++ /dev/null
@@ -1,138 +0,0 @@
-import type { FindOperator } from 'typeorm';
-import { MoreThanOrEqual } from 'typeorm';
-import { DateUtils } from 'typeorm/util/DateUtils';
-import { Container } from 'typedi';
-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';
-import { ExecutionRepository } from '@db/repositories';
-
-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 Container.get(ExecutionRepository).findMultipleExecutions(
-		{
-			where: {
-				startedAt: MoreThanOrEqual(utcDate) as unknown as FindOperator<Date>,
-			},
-		},
-		{ includeData: true },
-	);
-}
-
-/**
- * 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 c0f62438c3..0000000000
--- 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 6e1033d5a6..0000000000
--- 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 0005047676..0000000000
--- a/packages/cli/src/audit/risks/instance.risk.ts
+++ /dev/null
@@ -1,202 +0,0 @@
-import axios from 'axios';
-import { Container } from 'typedi';
-import { InstanceSettings } from 'n8n-core';
-import config from '@/config';
-import { toFlaggedNode } from '@/audit/utils';
-import { separate } from '@/utils';
-import {
-	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';
-import { isApiEnabled } from '@/PublicApi';
-
-function 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.auth = {
-		authExcludeEndpoints: config.getEnv('security.excludeEndpoints') || 'none',
-	};
-
-	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 } = Container.get(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;
-}
-
-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: `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 b1ef484b51..0000000000
--- a/packages/cli/src/audit/risks/nodes.risk.ts
+++ /dev/null
@@ -1,117 +0,0 @@
-import * as path from 'path';
-import glob from 'fast-glob';
-import { Container } from 'typedi';
-import config from '@/config';
-import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
-import { getNodeTypes } from '@/audit/utils';
-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';
-
-async function getCommunityNodeDetails() {
-	if (!config.getEnv('nodes.communityPackages.enabled')) return [];
-
-	// eslint-disable-next-line @typescript-eslint/naming-convention
-	const { CommunityPackagesService } = await import('@/services/communityPackages.service');
-	const installedPackages = await Container.get(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;
-	}, []);
-}
-
-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/auth/jwt.ts b/packages/cli/src/auth/jwt.ts
index 53f3b7f276..bbb6386742 100644
--- a/packages/cli/src/auth/jwt.ts
+++ b/packages/cli/src/auth/jwt.ts
@@ -1,14 +1,16 @@
-import jwt from 'jsonwebtoken';
 import type { Response } from 'express';
 import { createHash } from 'crypto';
-import * as Db from '@/Db';
 import { AUTH_COOKIE_NAME, RESPONSE_ERROR_MESSAGES } from '@/constants';
 import type { JwtPayload, JwtToken } from '@/Interfaces';
 import type { User } from '@db/entities/User';
 import config from '@/config';
-import * as ResponseHelper from '@/ResponseHelper';
 import { License } from '@/License';
 import { Container } from 'typedi';
+import { UserRepository } from '@db/repositories/user.repository';
+import { JwtService } from '@/services/jwt.service';
+import { UnauthorizedError } from '@/errors/response-errors/unauthorized.error';
+import { AuthError } from '@/errors/response-errors/auth.error';
+import { ApplicationError } from 'n8n-workflow';
 
 export function issueJWT(user: User): JwtToken {
 	const { id, email, password } = user;
@@ -26,7 +28,7 @@ export function issueJWT(user: User): JwtToken {
 		!user.isOwner &&
 		!isWithinUsersLimit
 	) {
-		throw new ResponseHelper.UnauthorizedError(RESPONSE_ERROR_MESSAGES.USERS_QUOTA_REACHED);
+		throw new UnauthorizedError(RESPONSE_ERROR_MESSAGES.USERS_QUOTA_REACHED);
 	}
 	if (password) {
 		payload.password = createHash('sha256')
@@ -34,7 +36,7 @@ export function issueJWT(user: User): JwtToken {
 			.digest('hex');
 	}
 
-	const signedToken = jwt.sign(payload, config.getEnv('userManagement.jwtSecret'), {
+	const signedToken = Container.get(JwtService).sign(payload, {
 		expiresIn: expiresIn / 1000 /* in seconds */,
 	});
 
@@ -44,37 +46,40 @@ export function issueJWT(user: User): JwtToken {
 	};
 }
 
+export const createPasswordSha = (user: User) =>
+	createHash('sha256')
+		.update(user.password.slice(user.password.length / 2))
+		.digest('hex');
+
 export async function resolveJwtContent(jwtPayload: JwtPayload): Promise<User> {
-	const user = await Db.collections.User.findOne({
+	const user = await Container.get(UserRepository).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');
+		passwordHash = createPasswordSha(user);
 	}
 
 	// currently only LDAP users during synchronization
 	// can be set to disabled
 	if (user?.disabled) {
-		throw new ResponseHelper.AuthError('Unauthorized');
+		throw new 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');
+		throw new ApplicationError('Invalid token content');
 	}
 	return user;
 }
 
 export async function resolveJwt(token: string): Promise<User> {
-	const jwtPayload = jwt.verify(token, config.getEnv('userManagement.jwtSecret'), {
+	const jwtPayload: JwtPayload = Container.get(JwtService).verify(token, {
 		algorithms: ['HS256'],
-	}) as JwtPayload;
+	});
 	return resolveJwtContent(jwtPayload);
 }
 
diff --git a/packages/cli/src/auth/methods/email.ts b/packages/cli/src/auth/methods/email.ts
index c55d8a2964..9775c1959d 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'],
 	});
 
-	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 826c33bbb4..c2e38cff02 100644
--- a/packages/cli/src/auth/methods/ldap.ts
+++ b/packages/cli/src/auth/methods/ldap.ts
@@ -1,32 +1,32 @@
+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 +35,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;
 
diff --git a/packages/cli/src/collaboration/collaboration.message.ts b/packages/cli/src/collaboration/collaboration.message.ts
new file mode 100644
index 0000000000..0980bdccbb
--- /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 0000000000..6d52d26558
--- /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 0000000000..530a529650
--- /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 a7a6ae0bcd..ff664505fd 100644
--- a/packages/cli/src/commands/BaseCommand.ts
+++ b/packages/cli/src/commands/BaseCommand.ts
@@ -2,31 +2,32 @@ import 'reflect-metadata';
 import { Command } from '@oclif/command';
 import { ExitError } from '@oclif/errors';
 import { Container } from 'typedi';
-import { ErrorReporterProxy as ErrorReporter, sleep } from 'n8n-workflow';
+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 { LICENSE_FEATURES, inTest } from '@/constants';
+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, N8nInstanceType } from '@/Interfaces';
+import type { N8nInstanceType } from '@/Interfaces';
 import { InternalHooks } from '@/InternalHooks';
 import { PostHogClient } from '@/posthog';
 import { License } from '@/License';
 import { ExternalSecretsManager } from '@/ExternalSecrets/ExternalSecretsManager.ee';
-import { initExpressionEvaluator } from '@/ExpressionEvalator';
-import { generateHostInstanceId } from '../databases/utils/generators';
+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 = Container.get(Logger);
 
-	protected externalHooks: IExternalHooksClass;
+	protected externalHooks?: ExternalHooks;
 
 	protected nodeTypes: NodeTypes;
 
@@ -38,12 +39,19 @@ export abstract class BaseCommand extends Command {
 
 	protected server?: AbstractServer;
 
+	protected shutdownService: ShutdownService = Container.get(ShutdownService);
+
+	/**
+	 * How long to wait for graceful shutdown before force killing the process.
+	 */
+	protected gracefulShutdownTimeoutInS: number = 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.instanceSettings = Container.get(InstanceSettings);
@@ -55,6 +63,12 @@ export abstract class BaseCommand extends Command {
 			this.exitWithCrash('There was an error initializing DB', error),
 		);
 
+		// 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) =>
@@ -74,6 +88,28 @@ export abstract class BaseCommand extends Command {
 			);
 		}
 
+		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();
 	}
@@ -102,7 +138,7 @@ export abstract class BaseCommand extends Command {
 
 	protected async exitSuccessFully() {
 		try {
-			await CrashJournal.cleanup();
+			await Promise.all([CrashJournal.cleanup(), Db.close()]);
 		} finally {
 			process.exit();
 		}
@@ -121,7 +157,7 @@ export abstract class BaseCommand extends Command {
 		if (!isSelected && !isAvailable) return;
 
 		if (isSelected && !isAvailable) {
-			throw new Error(
+			throw new ApplicationError(
 				'External storage selected but unavailable. Please make external storage available by adding "s3" to `N8N_AVAILABLE_BINARY_DATA_MODES`.',
 			);
 		}
@@ -165,7 +201,7 @@ export abstract class BaseCommand extends Command {
 		const host = config.getEnv('externalStorage.s3.host');
 
 		if (host === '') {
-			throw new Error(
+			throw new ApplicationError(
 				'External storage host not configured. Please set `N8N_EXTERNAL_STORAGE_S3_HOST`.',
 			);
 		}
@@ -176,13 +212,13 @@ export abstract class BaseCommand extends Command {
 		};
 
 		if (bucket.name === '') {
-			throw new Error(
+			throw new ApplicationError(
 				'External storage bucket name not configured. Please set `N8N_EXTERNAL_STORAGE_S3_BUCKET_NAME`.',
 			);
 		}
 
 		if (bucket.region === '') {
-			throw new Error(
+			throw new ApplicationError(
 				'External storage bucket region not configured. Please set `N8N_EXTERNAL_STORAGE_S3_BUCKET_REGION`.',
 			);
 		}
@@ -193,13 +229,13 @@ export abstract class BaseCommand extends Command {
 		};
 
 		if (credentials.accessKey === '') {
-			throw new Error(
+			throw new ApplicationError(
 				'External storage access key not configured. Please set `N8N_EXTERNAL_STORAGE_S3_ACCESS_KEY`.',
 			);
 		}
 
 		if (credentials.accessSecret === '') {
-			throw new Error(
+			throw new ApplicationError(
 				'External storage access secret not configured. Please set `N8N_EXTERNAL_STORAGE_S3_ACCESS_SECRET`.',
 			);
 		}
@@ -252,6 +288,7 @@ export abstract class BaseCommand extends Command {
 			try {
 				this.logger.debug('Attempting license activation');
 				await license.activate(activationKey);
+				this.logger.debug('License init complete');
 			} catch (e) {
 				this.logger.error('Could not activate license', e as Error);
 			}
@@ -276,4 +313,28 @@ export abstract class BaseCommand extends Command {
 		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
+				console.log(`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/audit.ts b/packages/cli/src/commands/audit.ts
index 0c1555ccdf..eb027ae0fa 100644
--- a/packages/cli/src/commands/audit.ts
+++ b/packages/cli/src/commands/audit.ts
@@ -1,11 +1,12 @@
 import { flags } from '@oclif/command';
-import { audit } from '@/audit';
-import { RISK_CATEGORIES } from '@/audit/constants';
+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';
+import { ApplicationError } from 'n8n-workflow';
 
 export class SecurityAudit extends BaseCommand {
 	static description = 'Generate a security audit report for this n8n instance';
@@ -46,10 +47,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/execute.ts b/packages/cli/src/commands/execute.ts
index f50d6c7f53..c298639fbf 100644
--- a/packages/cli/src/commands/execute.ts
+++ b/packages/cli/src/commands/execute.ts
@@ -2,16 +2,16 @@ import { promises as fs } from 'fs';
 import { flags } from '@oclif/command';
 import { PLACEHOLDER_EMPTY_WORKFLOW_ID } from 'n8n-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 { 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';
@@ -81,7 +81,7 @@ export class Execute extends BaseCommand {
 		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);
@@ -89,7 +89,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)) {
@@ -98,7 +98,7 @@ 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],
@@ -113,7 +113,7 @@ export class Execute extends BaseCommand {
 		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 a20348c92e..e931ce8e99 100644
--- a/packages/cli/src/commands/executeBatch.ts
+++ b/packages/cli/src/commands/executeBatch.ts
@@ -3,17 +3,15 @@ import fs from 'fs';
 import os from 'os';
 import { flags } from '@oclif/command';
 import type { IRun, ITaskData } from 'n8n-workflow';
-import { jsonParse, sleep } from 'n8n-workflow';
+import { ApplicationError, jsonParse, sleep } from 'n8n-workflow';
 import { sep } from 'path';
 import { diff } from 'json-diff';
 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 { findCliWorkflowStart } from '@/utils';
 import { BaseCommand } from './BaseCommand';
 import { Container } from 'typedi';
@@ -24,6 +22,8 @@ import type {
 	IResult,
 	IWorkflowExecutionProgress,
 } from '../types/commands.types';
+import { WorkflowRepository } from '@db/repositories/workflow.repository';
+import { OwnershipService } from '@/services/ownership.service';
 
 const re = /\d+/;
 
@@ -276,9 +276,9 @@ export class ExecuteBatch extends BaseCommand {
 			ExecuteBatch.githubWorkflow = true;
 		}
 
-		ExecuteBatch.instanceOwner = await getInstanceOwner();
+		ExecuteBatch.instanceOwner = await Container.get(OwnershipService).getInstanceOwner();
 
-		const query = Db.collections.Workflow.createQueryBuilder('workflows');
+		const query = Container.get(WorkflowRepository).createQueryBuilder('workflows');
 
 		if (ids.length > 0) {
 			query.andWhere('workflows.id in (:...ids)', { ids });
@@ -486,7 +486,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');
 							}
 						});
 					}
diff --git a/packages/cli/src/commands/export/credentials.ts b/packages/cli/src/commands/export/credentials.ts
index 6c1304e671..47008aa734 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 fs from 'fs';
 import path from 'path';
-import type { FindOptionsWhere } from 'typeorm';
 import { Credentials } from 'n8n-core';
-import * as Db from '@/Db';
 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';
@@ -105,12 +106,9 @@ 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) {
 			for (let i = 0; i < credentials.length; i++) {
@@ -123,7 +121,7 @@ export class ExportCredentialsCommand extends BaseCommand {
 		}
 
 		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) {
diff --git a/packages/cli/src/commands/export/workflow.ts b/packages/cli/src/commands/export/workflow.ts
index 873b69b80c..3aac28ffbb 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 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';
@@ -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) {
diff --git a/packages/cli/src/commands/import/credentials.ts b/packages/cli/src/commands/import/credentials.ts
index 81f724dda4..cb4bdc6a1f 100644
--- a/packages/cli/src/commands/import/credentials.ts
+++ b/packages/cli/src/commands/import/credentials.ts
@@ -1,5 +1,5 @@
 import { flags } from '@oclif/command';
-import { Credentials } from 'n8n-core';
+import { Cipher } from 'n8n-core';
 import fs from 'fs';
 import glob from 'fast-glob';
 import { Container } from 'typedi';
@@ -12,9 +12,10 @@ import { CredentialsEntity } from '@db/entities/CredentialsEntity';
 import { disableAutoGeneratedIds } from '@db/utils/commandHelpers';
 import { BaseCommand } from '../BaseCommand';
 import type { ICredentialsEncrypted } from 'n8n-workflow';
-import { jsonParse } from 'n8n-workflow';
+import { ApplicationError, jsonParse } from 'n8n-workflow';
 import { RoleService } from '@/services/role.service';
 import { UM_FIX_INSTRUCTION } from '@/constants';
+import { UserRepository } from '@db/repositories/user.repository';
 
 export class ImportCredentialsCommand extends BaseCommand {
 	static description = 'Import credentials';
@@ -69,6 +70,7 @@ export class ImportCredentialsCommand extends BaseCommand {
 
 		let totalImported = 0;
 
+		const cipher = Container.get(Cipher);
 		await this.initOwnerCredentialRole();
 		const user = flags.userId ? await this.getAssignee(flags.userId) : await this.getOwner();
 
@@ -92,12 +94,10 @@ export class ImportCredentialsCommand extends BaseCommand {
 					const credential = jsonParse<ICredentialsEncrypted>(
 						fs.readFileSync(file, { encoding: 'utf8' }),
 					);
-
 					if (typeof credential.data === 'object') {
 						// plain data / decrypted input. Should be encrypted first.
-						Credentials.prototype.setData.call(credential, credential.data);
+						credential.data = cipher.encrypt(credential.data);
 					}
-
 					await this.storeCredential(credential, user);
 				}
 			});
@@ -113,7 +113,7 @@ export class ImportCredentialsCommand extends BaseCommand {
 		totalImported = credentials.length;
 
 		if (!Array.isArray(credentials)) {
-			throw new Error(
+			throw new ApplicationError(
 				'File does not seem to contain credentials. Make sure the credentials are contained in an array.',
 			);
 		}
@@ -123,7 +123,7 @@ export class ImportCredentialsCommand extends BaseCommand {
 			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);
+					credential.data = cipher.encrypt(credential.data);
 				}
 				await this.storeCredential(credential, user);
 			}
@@ -149,13 +149,16 @@ export class ImportCredentialsCommand extends BaseCommand {
 		const ownerCredentialRole = await Container.get(RoleService).findCredentialOwnerRole();
 
 		if (!ownerCredentialRole) {
-			throw new Error(`Failed to find owner credential role. ${UM_FIX_INSTRUCTION}`);
+			throw new ApplicationError(`Failed to find owner credential role. ${UM_FIX_INSTRUCTION}`);
 		}
 
 		this.ownerCredentialRole = ownerCredentialRole;
 	}
 
-	private async storeCredential(credential: object, user: User) {
+	private async storeCredential(credential: Partial<CredentialsEntity>, user: User) {
+		if (!credential.nodesAccess) {
+			credential.nodesAccess = [];
+		}
 		const result = await this.transactionManager.upsert(CredentialsEntity, credential, ['id']);
 		await this.transactionManager.upsert(
 			SharedCredentials,
@@ -173,20 +176,20 @@ export class ImportCredentialsCommand extends BaseCommand {
 
 		const owner =
 			ownerGlobalRole &&
-			(await Db.collections.User.findOneBy({ globalRoleId: ownerGlobalRole.id }));
+			(await Container.get(UserRepository).findOneBy({ globalRoleId: ownerGlobalRole.id }));
 
 		if (!owner) {
-			throw new Error(`Failed to find owner. ${UM_FIX_INSTRUCTION}`);
+			throw new ApplicationError(`Failed to find owner. ${UM_FIX_INSTRUCTION}`);
 		}
 
 		return owner;
 	}
 
 	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;
diff --git a/packages/cli/src/commands/import/workflow.ts b/packages/cli/src/commands/import/workflow.ts
index 177014e460..9f3ccfc682 100644
--- a/packages/cli/src/commands/import/workflow.ts
+++ b/packages/cli/src/commands/import/workflow.ts
@@ -1,28 +1,22 @@
 import { flags } from '@oclif/command';
-import type { INode, INodeCredentialsDetails } from 'n8n-workflow';
-import { jsonParse } from 'n8n-workflow';
+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 * as Db from '@/Db';
-import { SharedWorkflow } from '@db/entities/SharedWorkflow';
 import { WorkflowEntity } from '@db/entities/WorkflowEntity';
-import type { Role } from '@db/entities/Role';
-import type { User } from '@db/entities/User';
 import { disableAutoGeneratedIds } from '@db/utils/commandHelpers';
-import type { ICredentialsDb, IWorkflowToImport } from '@/Interfaces';
-import { replaceInvalidCredentials } from '@/WorkflowHelpers';
+import type { IWorkflowToImport } from '@/Interfaces';
 import { BaseCommand } from '../BaseCommand';
 import { generateNanoId } from '@db/utils/generators';
 import { RoleService } from '@/services/role.service';
-import { TagService } from '@/services/tag.service';
 import { UM_FIX_INSTRUCTION } from '@/constants';
+import { UserRepository } from '@db/repositories/user.repository';
+import { ImportService } from '@/services/import.service';
+import { WorkflowRepository } from '@/databases/repositories/workflow.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.',
 		);
 	}
@@ -33,7 +27,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.');
 		}
 	}
 }
@@ -62,16 +56,9 @@ export class ImportWorkflowsCommand extends BaseCommand {
 		}),
 	};
 
-	private ownerWorkflowRole: Role;
-
-	private transactionManager: EntityManager;
-
-	private tagService: TagService;
-
 	async init() {
 		disableAutoGeneratedIds(WorkflowEntity);
 		await super.init();
-		this.tagService = Container.get(TagService);
 	}
 
 	async run(): Promise<void> {
@@ -92,12 +79,8 @@ 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 this.tagService.getAll();
-
 		let totalImported = 0;
 
 		if (flags.separate) {
@@ -114,41 +97,17 @@ export class ImportWorkflowsCommand extends BaseCommand {
 
 			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 (!workflow.id) {
-						workflow.id = generateNanoId();
-					}
-
-					if (credentials.length > 0) {
-						workflow.nodes.forEach((node: INode) => {
-							this.transformCredentials(node, credentials);
-
-							if (!node.id) {
-								node.id = uuid();
-							}
-						});
-					}
-
-					if (Object.prototype.hasOwnProperty.call(workflow, 'tags')) {
-						await this.tagService.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);
+			for (const file of files) {
+				const workflow = jsonParse<IWorkflowToImport>(fs.readFileSync(file, { encoding: 'utf8' }));
+				if (!workflow.id) {
+					workflow.id = generateNanoId();
 				}
-			});
+
+				const _workflow = Container.get(WorkflowRepository).create(workflow);
+
+				await Container.get(ImportService).importWorkflows([_workflow], user.id);
+			}
 
 			this.reportSuccess(totalImported);
 			process.exit();
@@ -158,46 +117,13 @@ export class ImportWorkflowsCommand extends BaseCommand {
 			fs.readFileSync(flags.input, { encoding: 'utf8' }),
 		);
 
+		const _workflows = workflows.map((w) => Container.get(WorkflowRepository).create(w));
+
 		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) {
-							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 this.tagService.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);
-			}
-		});
+		await Container.get(ImportService).importWorkflows(_workflows, user.id);
 
 		this.reportSuccess(totalImported);
 	}
@@ -211,74 +137,27 @@ export class ImportWorkflowsCommand extends BaseCommand {
 		this.logger.info(`Successfully imported ${total} ${total === 1 ? 'workflow.' : 'workflows.'}`);
 	}
 
-	private async initOwnerWorkflowRole() {
-		const ownerWorkflowRole = await Container.get(RoleService).findWorkflowOwnerRole();
-
-		if (!ownerWorkflowRole) {
-			throw new Error(`Failed to find owner workflow role. ${UM_FIX_INSTRUCTION}`);
-		}
-
-		this.ownerWorkflowRole = ownerWorkflowRole;
-	}
-
-	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'],
-		);
-	}
-
 	private async getOwner() {
 		const ownerGlobalRole = await Container.get(RoleService).findGlobalOwnerRole();
 
 		const owner =
 			ownerGlobalRole &&
-			(await Db.collections.User.findOneBy({ globalRoleId: ownerGlobalRole?.id }));
+			(await Container.get(UserRepository).findOneBy({ globalRoleId: ownerGlobalRole?.id }));
 
 		if (!owner) {
-			throw new Error(`Failed to find owner. ${UM_FIX_INSTRUCTION}`);
+			throw new ApplicationError(`Failed to find owner. ${UM_FIX_INSTRUCTION}`);
 		}
 
 		return owner;
 	}
 
 	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 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;
-					}
-
-					node.credentials[type] = nodeCredentials;
-				}
-			}
-		}
-	}
 }
diff --git a/packages/cli/src/commands/ldap/reset.ts b/packages/cli/src/commands/ldap/reset.ts
index db276c40c1..2693465239 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 d7e3bf51d3..e25fb94dc4 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 { SETTINGS_LICENSE_CERT_KEY } from '@/constants';
 import { BaseCommand } from '../BaseCommand';
+import { SettingsRepository } from '@db/repositories/settings.repository';
+import Container from 'typedi';
 
 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/list/workflow.ts b/packages/cli/src/commands/list/workflow.ts
index da9d37f81c..abab56f2d5 100644
--- a/packages/cli/src/commands/list/workflow.ts
+++ b/packages/cli/src/commands/list/workflow.ts
@@ -1,8 +1,7 @@
 import { flags } from '@oclif/command';
-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';
 
 export class ListWorkflowCommand extends BaseCommand {
 	static description = '\nList workflows';
@@ -31,12 +30,13 @@ export class ListWorkflowCommand extends BaseCommand {
 			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
index 6c5eb2fb9c..a9a51db5ba 100644
--- a/packages/cli/src/commands/mfa/disable.ts
+++ b/packages/cli/src/commands/mfa/disable.ts
@@ -1,6 +1,7 @@
 import { flags } from '@oclif/command';
-import * as Db from '@/Db';
 import { BaseCommand } from '../BaseCommand';
+import Container from 'typedi';
+import { UserRepository } from '@db/repositories/user.repository';
 
 export class DisableMFACommand extends BaseCommand {
 	static description = 'Disable MFA authentication for a user';
@@ -27,7 +28,7 @@ export class DisableMFACommand extends BaseCommand {
 			return;
 		}
 
-		const updateOperationResult = await Db.collections.User.update(
+		const updateOperationResult = await Container.get(UserRepository).update(
 			{ email: flags.email },
 			{ mfaSecret: null, mfaRecoveryCodes: [], mfaEnabled: false },
 		);
diff --git a/packages/cli/src/commands/start.ts b/packages/cli/src/commands/start.ts
index b2e4431c2e..b9c43a9a69 100644
--- a/packages/cli/src/commands/start.ts
+++ b/packages/cli/src/commands/start.ts
@@ -1,11 +1,9 @@
-/* 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 path from 'path';
 import { mkdir } from 'fs/promises';
 import { createReadStream, createWriteStream, existsSync } from 'fs';
-import localtunnel from 'localtunnel';
 import { flags } from '@oclif/command';
 import stream from 'stream';
 import replaceStream from 'replacestream';
@@ -13,24 +11,26 @@ import { promisify } from 'util';
 import glob from 'fast-glob';
 
 import { 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 { Server } from '@/Server';
-import { TestWebhooks } from '@/TestWebhooks';
-import { EDITOR_UI_DIST_DIR, GENERATED_STATIC_DIR } from '@/constants';
+import { EDITOR_UI_DIST_DIR, LICENSE_FEATURES } from '@/constants';
 import { eventBus } from '@/eventbus';
 import { BaseCommand } from './BaseCommand';
 import { InternalHooks } from '@/InternalHooks';
 import { License } from '@/License';
-import { ExecutionRepository } from '@/databases/repositories/execution.repository';
-import { IConfig } from '@oclif/config';
-import { OrchestrationMainService } from '@/services/orchestration/main/orchestration.main.service';
+import type { IConfig } from '@oclif/config';
+import { SingleMainSetup } from '@/services/orchestration/main/SingleMainSetup';
 import { OrchestrationHandlerMainService } from '@/services/orchestration/main/orchestration.handler.main.service';
+import { PruningService } from '@/services/pruning.service';
+import { MultiMainSetup } from '@/services/orchestration/main/MultiMainSetup.ee';
+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';
 
 // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-var-requires
 const open = require('open');
@@ -64,7 +64,9 @@ export class Start extends BaseCommand {
 
 	protected activeWorkflowRunner: ActiveWorkflowRunner;
 
-	protected server = new Server();
+	protected server = Container.get(Server);
+
+	private pruningService: PruningService;
 
 	constructor(argv: string[], cmdConfig: IConfig) {
 		super(argv, cmdConfig);
@@ -76,7 +78,7 @@ export class Start extends BaseCommand {
 	 * 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) => {
@@ -98,37 +100,17 @@ export class Start extends BaseCommand {
 			// Stop with trying to activate workflows that could not be activated
 			this.activeWorkflowRunner.removeAllQueuedWorkflowActivations();
 
-			await this.externalHooks.run('n8n.stop', []);
+			Container.get(WaitTracker).shutdown();
 
-			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', []);
 
-			// 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
-			await Container.get(License).shutdown();
+			if (Container.get(MultiMainSetup).isEnabled) {
+				await this.activeWorkflowRunner.removeAllTriggerAndPollerBasedWorkflows();
 
-			Container.get(ExecutionRepository).clearTimers();
-
-			await Container.get(InternalHooks).onN8nStop();
-
-			const skipWebhookDeregistration = config.getEnv(
-				'endpoints.skipWebhooksDeregistrationOnShutdown',
-			);
-
-			const removePromises = [];
-			if (!skipWebhookDeregistration) {
-				removePromises.push(this.activeWorkflowRunner.removeAll());
+				await Container.get(MultiMainSetup).shutdown();
 			}
 
-			// Remove all test webhooks
-			const testWebhooks = Container.get(TestWebhooks);
-			removePromises.push(testWebhooks.removeAll());
-
-			await Promise.all(removePromises);
+			await Container.get(InternalHooks).onN8nStop();
 
 			// Wait for active workflow executions to finish
 			const activeExecutionsInstance = Container.get(ActiveExecutions);
@@ -171,10 +153,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'),
@@ -213,7 +196,7 @@ export class Start extends BaseCommand {
 		this.activeWorkflowRunner = Container.get(ActiveWorkflowRunner);
 
 		await this.initLicense();
-		this.logger.debug('License init complete');
+
 		await this.initOrchestration();
 		this.logger.debug('Orchestration init complete');
 		await this.initBinaryDataService();
@@ -231,32 +214,55 @@ export class Start extends BaseCommand {
 	}
 
 	async initOrchestration() {
-		if (config.get('executions.mode') === 'queue') {
-			await Container.get(OrchestrationMainService).init();
+		if (config.getEnv('executions.mode') !== 'queue') return;
+
+		// queue mode in single-main scenario
+
+		if (!config.getEnv('multiMainSetup.enabled')) {
+			await Container.get(SingleMainSetup).init();
 			await Container.get(OrchestrationHandlerMainService).init();
+			return;
 		}
+
+		// queue mode in multi-main scenario
+
+		if (!Container.get(License).isMultipleMainInstancesLicensed()) {
+			throw new FeatureNotLicensedError(LICENSE_FEATURES.MULTIPLE_MAIN_INSTANCES);
+		}
+
+		await Container.get(OrchestrationHandlerMainService).init();
+
+		const multiMainSetup = Container.get(MultiMainSetup);
+
+		await multiMainSetup.init();
+
+		multiMainSetup.on('leadershipChange', async () => {
+			if (multiMainSetup.isLeader) {
+				this.logger.debug('[Leadership change] Clearing all activation errors...');
+
+				await this.activeWorkflowRunner.clearAllActivationErrors();
+
+				this.logger.debug('[Leadership change] Adding all trigger- and poller-based workflows...');
+
+				await this.activeWorkflowRunner.addAllTriggerAndPollerBasedWorkflows();
+			} else {
+				this.logger.debug(
+					'[Leadership change] Removing all trigger- and poller-based workflows...',
+				);
+
+				await this.activeWorkflowRunner.removeAllTriggerAndPollerBasedWorkflows();
+			}
+		});
 	}
 
 	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 } = this.instanceSettings;
-
-			// 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'));
-		}
-
 		// 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 }));
 		});
@@ -264,7 +270,6 @@ export class Start extends BaseCommand {
 		const areCommunityPackagesEnabled = config.getEnv('nodes.communityPackages.enabled');
 
 		if (areCommunityPackagesEnabled) {
-			// eslint-disable-next-line @typescript-eslint/naming-convention
 			const { CommunityPackagesService } = await import('@/services/communityPackages.service');
 			await Container.get(CommunityPackagesService).setMissingPackages({
 				reinstallMissingPackages: flags.reinstallMissingPackages,
@@ -275,7 +280,7 @@ export class Start extends BaseCommand {
 		if (dbType === 'sqlite') {
 			const shouldRunVacuum = config.getEnv('database.sqlite.executeVacuumOnStartup');
 			if (shouldRunVacuum) {
-				await Db.collections.Execution.query('VACUUM;');
+				await Container.get(ExecutionRepository).query('VACUUM;');
 			}
 		}
 
@@ -297,15 +302,13 @@ export class Start extends BaseCommand {
 				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`);
@@ -316,10 +319,12 @@ export class Start extends BaseCommand {
 
 		await this.server.start();
 
+		await this.initPruning();
+
 		// Start to get active workflows and run their triggers
 		await this.activeWorkflowRunner.init();
 
-		const editorUrl = GenericHelpers.getBaseUrl();
+		const editorUrl = Container.get(UrlService).baseUrl;
 		this.log(`\nEditor is now accessible via:\n${editorUrl}`);
 
 		// Allow to open n8n editor by pressing "o"
@@ -353,6 +358,32 @@ export class Start extends BaseCommand {
 		}
 	}
 
+	async initPruning() {
+		this.pruningService = Container.get(PruningService);
+
+		if (this.pruningService.isPruningEnabled()) {
+			this.pruningService.startPruning();
+		}
+
+		if (config.getEnv('executions.mode') === 'queue' && config.getEnv('multiMainSetup.enabled')) {
+			const multiMainSetup = Container.get(MultiMainSetup);
+
+			await multiMainSetup.init();
+
+			multiMainSetup.on('leadershipChange', async () => {
+				if (multiMainSetup.isLeader) {
+					if (this.pruningService.isPruningEnabled()) {
+						this.pruningService.startPruning();
+					}
+				} else {
+					if (this.pruningService.isPruningEnabled()) {
+						this.pruningService.stopPruning();
+					}
+				}
+			});
+		}
+	}
+
 	async catch(error: Error) {
 		console.log(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 b293e266e3..08f9403368 100644
--- a/packages/cli/src/commands/update/workflow.ts
+++ b/packages/cli/src/commands/update/workflow.ts
@@ -1,9 +1,7 @@
 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 { BaseCommand } from '../BaseCommand';
+import { WorkflowRepository } from '@db/repositories/workflow.repository';
+import Container from 'typedi';
 
 export class UpdateWorkflowCommand extends BaseCommand {
 	static description = 'Update workflows';
@@ -42,7 +40,6 @@ export class UpdateWorkflowCommand extends BaseCommand {
 			return;
 		}
 
-		const updateQuery: QueryDeepPartialEntity<WorkflowEntity> = {};
 		if (flags.active === undefined) {
 			console.info('No update flag like "--active=true" has been set!');
 			return;
@@ -53,18 +50,16 @@ export class UpdateWorkflowCommand extends BaseCommand {
 			return;
 		}
 
-		updateQuery.active = flags.active === 'true';
+		const newState = flags.active === 'true';
 
-		const findQuery: FindOptionsWhere<WorkflowEntity> = {};
 		if (flags.id) {
 			this.logger.info(`Deactivating workflow with ID: ${flags.id}`);
-			findQuery.id = flags.id;
+			await Container.get(WorkflowRepository).updateActiveState(flags.id, newState);
 		} else {
 			this.logger.info('Deactivating all workflows');
-			findQuery.active = true;
+			await Container.get(WorkflowRepository).deactivateAll();
 		}
 
-		await Db.collections.Workflow.update(findQuery, updateQuery);
 		this.logger.info('Done');
 	}
 
diff --git a/packages/cli/src/commands/user-management/reset.ts b/packages/cli/src/commands/user-management/reset.ts
index 64b1be3cf3..caa46ecc90 100644
--- a/packages/cli/src/commands/user-management/reset.ts
+++ b/packages/cli/src/commands/user-management/reset.ts
@@ -1,10 +1,13 @@
 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 { BaseCommand } from '../BaseCommand';
+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 { RoleService } from '@/services/role.service';
+import { BaseCommand } from '../BaseCommand';
 
 const defaultUserProps = {
 	firstName: null,
@@ -21,37 +24,33 @@ export class Reset extends BaseCommand {
 	async run(): Promise<void> {
 		const owner = await this.getInstanceOwner();
 
-		const ownerWorkflowRole = await Container.get(RoleService).findWorkflowOwnerRole();
-		const ownerCredentialRole = await Container.get(RoleService).findCredentialOwnerRole();
+		const workflowOwnerRole = await Container.get(RoleService).findWorkflowOwnerRole();
+		const credentialOwnerRole = await Container.get(RoleService).findCredentialOwnerRole();
 
-		await Db.collections.SharedWorkflow.update(
-			{ userId: Not(owner.id), roleId: ownerWorkflowRole.id },
-			{ user: owner },
+		await Container.get(SharedWorkflowRepository).makeOwnerOfAllWorkflows(owner, workflowOwnerRole);
+		await Container.get(SharedCredentialsRepository).makeOwnerOfAllCredentials(
+			owner,
+			credentialOwnerRole,
 		);
 
-		await Db.collections.SharedCredentials.update(
-			{ userId: Not(owner.id), roleId: ownerCredentialRole.id },
-			{ user: owner },
-		);
+		await Container.get(UserRepository).deleteAllExcept(owner);
+		await Container.get(UserRepository).save(Object.assign(owner, defaultUserProps));
 
-		await Db.collections.User.delete({ id: Not(owner.id) });
-		await Db.collections.User.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: credentialOwnerRole,
 			}),
 		);
-		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' },
 		);
@@ -62,7 +61,7 @@ export class Reset extends BaseCommand {
 	async getInstanceOwner(): Promise<User> {
 		const globalRole = await Container.get(RoleService).findGlobalOwnerRole();
 
-		const owner = await Db.collections.User.findOneBy({ globalRoleId: globalRole.id });
+		const owner = await Container.get(UserRepository).findOneBy({ globalRoleId: globalRole.id });
 
 		if (owner) return owner;
 
@@ -70,9 +69,9 @@ export class Reset extends BaseCommand {
 
 		Object.assign(user, { ...defaultUserProps, globalRole });
 
-		await Db.collections.User.save(user);
+		await Container.get(UserRepository).save(user);
 
-		return Db.collections.User.findOneByOrFail({ globalRoleId: globalRole.id });
+		return Container.get(UserRepository).findOneByOrFail({ globalRoleId: globalRole.id });
 	}
 
 	async catch(error: Error): Promise<void> {
diff --git a/packages/cli/src/commands/webhook.ts b/packages/cli/src/commands/webhook.ts
index e6462aa59e..1ff1dd8bb8 100644
--- a/packages/cli/src/commands/webhook.ts
+++ b/packages/cli/src/commands/webhook.ts
@@ -6,7 +6,7 @@ import { WebhookServer } from '@/WebhookServer';
 import { Queue } from '@/Queue';
 import { BaseCommand } from './BaseCommand';
 import { Container } from 'typedi';
-import { IConfig } from '@oclif/config';
+import type { IConfig } from '@oclif/config';
 import { OrchestrationWebhookService } from '@/services/orchestration/webhook/orchestration.webhook.service';
 import { OrchestrationHandlerWebhookService } from '@/services/orchestration/webhook/orchestration.handler.webhook.service';
 
@@ -19,7 +19,7 @@ export class Webhook extends BaseCommand {
 		help: flags.help({ char: 'h' }),
 	};
 
-	protected server = new WebhookServer();
+	protected server = Container.get(WebhookServer);
 
 	constructor(argv: string[], cmdConfig: IConfig) {
 		super(argv, cmdConfig);
@@ -39,13 +39,7 @@ export class Webhook extends BaseCommand {
 		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);
+			await this.externalHooks?.run('n8n.stop', []);
 
 			// Wait for active workflow executions to finish
 			const activeExecutionsInstance = Container.get(ActiveExecutions);
diff --git a/packages/cli/src/commands/worker.ts b/packages/cli/src/commands/worker.ts
index 928aecd15c..4848ff7d10 100644
--- a/packages/cli/src/commands/worker.ts
+++ b/packages/cli/src/commands/worker.ts
@@ -13,7 +13,7 @@ import type {
 	INodeTypes,
 	IRun,
 } from 'n8n-workflow';
-import { Workflow, NodeOperationError, sleep } from 'n8n-workflow';
+import { Workflow, NodeOperationError, sleep, ApplicationError } from 'n8n-workflow';
 
 import * as Db from '@/Db';
 import * as ResponseHelper from '@/ResponseHelper';
@@ -27,7 +27,8 @@ import { Queue } from '@/Queue';
 import { generateFailedExecutionFromError } from '@/WorkflowHelpers';
 import { N8N_VERSION } from '@/constants';
 import { BaseCommand } from './BaseCommand';
-import { ExecutionRepository } from '@db/repositories';
+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';
@@ -35,10 +36,11 @@ import { rawBodyReader, bodyParser } from '@/middlewares';
 import { eventBus } from '@/eventbus';
 import type { RedisServicePubSubSubscriber } from '@/services/redis/RedisServicePubSubSubscriber';
 import { EventMessageGeneric } from '@/eventbus/EventMessageClasses/EventMessageGeneric';
-import { IConfig } from '@oclif/config';
+import type { IConfig } from '@oclif/config';
 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';
 
 export class Worker extends BaseCommand {
 	static description = '\nStarts a n8n worker';
@@ -77,23 +79,15 @@ export class Worker extends BaseCommand {
 		await Worker.jobQueue.pause(true);
 
 		try {
-			await this.externalHooks.run('n8n.stop', []);
+			await this.externalHooks?.run('n8n.stop', []);
 
-			const maxStopTime = config.getEnv('queue.bull.gracefulShutdownTimeout') * 1000;
-
-			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);
+					const waitLeft = Math.ceil((hardStopTime - Date.now()) / 1000);
 					this.logger.info(
 						`Waiting for ${
 							Object.keys(Worker.runningJobs).length
@@ -112,33 +106,34 @@ export class Worker extends BaseCommand {
 
 	async runJob(job: Job, nodeTypes: INodeTypes): Promise<JobResponse> {
 		const { executionId, loadStaticData } = job.data;
-		const fullExecutionData = await Container.get(ExecutionRepository).findSingleExecution(
-			executionId,
-			{
-				includeData: true,
-				unflattenData: true,
-			},
-		);
+		const executionRepository = Container.get(ExecutionRepository);
+		const fullExecutionData = await executionRepository.findSingleExecution(executionId, {
+			includeData: true,
+			unflattenData: true,
+		});
 
 		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 workflowId = fullExecutionData.workflowData.id!;
+		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 Container.get(OwnershipService).getWorkflowOwnerCached(workflowId);
 
 		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,
@@ -149,7 +144,7 @@ export class Worker extends BaseCommand {
 					'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;
 		}
@@ -269,6 +264,13 @@ export class Worker extends BaseCommand {
 	}
 
 	async init() {
+		const configuredShutdownTimeout = config.getEnv('queue.bull.gracefulShutdownTimeout');
+		if (configuredShutdownTimeout) {
+			this.gracefulShutdownTimeoutInS = configuredShutdownTimeout;
+			this.logger.warn(
+				'QUEUE_WORKER_TIMEOUT has been deprecated. Rename it to N8N_GRACEFUL_SHUTDOWN_TIMEOUT.',
+			);
+		}
 		await this.initCrashJournal();
 
 		this.logger.debug('Starting n8n worker...');
@@ -290,7 +292,6 @@ export class Worker extends BaseCommand {
 		this.logger.debug('Queue init complete');
 		await this.initOrchestration();
 		this.logger.debug('Orchestration init complete');
-		await this.initQueue();
 
 		await Container.get(OrchestrationWorkerService).publishToEventLog(
 			new EventMessageGeneric({
@@ -407,13 +408,13 @@ export class Worker extends BaseCommand {
 				try {
 					if (!connection.isInitialized) {
 						// Connection is not active
-						throw new Error('No active database connection!');
+						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 ResponseHelper.ServiceUnavailableError('No Database connection!');
+					const error = new ServiceUnavailableError('No Database connection!');
 					return ResponseHelper.sendErrorResponse(res, error);
 				}
 
@@ -424,7 +425,7 @@ export class Worker extends BaseCommand {
 					await Worker.jobQueue.ping();
 				} catch (e) {
 					this.logger.error('No Redis connection!', e as Error);
-					const error = new ResponseHelper.ServiceUnavailableError('No Redis connection!');
+					const error = new ServiceUnavailableError('No Redis connection!');
 					return ResponseHelper.sendErrorResponse(res, error);
 				}
 
@@ -481,7 +482,7 @@ export class Worker extends BaseCommand {
 		});
 
 		await new Promise<void>((resolve) => server.listen(port, () => resolve()));
-		await this.externalHooks.run('worker.ready');
+		await this.externalHooks?.run('worker.ready');
 		this.logger.info(`\nn8n worker health check via, port ${port}`);
 	}
 
diff --git a/packages/cli/src/config/index.ts b/packages/cli/src/config/index.ts
index 5990955376..44d341afcc 100644
--- a/packages/cli/src/config/index.ts
+++ b/packages/cli/src/config/index.ts
@@ -1,25 +1,17 @@
 import convict from 'convict';
 import dotenv from 'dotenv';
-import { tmpdir } from 'os';
-import { mkdirSync, 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) {
-	const testsDir = join(tmpdir(), 'n8n-e2e/');
-	mkdirSync(testsDir, { recursive: true });
 	// Skip loading config from env variables in end-to-end tests
-	process.env = {
-		E2E_TESTS: 'true',
-		N8N_USER_FOLDER: mkdtempSync(testsDir),
-		EXECUTIONS_PROCESS: 'main',
-		N8N_DIAGNOSTICS_ENABLED: 'false',
-		N8N_PUBLIC_API_DISABLED: 'true',
-		EXTERNAL_FRONTEND_HOOKS_URLS: '',
-		N8N_PERSONALIZATION_ENABLED: 'false',
-		N8N_AI_ENABLED: 'true',
-	};
+	process.env.EXECUTIONS_PROCESS = 'main';
+	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_ENCRYPTION_KEY = 'test-encryption-key';
@@ -29,6 +21,8 @@ if (inE2ETests) {
 	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
@@ -59,7 +53,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;
 				}
@@ -73,6 +67,9 @@ config.validate({
 	allowed: 'strict',
 });
 
+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 59df756b6d..3a2c3a8ee4 100644
--- a/packages/cli/src/config/schema.ts
+++ b/packages/cli/src/config/schema.ts
@@ -91,11 +91,17 @@ 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',
+					format: Boolean,
 					default: false,
 					env: 'DB_POSTGRESDB_SSL_ENABLED',
 				},
@@ -119,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',
 				},
@@ -215,7 +221,7 @@ export const schema = {
 		},
 		onboardingFlowDisabled: {
 			doc: 'Show onboarding flow in new workflow',
-			format: 'Boolean',
+			format: Boolean,
 			default: false,
 			env: 'N8N_ONBOARDING_FLOW_DISABLED',
 		},
@@ -288,7 +294,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',
 		},
@@ -300,7 +306,7 @@ export const schema = {
 		// in the editor.
 		saveDataManualExecutions: {
 			doc: 'Save data of executions when started manually via editor',
-			format: 'Boolean',
+			format: Boolean,
 			default: true,
 			env: 'EXECUTIONS_DATA_SAVE_MANUAL_EXECUTIONS',
 		},
@@ -312,7 +318,7 @@ export const schema = {
 		// a future version.
 		pruneData: {
 			doc: 'Delete data of past executions on a rolling basis',
-			format: 'Boolean',
+			format: Boolean,
 			default: true,
 			env: 'EXECUTIONS_DATA_PRUNE',
 		},
@@ -358,7 +364,7 @@ export const schema = {
 		health: {
 			active: {
 				doc: 'If health checks should be enabled',
-				format: 'Boolean',
+				format: Boolean,
 				default: false,
 				env: 'QUEUE_HEALTH_CHECK_ACTIVE',
 			},
@@ -420,7 +426,7 @@ export const schema = {
 					env: 'QUEUE_BULL_REDIS_CLUSTER_NODES',
 				},
 				tls: {
-					format: 'Boolean',
+					format: Boolean,
 					default: false,
 					env: 'QUEUE_BULL_REDIS_TLS',
 					doc: 'Enable TLS on Redis connections. Default: false',
@@ -433,11 +439,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',
+				},
+			},
 		},
 	},
 
@@ -465,6 +497,13 @@ export const schema = {
 			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)
@@ -558,7 +597,7 @@ export const schema = {
 		},
 		metrics: {
 			enable: {
-				format: 'Boolean',
+				format: Boolean,
 				default: false,
 				env: 'N8N_METRICS',
 				doc: 'Enable /metrics endpoint. Default: false',
@@ -636,6 +675,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',
@@ -666,24 +723,6 @@ 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',
-		},
 	},
 
 	publicApi: {
@@ -723,6 +762,12 @@ export const schema = {
 			default: '',
 			env: 'N8N_USER_MANAGEMENT_JWT_SECRET',
 		},
+		jwtDuration: {
+			doc: 'Set a specific JWT secret (optional - n8n can generate one)', // Generated @ start.ts
+			format: Number,
+			default: 168,
+			env: 'N8N_USER_MANAGEMENT_JWT_DURATION',
+		},
 		isInstanceOwnerSetUp: {
 			// n8n loads this setting from DB on startup
 			doc: "Whether the instance owner's account has been set up",
@@ -993,6 +1038,21 @@ export const schema = {
 		},
 	},
 
+	externalSecrets: {
+		updateInterval: {
+			format: Number,
+			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.',
+		},
+	},
+
 	deployment: {
 		type: {
 			format: String,
@@ -1225,12 +1285,6 @@ export const schema = {
 	},
 
 	cache: {
-		enabled: {
-			doc: 'Whether caching is enabled',
-			format: Boolean,
-			default: true,
-			env: 'N8N_CACHE_ENABLED',
-		},
 		backend: {
 			doc: 'Backend to use for caching',
 			format: ['memory', 'redis', 'auto'] as const,
@@ -1315,4 +1369,37 @@ export const schema = {
 			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.ts b/packages/cli/src/config/types.ts
index b5646ff5ae..e6c91b5009 100644
--- a/packages/cli/src/config/types.ts
+++ b/packages/cli/src/config/types.ts
@@ -32,12 +32,12 @@ type GetPathSegments<Traversable, Filter> = Traversable extends Filter
 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>}`
+	  ? F extends string
+			? R extends string[]
+				? `${F}.${JoinByDotting<R>}`
+				: never
 			: never
-		: never
-	: string;
+	  : string;
 
 type ToDottedPath<T> = JoinByDotting<RemoveExcess<T>>;
 
@@ -65,14 +65,14 @@ type ConfigOptionPath =
 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;
+	  ? boolean
+	  : T extends StringLiteralArrayPath
+	    ? StringLiteralMap[T]
+	    : T extends keyof ExceptionPaths
+	      ? ExceptionPaths[T]
+	      : T extends StringPath
+	        ? string
+	        : unknown;
 
 type ExceptionPaths = {
 	'queue.bull.redis': object;
diff --git a/packages/cli/src/config/utils.ts b/packages/cli/src/config/utils.ts
index 4fee1a4110..918bd9b97e 100644
--- a/packages/cli/src/config/utils.ts
+++ b/packages/cli/src/config/utils.ts
@@ -1,13 +1,9 @@
+import { NotStringArrayError } from '@/errors/not-string-array.error';
 import type { SchemaObj } from 'convict';
-
-class NotStringArrayError extends Error {
-	constructor(env: string) {
-		super(`${env} is not a string array.`);
-	}
-}
+import { ApplicationError } from 'n8n-workflow';
 
 export const ensureStringArray = (values: string[], { env }: SchemaObj<string>) => {
-	if (!env) throw new Error(`Missing env: ${env}`);
+	if (!env) throw new ApplicationError('Missing env', { extra: { env } });
 
 	if (!Array.isArray(values)) throw new NotStringArrayError(env);
 
diff --git a/packages/cli/src/constants.ts b/packages/cli/src/constants.ts
index c9209f4c84..8603d29963 100644
--- a/packages/cli/src/constants.ts
+++ b/packages/cli/src/constants.ts
@@ -1,8 +1,6 @@
 import { readFileSync } from 'fs';
 import { resolve, join, dirname } from 'path';
-import { Container } from 'typedi';
 import type { n8n } from 'n8n-core';
-import { InstanceSettings } from 'n8n-core';
 import { jsonParse } from 'n8n-workflow';
 
 const { NODE_ENV, E2E_TESTS } = process.env;
@@ -17,17 +15,17 @@ export const CUSTOM_API_CALL_KEY = '__CUSTOM_API_CALL__';
 export const CLI_DIR = resolve(__dirname, '..');
 export const TEMPLATES_DIR = join(CLI_DIR, 'templates');
 export const NODES_BASE_DIR = dirname(require.resolve('n8n-nodes-base'));
-export const GENERATED_STATIC_DIR = join(
-	Container.get(InstanceSettings).userHome,
-	'.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 STARTING_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;
 
@@ -85,6 +83,9 @@ export const LICENSE_FEATURES = {
 	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 = {
@@ -108,4 +109,12 @@ export const TIME = {
 	MINUTE: 60 * 1000,
 	HOUR: 60 * 60 * 1000,
 	DAY: 24 * 60 * 60 * 1000,
-};
+} as const;
+
+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;
diff --git a/packages/cli/src/controllers/activeWorkflows.controller.ts b/packages/cli/src/controllers/activeWorkflows.controller.ts
new file mode 100644
index 0000000000..6e37b40b86
--- /dev/null
+++ b/packages/cli/src/controllers/activeWorkflows.controller.ts
@@ -0,0 +1,23 @@
+import { Authorized, Get, RestController } from '@/decorators';
+import { ActiveWorkflowRequest } from '@/requests';
+import { ActiveWorkflowsService } from '@/services/activeWorkflows.service';
+
+@Authorized()
+@RestController('/active-workflows')
+export class ActiveWorkflowsController {
+	constructor(private readonly activeWorkflowsService: ActiveWorkflowsService) {}
+
+	@Get('/')
+	async getActiveWorkflows(req: ActiveWorkflowRequest.GetAllActive) {
+		return this.activeWorkflowsService.getAllActiveIdsFor(req.user);
+	}
+
+	@Get('/error/:id')
+	async getActivationError(req: ActiveWorkflowRequest.GetActivationError) {
+		const {
+			user,
+			params: { id: workflowId },
+		} = req;
+		return this.activeWorkflowsService.getActivationError(workflowId, user);
+	}
+}
diff --git a/packages/cli/src/controllers/auth.controller.ts b/packages/cli/src/controllers/auth.controller.ts
index bb0581ef73..35bdacd16f 100644
--- a/packages/cli/src/controllers/auth.controller.ts
+++ b/packages/cli/src/controllers/auth.controller.ts
@@ -1,13 +1,5 @@
 import validator from 'validator';
-import { In } from 'typeorm';
-import { Service } from 'typedi';
 import { Authorized, Get, Post, RestController } from '@/decorators';
-import {
-	AuthError,
-	BadRequestError,
-	InternalServerError,
-	UnauthorizedError,
-} from '@/ResponseHelper';
 import { issueCookie, resolveJwt } from '@/auth/jwt';
 import { AUTH_COOKIE_NAME, RESPONSE_ERROR_MESSAGES } from '@/constants';
 import { Request, Response } from 'express';
@@ -27,8 +19,13 @@ 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 { 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 { ApplicationError } from 'n8n-workflow';
+import { UserRepository } from '@/databases/repositories/user.repository';
 
-@Service()
 @RestController()
 export class AuthController {
 	constructor(
@@ -37,6 +34,7 @@ export class AuthController {
 		private readonly mfaService: MfaService,
 		private readonly userService: UserService,
 		private readonly license: License,
+		private readonly userRepository: UserRepository,
 		private readonly postHog?: PostHogClient,
 	) {}
 
@@ -46,8 +44,8 @@ export class AuthController {
 	@Post('/login')
 	async login(req: LoginRequest, res: Response): Promise<PublicUser | undefined> {
 		const { email, password, mfaToken, mfaRecoveryCode } = req.body;
-		if (!email) throw new Error('Email is required to log in');
-		if (!password) throw new Error('Password is required to log in');
+		if (!email) throw new ApplicationError('Email is required to log in');
+		if (!password) throw new ApplicationError('Password is required to log in');
 
 		let user: User | undefined;
 
@@ -66,7 +64,13 @@ export class AuthController {
 				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?.globalRole?.name === 'owner') {
+				user = preliminaryUser;
+				usedAuthenticationMethod = 'email';
+			} else {
+				user = await handleLdapLogin(email, password);
+			}
 		} else {
 			user = await handleEmailLogin(email, password);
 		}
@@ -98,7 +102,7 @@ export class AuthController {
 				authenticationMethod: usedAuthenticationMethod,
 			});
 
-			return this.userService.toPublic(user, { posthog: this.postHog });
+			return this.userService.toPublic(user, { posthog: this.postHog, withScopes: true });
 		}
 		void this.internalHooks.onUserLoginFailed({
 			user: email,
@@ -123,7 +127,7 @@ export class AuthController {
 			try {
 				user = await resolveJwt(cookieContents);
 
-				return await this.userService.toPublic(user, { posthog: this.postHog });
+				return await this.userService.toPublic(user, { posthog: this.postHog, withScopes: true });
 			} catch (error) {
 				res.clearCookie(AUTH_COOKIE_NAME);
 			}
@@ -134,7 +138,7 @@ export class AuthController {
 		}
 
 		try {
-			user = await this.userService.findOneOrFail({ where: {} });
+			user = await this.userRepository.findOneOrFail({ where: {}, relations: ['globalRole'] });
 		} catch (error) {
 			throw new InternalServerError(
 				'No users found in database - did you wipe the users table? Create at least one user.',
@@ -146,7 +150,7 @@ export class AuthController {
 		}
 
 		await issueCookie(res, user);
-		return this.userService.toPublic(user, { posthog: this.postHog });
+		return this.userService.toPublic(user, { posthog: this.postHog, withScopes: true });
 	}
 
 	/**
@@ -183,10 +187,8 @@ export class AuthController {
 			}
 		}
 
-		const users = await this.userService.findMany({
-			where: { id: In([inviterId, inviteeId]) },
-			relations: ['globalRole'],
-		});
+		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',
diff --git a/packages/cli/src/controllers/binaryData.controller.ts b/packages/cli/src/controllers/binaryData.controller.ts
index 00f6a85942..63390f46ab 100644
--- a/packages/cli/src/controllers/binaryData.controller.ts
+++ b/packages/cli/src/controllers/binaryData.controller.ts
@@ -1,11 +1,9 @@
-import { Service } from 'typedi';
 import express from 'express';
 import { BinaryDataService, FileNotFoundError, isValidNonDefaultMode } from 'n8n-core';
 import { Get, RestController } from '@/decorators';
 import { BinaryDataRequest } from '@/requests';
 
 @RestController('/binary-data')
-@Service()
 export class BinaryDataController {
 	constructor(private readonly binaryDataService: BinaryDataService) {}
 
@@ -41,8 +39,9 @@ export class BinaryDataController {
 
 			if (mimeType) res.setHeader('Content-Type', mimeType);
 
-			if (action === 'download') {
-				res.setHeader('Content-Disposition', `attachment; filename="${fileName}"`);
+			if (action === 'download' && fileName) {
+				const encodedFilename = encodeURIComponent(fileName);
+				res.setHeader('Content-Disposition', `attachment; filename="${encodedFilename}"`);
 			}
 
 			return await this.binaryDataService.getAsStream(binaryDataId);
diff --git a/packages/cli/src/controllers/communityPackages.controller.ts b/packages/cli/src/controllers/communityPackages.controller.ts
index c31ec8ff82..0e260c863b 100644
--- a/packages/cli/src/controllers/communityPackages.controller.ts
+++ b/packages/cli/src/controllers/communityPackages.controller.ts
@@ -1,4 +1,3 @@
-import { Service } from 'typedi';
 import { Request, Response, NextFunction } from 'express';
 import config from '@/config';
 import {
@@ -6,14 +5,24 @@ import {
 	STARTER_TEMPLATE_NAME,
 	UNKNOWN_FAILURE_REASON,
 } from '@/constants';
-import { Authorized, Delete, Get, Middleware, Patch, Post, RestController } from '@/decorators';
+import {
+	Authorized,
+	Delete,
+	Get,
+	Middleware,
+	Patch,
+	Post,
+	RestController,
+	RequireGlobalScope,
+} from '@/decorators';
 import { NodeRequest } from '@/requests';
-import { BadRequestError, InternalServerError } from '@/ResponseHelper';
 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,
@@ -32,14 +41,13 @@ export function isNpmError(error: unknown): error is { code: number; stdout: str
 	return typeof error === 'object' && error !== null && 'code' in error && 'stdout' in error;
 }
 
-@Service()
-@Authorized(['global', 'owner'])
+@Authorized()
 @RestController('/community-packages')
 export class CommunityPackagesController {
 	constructor(
-		private push: Push,
-		private internalHooks: InternalHooks,
-		private communityPackagesService: CommunityPackagesService,
+		private readonly push: Push,
+		private readonly internalHooks: InternalHooks,
+		private readonly communityPackagesService: CommunityPackagesService,
 	) {}
 
 	// TODO: move this into a new decorator `@IfConfig('executions.mode', 'queue')`
@@ -54,6 +62,7 @@ export class CommunityPackagesController {
 	}
 
 	@Post('/')
+	@RequireGlobalScope('communityPackage:install')
 	async installPackage(req: NodeRequest.Post) {
 		const { name } = req.body;
 
@@ -129,7 +138,7 @@ export class CommunityPackagesController {
 
 		// broadcast to connected frontends that node list has been updated
 		installedPackage.installedNodes.forEach((node) => {
-			this.push.send('reloadNodeType', {
+			this.push.broadcast('reloadNodeType', {
 				name: node.type,
 				version: node.latestVersion,
 			});
@@ -150,6 +159,7 @@ export class CommunityPackagesController {
 	}
 
 	@Get('/')
+	@RequireGlobalScope('communityPackage:list')
 	async getInstalledPackages() {
 		const installedPackages = await this.communityPackagesService.getAllInstalledPackages();
 
@@ -184,6 +194,7 @@ export class CommunityPackagesController {
 	}
 
 	@Delete('/')
+	@RequireGlobalScope('communityPackage:uninstall')
 	async uninstallPackage(req: NodeRequest.Delete) {
 		const { name } = req.query;
 
@@ -218,7 +229,7 @@ export class CommunityPackagesController {
 
 		// broadcast to connected frontends that node list has been updated
 		installedPackage.installedNodes.forEach((node) => {
-			this.push.send('removeNodeType', {
+			this.push.broadcast('removeNodeType', {
 				name: node.type,
 				version: node.latestVersion,
 			});
@@ -235,6 +246,7 @@ export class CommunityPackagesController {
 	}
 
 	@Patch('/')
+	@RequireGlobalScope('communityPackage:update')
 	async updatePackage(req: NodeRequest.Update) {
 		const { name } = req.body;
 
@@ -257,14 +269,14 @@ export class CommunityPackagesController {
 
 			// broadcast to connected frontends that node list has been updated
 			previouslyInstalledPackage.installedNodes.forEach((node) => {
-				this.push.send('removeNodeType', {
+				this.push.broadcast('removeNodeType', {
 					name: node.type,
 					version: node.latestVersion,
 				});
 			});
 
 			newInstalledPackage.installedNodes.forEach((node) => {
-				this.push.send('reloadNodeType', {
+				this.push.broadcast('reloadNodeType', {
 					name: node.name,
 					version: node.latestVersion,
 				});
@@ -283,7 +295,7 @@ export class CommunityPackagesController {
 			return newInstalledPackage;
 		} catch (error) {
 			previouslyInstalledPackage.installedNodes.forEach((node) => {
-				this.push.send('removeNodeType', {
+				this.push.broadcast('removeNodeType', {
 					name: node.type,
 					version: node.latestVersion,
 				});
diff --git a/packages/cli/src/controllers/debug.controller.ts b/packages/cli/src/controllers/debug.controller.ts
new file mode 100644
index 0000000000..10c45a0618
--- /dev/null
+++ b/packages/cli/src/controllers/debug.controller.ts
@@ -0,0 +1,37 @@
+import { Get, RestController } from '@/decorators';
+import { ActiveWorkflowRunner } from '@/ActiveWorkflowRunner';
+import { MultiMainSetup } from '@/services/orchestration/main/MultiMainSetup.ee';
+import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
+
+@RestController('/debug')
+export class DebugController {
+	constructor(
+		private readonly multiMainSetup: MultiMainSetup,
+		private readonly activeWorkflowRunner: ActiveWorkflowRunner,
+		private readonly workflowRepository: WorkflowRepository,
+	) {}
+
+	@Get('/multi-main-setup')
+	async getMultiMainSetupDetails() {
+		const leaderKey = await this.multiMainSetup.fetchLeaderKey();
+
+		const triggersAndPollers = await this.workflowRepository.findIn(
+			this.activeWorkflowRunner.allActiveInMemory(),
+		);
+
+		const webhooks = await this.workflowRepository.findWebhookBasedActiveWorkflows();
+
+		const activationErrors = await this.activeWorkflowRunner.getAllWorkflowActivationErrors();
+
+		return {
+			instanceId: this.multiMainSetup.instanceId,
+			leaderKey,
+			isLeader: this.multiMainSetup.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 0000000000..d18799341b
--- /dev/null
+++ b/packages/cli/src/controllers/dynamicNodeParameters.controller.ts
@@ -0,0 +1,118 @@
+import type { RequestHandler } from 'express';
+import { NextFunction, Response } from 'express';
+import type {
+	INodeListSearchResult,
+	INodePropertyOptions,
+	ResourceMapperFields,
+} from 'n8n-workflow';
+import { jsonParse } from 'n8n-workflow';
+
+import { Authorized, 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();
+};
+
+@Authorized()
+@RestController('/dynamic-node-parameters')
+export class DynamicNodeParametersController {
+	constructor(private readonly service: DynamicNodeParametersService) {}
+
+	@Middleware()
+	parseQueryParams(
+		req: DynamicNodeParametersRequest.BaseRequest,
+		res: 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 this.service.getOptionsViaMethodName(
+				methodName,
+				path,
+				additionalData,
+				nodeTypeAndVersion,
+				currentNodeParameters,
+				credentials,
+			);
+		}
+
+		if (loadOptions) {
+			return 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 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 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
index c81f59fc61..1129641c0f 100644
--- a/packages/cli/src/controllers/e2e.controller.ts
+++ b/packages/cli/src/controllers/e2e.controller.ts
@@ -1,18 +1,21 @@
 import { Request } from 'express';
-import { Service } from 'typedi';
 import { v4 as uuid } from 'uuid';
 import config from '@/config';
 import type { Role } from '@db/entities/Role';
-import { RoleRepository, SettingsRepository, UserRepository } from '@db/repositories';
+import { RoleRepository } from '@db/repositories/role.repository';
+import { SettingsRepository } from '@db/repositories/settings.repository';
+import { UserRepository } from '@db/repositories/user.repository';
 import { ActiveWorkflowRunner } from '@/ActiveWorkflowRunner';
-import { hashPassword } from '@/UserManagement/UserManagementHelper';
 import { eventBus } from '@/eventbus/MessageEventBus/MessageEventBus';
 import { License } from '@/License';
 import { LICENSE_FEATURES, inE2ETests } from '@/constants';
 import { NoAuthRequired, Patch, Post, RestController } from '@/decorators';
 import type { UserSetupPayload } from '@/requests';
-import type { BooleanLicenseFeature } from '@/Interfaces';
+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';
 
 if (!inE2ETests) {
 	console.error('E2E endpoints only allowed during E2E tests');
@@ -46,10 +49,20 @@ type ResetRequest = Request<
 	{
 		owner: UserSetupPayload;
 		members: UserSetupPayload[];
+		admin: UserSetupPayload;
+	}
+>;
+
+type PushRequest = Request<
+	{},
+	{},
+	{
+		type: IPushDataType;
+		sessionId: string;
+		data: object;
 	}
 >;
 
-@Service()
 @NoAuthRequired()
 @RestController('/e2e')
 export class E2EController {
@@ -67,15 +80,21 @@ export class E2EController {
 		[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 roleRepo: RoleRepository,
-		private settingsRepo: SettingsRepository,
-		private userRepo: UserRepository,
-		private workflowRunner: ActiveWorkflowRunner,
-		private mfaService: MfaService,
+		private readonly roleRepo: RoleRepository,
+		private readonly settingsRepo: SettingsRepository,
+		private readonly userRepo: UserRepository,
+		private readonly workflowRunner: ActiveWorkflowRunner,
+		private readonly mfaService: MfaService,
+		private readonly cacheService: CacheService,
+		private readonly push: Push,
+		private readonly passwordUtility: PasswordUtility,
 	) {
 		license.isFeatureEnabled = (feature: BooleanLicenseFeature) =>
 			this.enabledFeatures[feature] ?? false;
@@ -87,7 +106,13 @@ export class E2EController {
 		await this.resetLogStreaming();
 		await this.removeActiveWorkflows();
 		await this.truncateAll();
-		await this.setupUserManagement(req.body.owner, req.body.members);
+		await this.resetCache();
+		await this.setupUserManagement(req.body.owner, req.body.members, req.body.admin);
+	}
+
+	@Post('/push')
+	async pushSend(req: PushRequest) {
+		this.push.broadcast(req.body.type, req.body.data);
 	}
 
 	@Patch('/feature')
@@ -96,6 +121,13 @@ export class E2EController {
 		this.enabledFeatures[feature] = enabled;
 	}
 
+	@Patch('/queue-mode')
+	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;
@@ -126,24 +158,30 @@ export class E2EController {
 		}
 	}
 
-	private async setupUserManagement(owner: UserSetupPayload, members: UserSetupPayload[]) {
+	private async setupUserManagement(
+		owner: UserSetupPayload,
+		members: UserSetupPayload[],
+		admin: UserSetupPayload,
+	) {
 		const roles: Array<[Role['name'], Role['scope']]> = [
 			['owner', 'global'],
 			['member', 'global'],
+			['admin', 'global'],
 			['owner', 'workflow'],
 			['owner', 'credential'],
 			['user', 'credential'],
 			['editor', 'workflow'],
 		];
 
-		const [{ id: globalOwnerRoleId }, { id: globalMemberRoleId }] = await this.roleRepo.save(
-			roles.map(([name, scope], index) => ({ name, scope, id: (index + 1).toString() })),
-		);
+		const [{ id: globalOwnerRoleId }, { id: globalMemberRoleId }, { id: globalAdminRoleId }] =
+			await this.roleRepo.save(
+				roles.map(([name, scope], index) => ({ name, scope, id: (index + 1).toString() })),
+			);
 
 		const instanceOwner = {
 			id: uuid(),
 			...owner,
-			password: await hashPassword(owner.password),
+			password: await this.passwordUtility.hash(owner.password),
 			globalRoleId: globalOwnerRoleId,
 		};
 
@@ -154,16 +192,23 @@ export class E2EController {
 			instanceOwner.mfaRecoveryCodes = encryptedRecoveryCodes;
 		}
 
+		const adminUser = {
+			id: uuid(),
+			...admin,
+			password: await this.passwordUtility.hash(admin.password),
+			globalRoleId: globalAdminRoleId,
+		};
+
 		const users = [];
 
-		users.push(instanceOwner);
+		users.push(instanceOwner, adminUser);
 
 		for (const { password, ...payload } of members) {
 			users.push(
 				this.userRepo.create({
 					id: uuid(),
 					...payload,
-					password: await hashPassword(password),
+					password: await this.passwordUtility.hash(password),
 					globalRoleId: globalMemberRoleId,
 				}),
 			);
@@ -178,4 +223,8 @@ export class E2EController {
 
 		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 4ccee47717..0000000000
--- 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 { MFAController } from './mfa.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 { WorkflowStatisticsController } from './workflowStatistics.controller';
diff --git a/packages/cli/src/controllers/invitation.controller.ts b/packages/cli/src/controllers/invitation.controller.ts
new file mode 100644
index 0000000000..379a993021
--- /dev/null
+++ b/packages/cli/src/controllers/invitation.controller.ts
@@ -0,0 +1,182 @@
+import { Response } from 'express';
+
+import config from '@/config';
+import { Authorized, NoAuthRequired, Post, RequireGlobalScope, RestController } from '@/decorators';
+import { issueCookie } from '@/auth/jwt';
+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 validator from 'validator';
+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';
+import { UserRepository } from '@/databases/repositories/user.repository';
+
+@Authorized()
+@RestController('/invitations')
+export class InvitationController {
+	constructor(
+		private readonly logger: Logger,
+		private readonly internalHooks: InternalHooks,
+		private readonly externalHooks: ExternalHooks,
+		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('/')
+	@RequireGlobalScope('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 && !['member', 'admin'].includes(invite.role)) {
+				throw new BadRequestError(
+					`Cannot invite user with invalid role: ${invite.role}. Please ensure all invitees' roles are either 'member' or 'admin'.`,
+				);
+			}
+
+			if (invite.role === '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 ?? '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.
+	 */
+	@NoAuthRequired()
+	@Post('/:id/accept')
+	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);
+
+		await issueCookie(res, updatedUser);
+
+		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 this.userService.toPublic(updatedUser, { posthog: this.postHog, withScopes: true });
+	}
+}
diff --git a/packages/cli/src/controllers/me.controller.ts b/packages/cli/src/controllers/me.controller.ts
index 3edfd6bbd2..a7b306d5df 100644
--- a/packages/cli/src/controllers/me.controller.ts
+++ b/packages/cli/src/controllers/me.controller.ts
@@ -1,11 +1,9 @@
 import validator from 'validator';
 import { plainToInstance } from 'class-transformer';
 import { Response } from 'express';
-import { Service } from 'typedi';
 import { randomBytes } from 'crypto';
 import { Authorized, Delete, Get, Patch, Post, RestController } from '@/decorators';
-import { compareHash, hashPassword, validatePassword } from '@/UserManagement/UserManagementHelper';
-import { BadRequestError } from '@/ResponseHelper';
+import { PasswordUtility } from '@/services/password.utility';
 import { validateEntity } from '@/GenericHelpers';
 import { issueCookie } from '@/auth/jwt';
 import type { User } from '@db/entities/User';
@@ -21,8 +19,9 @@ 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';
 
-@Service()
 @Authorized()
 @RestController('/me')
 export class MeController {
@@ -31,6 +30,8 @@ export class MeController {
 		private readonly externalHooks: ExternalHooks,
 		private readonly internalHooks: InternalHooks,
 		private readonly userService: UserService,
+		private readonly passwordUtility: PasswordUtility,
+		private readonly userRepository: UserRepository,
 	) {}
 
 	/**
@@ -74,8 +75,13 @@ export class MeController {
 			}
 		}
 
+		await this.externalHooks.run('user.profile.beforeUpdate', [userId, currentEmail, payload]);
+
 		await this.userService.update(userId, payload);
-		const user = await this.userService.findOneOrFail({ where: { id: userId } });
+		const user = await this.userRepository.findOneOrFail({
+			where: { id: userId },
+			relations: ['globalRole'],
+		});
 
 		this.logger.info('User updated successfully', { userId });
 
@@ -119,16 +125,19 @@ export class MeController {
 			throw new BadRequestError('Requesting user not set up.');
 		}
 
-		const isCurrentPwCorrect = await compareHash(currentPassword, req.user.password);
+		const isCurrentPwCorrect = await this.passwordUtility.compare(
+			currentPassword,
+			req.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);
+		req.user.password = await this.passwordUtility.hash(validPassword);
 
-		const user = await this.userService.save(req.user);
+		const user = await this.userRepository.save(req.user);
 		this.logger.info('Password updated successfully', { userId: user.id });
 
 		await issueCookie(res, user);
@@ -160,7 +169,7 @@ export class MeController {
 			throw new BadRequestError('Personalization answers are mandatory');
 		}
 
-		await this.userService.save({
+		await this.userRepository.save({
 			id: req.user.id,
 			// @ts-ignore
 			personalizationAnswers,
@@ -223,9 +232,10 @@ export class MeController {
 
 		await this.userService.updateSettings(id, payload);
 
-		const user = await this.userService.findOneOrFail({
+		const user = await this.userRepository.findOneOrFail({
 			select: ['settings'],
 			where: { id },
+			relations: ['globalRole'],
 		});
 
 		return user.settings;
diff --git a/packages/cli/src/controllers/mfa.controller.ts b/packages/cli/src/controllers/mfa.controller.ts
index 70e3444851..9d4f370cd0 100644
--- a/packages/cli/src/controllers/mfa.controller.ts
+++ b/packages/cli/src/controllers/mfa.controller.ts
@@ -1,7 +1,8 @@
 import { Authorized, Delete, Get, Post, RestController } from '@/decorators';
 import { AuthenticatedRequest, MFA } from '@/requests';
-import { BadRequestError } from '@/ResponseHelper';
 import { MfaService } from '@/Mfa/mfa.service';
+import { BadRequestError } from '@/errors/response-errors/bad-request.error';
+
 @Authorized()
 @RestController('/mfa')
 export class MFAController {
diff --git a/packages/cli/src/controllers/nodeTypes.controller.ts b/packages/cli/src/controllers/nodeTypes.controller.ts
index 029f4d8790..507c7a3c20 100644
--- a/packages/cli/src/controllers/nodeTypes.controller.ts
+++ b/packages/cli/src/controllers/nodeTypes.controller.ts
@@ -3,22 +3,19 @@ import get from 'lodash/get';
 import { Request } from 'express';
 import type { INodeTypeDescription, INodeTypeNameVersion } from 'n8n-workflow';
 import { Authorized, Post, RestController } from '@/decorators';
-import { Config } from '@/config';
+import config from '@/config';
 import { NodeTypes } from '@/NodeTypes';
 
 @Authorized()
 @RestController('/node-types')
 export class NodeTypesController {
-	constructor(
-		private readonly config: Config,
-		private readonly 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 }) => {
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 0000000000..c2e9ded77e
--- /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 WorkflowExecuteAdditionalData.getBase(user.id);
+	}
+
+	protected async getDecryptedData(
+		credential: ICredentialsDb,
+		additionalData: IWorkflowExecuteAdditionalData,
+	) {
+		return 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, credential.nodesAccess);
+		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 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 0000000000..761e6b15b3
--- /dev/null
+++ b/packages/cli/src/controllers/oauth/oAuth1Credential.controller.ts
@@ -0,0 +1,188 @@
+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 { Authorized, 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;
+
+@Authorized()
+@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 0000000000..a24f105f2b
--- /dev/null
+++ b/packages/cli/src/controllers/oauth/oAuth2Credential.controller.ts
@@ -0,0 +1,248 @@
+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 { Authorized, Get, RestController } from '@/decorators';
+import { OAuthRequest } from '@/requests';
+import { AbstractOAuthController } from './abstractOAuth.controller';
+
+interface CsrfStateParam {
+	cid: string;
+	token: string;
+}
+
+@Authorized()
+@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
index 4d997107cc..c1c03696fc 100644
--- a/packages/cli/src/controllers/orchestration.controller.ts
+++ b/packages/cli/src/controllers/orchestration.controller.ts
@@ -1,32 +1,39 @@
-import { Authorized, Get, RestController } from '@/decorators';
+import { Authorized, Post, RestController, RequireGlobalScope } from '@/decorators';
 import { OrchestrationRequest } from '@/requests';
-import { Service } from 'typedi';
-import { OrchestrationMainService } from '@/services/orchestration/main/orchestration.main.service';
+import { SingleMainSetup } from '@/services/orchestration/main/SingleMainSetup';
+import { License } from '@/License';
 
-@Authorized(['global', 'owner'])
+@Authorized()
 @RestController('/orchestration')
-@Service()
 export class OrchestrationController {
-	constructor(private readonly orchestrationService: OrchestrationMainService) {}
+	constructor(
+		private readonly singleMainSetup: SingleMainSetup,
+		private readonly licenseService: License,
+	) {}
 
 	/**
-	 * These endpoint currently do not return anything, they just trigger the messsage to
+	 * These endpoints do not return anything, they just trigger the messsage to
 	 * the workers to respond on Redis with their status.
-	 * TODO: these responses need to be forwarded to and handled by the frontend
 	 */
-	@Get('/worker/status/:id')
+	@RequireGlobalScope('orchestration:read')
+	@Post('/worker/status/:id')
 	async getWorkersStatus(req: OrchestrationRequest.Get) {
+		if (!this.licenseService.isWorkerViewLicensed()) return;
 		const id = req.params.id;
-		return this.orchestrationService.getWorkerStatus(id);
+		return this.singleMainSetup.getWorkerStatus(id);
 	}
 
-	@Get('/worker/status')
+	@RequireGlobalScope('orchestration:read')
+	@Post('/worker/status')
 	async getWorkersStatusAll() {
-		return this.orchestrationService.getWorkerStatus();
+		if (!this.licenseService.isWorkerViewLicensed()) return;
+		return this.singleMainSetup.getWorkerStatus();
 	}
 
-	@Get('/worker/ids')
+	@RequireGlobalScope('orchestration:list')
+	@Post('/worker/ids')
 	async getWorkerIdsAll() {
-		return this.orchestrationService.getWorkerIds();
+		if (!this.licenseService.isWorkerViewLicensed()) return;
+		return this.singleMainSetup.getWorkerIds();
 	}
 }
diff --git a/packages/cli/src/controllers/owner.controller.ts b/packages/cli/src/controllers/owner.controller.ts
index 5578a60d4b..2caa1e0616 100644
--- a/packages/cli/src/controllers/owner.controller.ts
+++ b/packages/cli/src/controllers/owner.controller.ts
@@ -1,28 +1,31 @@
 import validator from 'validator';
+import { Response } from 'express';
+
+import config from '@/config';
 import { validateEntity } from '@/GenericHelpers';
 import { Authorized, Post, RestController } from '@/decorators';
-import { BadRequestError } from '@/ResponseHelper';
-import { hashPassword, validatePassword } from '@/UserManagement/UserManagementHelper';
+import { PasswordUtility } from '@/services/password.utility';
 import { issueCookie } from '@/auth/jwt';
-import { Response } from 'express';
-import { Config } from '@/config';
 import { OwnerRequest } from '@/requests';
-import { IInternalHooksClass } from '@/Interfaces';
-import { SettingsRepository } from '@db/repositories';
+import { SettingsRepository } from '@db/repositories/settings.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';
+import { UserRepository } from '@/databases/repositories/user.repository';
 
 @Authorized(['global', 'owner'])
 @RestController('/owner')
 export class OwnerController {
 	constructor(
-		private readonly config: Config,
 		private readonly logger: Logger,
-		private readonly internalHooks: IInternalHooksClass,
+		private readonly internalHooks: InternalHooks,
 		private readonly settingsRepository: SettingsRepository,
 		private readonly userService: UserService,
-		private readonly postHog?: PostHogClient,
+		private readonly passwordUtility: PasswordUtility,
+		private readonly postHog: PostHogClient,
+		private readonly userRepository: UserRepository,
 	) {}
 
 	/**
@@ -34,7 +37,7 @@ export class OwnerController {
 		const { email, firstName, lastName, password } = 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',
 				{
@@ -52,7 +55,7 @@ export class OwnerController {
 			throw new BadRequestError('Invalid email address');
 		}
 
-		const validPassword = validatePassword(password);
+		const validPassword = this.passwordUtility.validate(password);
 
 		if (!firstName || !lastName) {
 			this.logger.debug(
@@ -79,12 +82,12 @@ export class OwnerController {
 			email,
 			firstName,
 			lastName,
-			password: await hashPassword(validPassword),
+			password: await this.passwordUtility.hash(validPassword),
 		});
 
 		await validateEntity(owner);
 
-		owner = await this.userService.save(owner);
+		owner = await this.userRepository.save(owner);
 
 		this.logger.info('Owner was set up successfully', { userId });
 
@@ -93,7 +96,7 @@ export class OwnerController {
 			{ value: JSON.stringify(true) },
 		);
 
-		this.config.set('userManagement.isInstanceOwnerSetUp', true);
+		config.set('userManagement.isInstanceOwnerSetUp', true);
 
 		this.logger.debug('Setting isInstanceOwnerSetUp updated successfully', { userId });
 
@@ -101,7 +104,7 @@ export class OwnerController {
 
 		void this.internalHooks.onInstanceOwnerSetup({ user_id: userId });
 
-		return this.userService.toPublic(owner, { posthog: this.postHog });
+		return this.userService.toPublic(owner, { posthog: this.postHog, withScopes: true });
 	}
 
 	@Post('/dismiss-banner')
diff --git a/packages/cli/src/controllers/passwordReset.controller.ts b/packages/cli/src/controllers/passwordReset.controller.ts
index b619e50f04..806d892d26 100644
--- a/packages/cli/src/controllers/passwordReset.controller.ts
+++ b/packages/cli/src/controllers/passwordReset.controller.ts
@@ -1,52 +1,55 @@
-import { IsNull, Not } from 'typeorm';
-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 { UserManagementMailer } from '@/UserManagement/email';
-
 import { Response } from 'express';
+import { rateLimit } from 'express-rate-limit';
+import validator from 'validator';
+
+import { Get, Post, RestController } from '@/decorators';
+import { PasswordUtility } from '@/services/password.utility';
+import { UserManagementMailer } from '@/UserManagement/email';
 import { PasswordResetRequest } from '@/requests';
-import { IExternalHooksClass, IInternalHooksClass } from '@/Interfaces';
 import { issueCookie } from '@/auth/jwt';
-import { isLdapEnabled } from '@/Ldap/helpers';
 import { isSamlCurrentAuthenticationMethod } from '@/sso/ssoHelpers';
 import { UserService } from '@/services/user.service';
 import { License } from '@/License';
-import { Container } from 'typedi';
-import { RESPONSE_ERROR_MESSAGES } from '@/constants';
-import { TokenExpiredError } from 'jsonwebtoken';
-import type { JwtPayload } from '@/services/jwt.service';
-import { JwtService } from '@/services/jwt.service';
+import { RESPONSE_ERROR_MESSAGES, inTest } 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';
+
+const throttle = rateLimit({
+	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' },
+});
 
 @RestController()
 export class PasswordResetController {
 	constructor(
 		private readonly logger: Logger,
-		private readonly externalHooks: IExternalHooksClass,
-		private readonly internalHooks: IInternalHooksClass,
+		private readonly externalHooks: ExternalHooks,
+		private readonly internalHooks: InternalHooks,
 		private readonly mailer: UserManagementMailer,
 		private readonly userService: UserService,
-		private readonly jwtService: JwtService,
 		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', {
+		middlewares: !inTest ? [throttle] : [],
+	})
 	async forgotPassword(req: PasswordResetRequest.Email) {
 		if (!this.mailer.isEmailSetUp) {
 			this.logger.debug(
@@ -75,15 +78,9 @@ export class PasswordResetController {
 		}
 
 		// User should just be able to reset password if one is already present
-		const user = await this.userService.findOne({
-			where: {
-				email,
-				password: Not(IsNull()),
-			},
-			relations: ['authIdentities', 'globalRole'],
-		});
+		const user = await this.userRepository.findNonShellUser(email);
 
-		if (!user?.isOwner && !Container.get(License).isWithinUsersLimit()) {
+		if (!user?.isOwner && !this.license.isWithinUsersLimit()) {
 			this.logger.debug(
 				'Request to send password reset email failed because the user limit was reached',
 			);
@@ -91,7 +88,10 @@ export class PasswordResetController {
 		}
 		if (
 			isSamlCurrentAuthenticationMethod() &&
-			!(user?.globalRole.name === 'owner' || user?.settings?.allowSSOManualLogin === true)
+			!(
+				(user && 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',
@@ -110,33 +110,20 @@ export class PasswordResetController {
 			return;
 		}
 
-		if (isLdapEnabled() && ldapIdentity) {
+		if (this.license.isLdapEnabled() && ldapIdentity) {
 			throw new UnprocessableRequestError('forgotPassword.ldapUserPasswordResetUnavailable');
 		}
 
-		const baseUrl = getInstanceBaseUrl();
+		const url = this.userService.generatePasswordResetUrl(user);
+
 		const { id, firstName, lastName } = user;
-
-		const resetPasswordToken = this.jwtService.signData(
-			{ sub: id },
-			{
-				expiresIn: '1d',
-			},
-		);
-
-		const url = this.userService.generatePasswordResetUrl(
-			baseUrl,
-			resetPasswordToken,
-			user.mfaEnabled,
-		);
-
 		try {
 			await this.mailer.passwordReset({
 				email,
 				firstName,
 				lastName,
 				passwordResetUrl: url,
-				domain: baseUrl,
+				domain: this.urlService.getInstanceBaseUrl(),
 			});
 		} catch (error) {
 			void this.internalHooks.onEmailFailed({
@@ -164,9 +151,9 @@ export class PasswordResetController {
 	 */
 	@Get('/resolve-password-token')
 	async resolvePasswordToken(req: PasswordResetRequest.Credentials) {
-		const { token: resetPasswordToken } = req.query;
+		const { token } = req.query;
 
-		if (!resetPasswordToken) {
+		if (!token) {
 			this.logger.debug(
 				'Request to resolve password token failed because of missing password reset token',
 				{
@@ -176,32 +163,17 @@ export class PasswordResetController {
 			throw new BadRequestError('');
 		}
 
-		const decodedToken = this.verifyResetPasswordToken(resetPasswordToken);
+		const user = await this.userService.resolvePasswordResetToken(token);
+		if (!user) throw new NotFoundError('');
 
-		const user = await this.userService.findOne({
-			where: { id: decodedToken.sub },
-			relations: ['globalRole'],
-		});
-
-		if (!user?.isOwner && !Container.get(License).isWithinUsersLimit()) {
+		if (!user?.isOwner && !this.license.isWithinUsersLimit()) {
 			this.logger.debug(
 				'Request to resolve password token failed because the user limit was reached',
-				{ userId: decodedToken.sub },
+				{ userId: user.id },
 			);
 			throw new UnauthorizedError(RESPONSE_ERROR_MESSAGES.USERS_QUOTA_REACHED);
 		}
 
-		if (!user) {
-			this.logger.debug(
-				'Request to resolve password token failed because no user was found for the provided user ID',
-				{
-					userId: decodedToken.sub,
-					resetPasswordToken,
-				},
-			);
-			throw new NotFoundError('');
-		}
-
 		this.logger.info('Reset-password token resolved successfully', { userId: user.id });
 		void this.internalHooks.onUserPasswordResetEmailClick({ user });
 	}
@@ -211,9 +183,9 @@ export class PasswordResetController {
 	 */
 	@Post('/change-password')
 	async changePassword(req: PasswordResetRequest.NewPassword, res: Response) {
-		const { token: resetPasswordToken, password, mfaToken } = req.body;
+		const { token, password, mfaToken } = req.body;
 
-		if (!resetPasswordToken || !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',
 				{
@@ -223,24 +195,10 @@ 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);
 
-		const decodedToken = this.verifyResetPasswordToken(resetPasswordToken);
-
-		const user = await this.userService.findOne({
-			where: { id: decodedToken.sub },
-			relations: ['authIdentities', 'globalRole'],
-		});
-
-		if (!user) {
-			this.logger.debug(
-				'Request to resolve password token failed because no user was found for the provided user ID',
-				{
-					resetPasswordToken,
-				},
-			);
-			throw new NotFoundError('');
-		}
+		const user = await this.userService.resolvePasswordResetToken(token);
+		if (!user) throw new NotFoundError('');
 
 		if (user.mfaEnabled) {
 			if (!mfaToken) throw new BadRequestError('If MFA enabled, mfaToken is required.');
@@ -252,7 +210,7 @@ export class PasswordResetController {
 			if (!validToken) throw new BadRequestError('Invalid MFA token.');
 		}
 
-		const passwordHash = await hashPassword(validPassword);
+		const passwordHash = await this.passwordUtility.hash(validPassword);
 
 		await this.userService.update(user.id, { password: passwordHash });
 
@@ -276,23 +234,4 @@ export class PasswordResetController {
 
 		await this.externalHooks.run('user.password.update', [user.email, passwordHash]);
 	}
-
-	private verifyResetPasswordToken(resetPasswordToken: string) {
-		let decodedToken: JwtPayload;
-		try {
-			decodedToken = this.jwtService.verifyToken(resetPasswordToken);
-			return decodedToken;
-		} catch (e) {
-			if (e instanceof TokenExpiredError) {
-				this.logger.debug('Reset password token expired', {
-					resetPasswordToken,
-				});
-				throw new NotFoundError('');
-			}
-			this.logger.debug('Error verifying token', {
-				resetPasswordToken,
-			});
-			throw new BadRequestError('');
-		}
-	}
 }
diff --git a/packages/cli/src/controllers/role.controller.ts b/packages/cli/src/controllers/role.controller.ts
new file mode 100644
index 0000000000..4b16ceb771
--- /dev/null
+++ b/packages/cli/src/controllers/role.controller.ts
@@ -0,0 +1,22 @@
+import { License } from '@/License';
+import { Get, RestController } from '@/decorators';
+import { RoleService } from '@/services/role.service';
+
+@RestController('/roles')
+export class RoleController {
+	constructor(
+		private readonly roleService: RoleService,
+		private readonly license: License,
+	) {}
+
+	@Get('/')
+	async listRoles() {
+		return this.roleService.listRoles().map((role) => {
+			if (role.scope === 'global' && role.name === 'admin') {
+				return { ...role, isAvailable: this.license.isAdvancedPermissionsLicensed() };
+			}
+
+			return { ...role, isAvailable: true };
+		});
+	}
+}
diff --git a/packages/cli/src/controllers/tags.controller.ts b/packages/cli/src/controllers/tags.controller.ts
index ab81357daf..43c06c83e2 100644
--- a/packages/cli/src/controllers/tags.controller.ts
+++ b/packages/cli/src/controllers/tags.controller.ts
@@ -1,18 +1,25 @@
 import { Request, Response, NextFunction } from 'express';
 import config from '@/config';
-import { Authorized, Delete, Get, Middleware, Patch, Post, RestController } from '@/decorators';
+import {
+	Authorized,
+	Delete,
+	Get,
+	Middleware,
+	Patch,
+	Post,
+	RestController,
+	RequireGlobalScope,
+} from '@/decorators';
 import { TagService } from '@/services/tag.service';
-import { BadRequestError } from '@/ResponseHelper';
 import { TagsRequest } from '@/requests';
-import { Service } from 'typedi';
+import { BadRequestError } from '@/errors/response-errors/bad-request.error';
 
 @Authorized()
 @RestController('/tags')
-@Service()
 export class TagsController {
 	private config = config;
 
-	constructor(private tagService: TagService) {}
+	constructor(private readonly tagService: TagService) {}
 
 	// TODO: move this into a new decorator `@IfEnabled('workflowTagsDisabled')`
 	@Middleware()
@@ -23,11 +30,13 @@ export class TagsController {
 	}
 
 	@Get('/')
+	@RequireGlobalScope('tag:list')
 	async getAll(req: TagsRequest.GetAll) {
 		return this.tagService.getAll({ withUsageCount: req.query.withUsageCount === 'true' });
 	}
 
 	@Post('/')
+	@RequireGlobalScope('tag:create')
 	async createTag(req: TagsRequest.Create) {
 		const tag = this.tagService.toEntity({ name: req.body.name });
 
@@ -35,14 +44,15 @@ export class TagsController {
 	}
 
 	@Patch('/:id(\\w+)')
+	@RequireGlobalScope('tag:update')
 	async updateTag(req: TagsRequest.Update) {
 		const newTag = this.tagService.toEntity({ id: req.params.id, name: req.body.name.trim() });
 
 		return this.tagService.save(newTag, 'update');
 	}
 
-	@Authorized(['global', 'owner'])
 	@Delete('/:id(\\w+)')
+	@RequireGlobalScope('tag:delete')
 	async deleteTag(req: TagsRequest.Delete) {
 		const { id } = req.params;
 
diff --git a/packages/cli/src/controllers/translation.controller.ts b/packages/cli/src/controllers/translation.controller.ts
index 8238e73ebd..7b5f6bef57 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 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');
@@ -17,10 +18,7 @@ export declare namespace TranslationRequest {
 @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) {
@@ -29,7 +27,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 8965ed1286..cd47a7fde6 100644
--- a/packages/cli/src/controllers/users.controller.ts
+++ b/packages/cli/src/controllers/users.controller.ts
@@ -1,359 +1,63 @@
-import validator from 'validator';
-import type { FindManyOptions } from 'typeorm';
-import { In, Not } from 'typeorm';
-import { ErrorReporterProxy as ErrorReporter } from 'n8n-workflow';
 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, Patch } from '@/decorators';
 import {
-	generateUserInviteUrl,
-	getInstanceBaseUrl,
-	hashPassword,
-	validatePassword,
-} from '@/UserManagement/UserManagementHelper';
-import { issueCookie } from '@/auth/jwt';
+	RequireGlobalScope,
+	Authorized,
+	Delete,
+	Get,
+	RestController,
+	Patch,
+	Licensed,
+} from '@/decorators';
 import {
-	BadRequestError,
-	InternalServerError,
-	NotFoundError,
-	UnauthorizedError,
-} from '@/ResponseHelper';
-import { Response } from 'express';
-import { ListQuery, UserRequest, UserSettingsUpdatePayload } from '@/requests';
-import { UserManagementMailer } from '@/UserManagement/email';
+	ListQuery,
+	UserRequest,
+	UserRoleChangePayload,
+	UserSettingsUpdatePayload,
+} from '@/requests';
 import { ActiveWorkflowRunner } from '@/ActiveWorkflowRunner';
-import { Config } from '@/config';
-import { IExternalHooksClass, IInternalHooksClass } from '@/Interfaces';
 import type { PublicUser, ITelemetryUserDeletionData } from '@/Interfaces';
 import { AuthIdentity } from '@db/entities/AuthIdentity';
-import { PostHogClient } from '@/posthog';
-import { isSamlLicensedAndEnabled } from '../sso/saml/samlHelpers';
-import { SharedCredentialsRepository, SharedWorkflowRepository } from '@db/repositories';
+import { SharedCredentialsRepository } from '@db/repositories/sharedCredentials.repository';
+import { SharedWorkflowRepository } from '@db/repositories/sharedWorkflow.repository';
+import { UserRepository } from '@db/repositories/user.repository';
 import { plainToInstance } from 'class-transformer';
-import { License } from '@/License';
-import { Container } from 'typedi';
-import { RESPONSE_ERROR_MESSAGES } from '@/constants';
-import { JwtService } from '@/services/jwt.service';
 import { RoleService } from '@/services/role.service';
 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';
 
-@Authorized(['global', 'owner'])
+@Authorized()
 @RestController('/users')
 export class UsersController {
 	constructor(
-		private readonly config: Config,
 		private readonly logger: Logger,
-		private readonly externalHooks: IExternalHooksClass,
-		private readonly internalHooks: IInternalHooksClass,
+		private readonly externalHooks: ExternalHooks,
+		private readonly internalHooks: InternalHooks,
 		private readonly sharedCredentialsRepository: SharedCredentialsRepository,
 		private readonly sharedWorkflowRepository: SharedWorkflowRepository,
+		private readonly userRepository: UserRepository,
 		private readonly activeWorkflowRunner: ActiveWorkflowRunner,
-		private readonly mailer: UserManagementMailer,
-		private readonly jwtService: JwtService,
 		private readonly roleService: RoleService,
 		private readonly userService: UserService,
-		private readonly postHog?: PostHogClient,
 	) {}
 
-	/**
-	 * Send email invite(s) to one or multiple users and create user shell(s).
-	 */
-	@Post('/')
-	async sendEmailInvites(req: UserRequest.Invite) {
-		const isWithinUsersLimit = Container.get(License).isWithinUsersLimit();
+	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;
 
-		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 (!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 (!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.roleService.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/exclude existing users from creation
-		const existingUsers = await this.userService.findMany({
-			where: { email: In(Object.keys(createUsers)) },
-			relations: ['globalRole'],
-		});
-		existingUsers.forEach((user) => {
-			if (user.password) {
-				delete createUsers[user.email];
-				return;
-			}
-			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.userService.getManager().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,
-		});
-
-		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;
-						delete resp.user.inviteAcceptUrl;
-						void this.internalHooks.onUserTransactionalEmail({
-							user_id: id,
-							message_type: 'New user invite',
-							public_api: false,
-						});
-					}
-
-					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;
-			}),
-		);
-
-		await this.externalHooks.run('user.invited', [usersToSetUp]);
-
-		this.logger.debug(
-			usersPendingSetup.length > 1
-				? `Sent ${usersPendingSetup.length} invite emails successfully`
-				: 'Sent 1 invite email successfully',
-			{ userShells: createUsers },
-		);
-
-		return emailingResults;
-	}
-
-	/**
-	 * 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 } = 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 = validatePassword(password);
-
-		const users = await this.userService.findMany({
-			where: { id: In([inviterId, inviteeId]) },
-			relations: ['globalRole'],
-		});
-
-		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 hashPassword(validPassword);
-
-		const updatedUser = await this.userService.save(invitee);
-
-		await issueCookie(res, updatedUser);
-
-		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 this.userService.toPublic(updatedUser, { posthog: this.postHog });
-	}
-
-	private async toFindManyOptions(listQueryOptions?: ListQuery.Options) {
-		const findManyOptions: FindManyOptions<User> = {};
-
-		if (!listQueryOptions) {
-			findManyOptions.relations = ['globalRole', '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 = ['globalRole', '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) {
-				const ownerRole = await this.roleService.findGlobalOwnerRole();
-
-				findManyOptions.relations = ['globalRole'];
-				findManyOptions.where.globalRole = { id: isOwner ? ownerRole.id : Not(ownerRole.id) };
-			}
-		}
-
-		return findManyOptions;
-	}
-
-	removeSupplementaryFields(
+	private removeSupplementaryFields(
 		publicUsers: Array<Partial<PublicUser>>,
 		listQueryOptions: ListQuery.Options,
 	) {
@@ -383,17 +87,24 @@ export class UsersController {
 		return publicUsers;
 	}
 
-	@Authorized('any')
 	@Get('/', { middlewares: listQueryMiddleware })
+	@RequireGlobalScope('user:list')
 	async listUsers(req: ListQuery.Request) {
 		const { listQueryOptions } = req;
 
-		const findManyOptions = await this.toFindManyOptions(listQueryOptions);
+		const globalOwner = await this.roleService.findGlobalOwnerRole();
 
-		const users = await this.userService.findMany(findManyOptions);
+		const findManyOptions = await this.userRepository.toFindManyOptions(
+			listQueryOptions,
+			globalOwner.id,
+		);
+
+		const users = await this.userRepository.find(findManyOptions);
 
 		const publicUsers: Array<Partial<PublicUser>> = await Promise.all(
-			users.map(async (u) => this.userService.toPublic(u, { withInviteUrl: true })),
+			users.map(async (u) =>
+				this.userService.toPublic(u, { withInviteUrl: true, inviterId: req.user.id }),
+			),
 		);
 
 		return listQueryOptions
@@ -401,37 +112,23 @@ export class UsersController {
 			: publicUsers;
 	}
 
-	@Authorized(['global', 'owner'])
 	@Get('/:id/password-reset-link')
+	@RequireGlobalScope('user:resetPassword')
 	async getUserPasswordResetLink(req: UserRequest.PasswordResetLink) {
-		const user = await this.userService.findOneOrFail({
+		const user = await this.userRepository.findOneOrFail({
 			where: { id: req.params.id },
+			relations: ['globalRole'],
 		});
 		if (!user) {
 			throw new NotFoundError('User not found');
 		}
 
-		const resetPasswordToken = this.jwtService.signData(
-			{ sub: user.id },
-			{
-				expiresIn: '1d',
-			},
-		);
-
-		const baseUrl = getInstanceBaseUrl();
-
-		const link = this.userService.generatePasswordResetUrl(
-			baseUrl,
-			resetPasswordToken,
-			user.mfaEnabled,
-		);
-		return {
-			link,
-		};
+		const link = this.userService.generatePasswordResetUrl(user);
+		return { link };
 	}
 
-	@Authorized(['global', 'owner'])
 	@Patch('/:id/settings')
+	@RequireGlobalScope('user:update')
 	async updateUserSettings(req: UserRequest.UserSettingsUpdate) {
 		const payload = plainToInstance(UserSettingsUpdatePayload, req.body);
 
@@ -439,9 +136,10 @@ export class UsersController {
 
 		await this.userService.updateSettings(id, payload);
 
-		const user = await this.userService.findOneOrFail({
+		const user = await this.userRepository.findOneOrFail({
 			select: ['settings'],
 			where: { id },
+			relations: ['globalRole'],
 		});
 
 		return user.settings;
@@ -451,6 +149,7 @@ export class UsersController {
 	 * Delete a user. Optionally, designate a transferee for their workflows and credentials.
 	 */
 	@Delete('/:id')
+	@RequireGlobalScope('user:delete')
 	async deleteUser(req: UserRequest.Delete) {
 		const { id: idToDelete } = req.params;
 
@@ -470,10 +169,9 @@ export class UsersController {
 			);
 		}
 
-		const users = await this.userService.findMany({
-			where: { id: In([transferId, idToDelete]) },
-			relations: ['globalRole'],
-		});
+		const userIds = transferId ? [transferId, idToDelete] : [idToDelete];
+
+		const users = await this.userRepository.findManybyIds(userIds);
 
 		if (!users.length || (transferId && users.length !== 2)) {
 			throw new NotFoundError(
@@ -515,10 +213,11 @@ export class UsersController {
 
 				// 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(
@@ -540,10 +239,11 @@ export class UsersController {
 
 				// 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(
@@ -605,77 +305,43 @@ export class UsersController {
 		return { success: true };
 	}
 
-	/**
-	 * Resend email invite to user.
-	 */
-	@Post('/:id/reinvite')
-	async reinviteUser(req: UserRequest.Reinvite) {
-		const { id: idToReinvite } = req.params;
-		const isWithinUsersLimit = Container.get(License).isWithinUsersLimit();
+	@Patch('/:id/role')
+	@RequireGlobalScope('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 (!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);
+		const payload = plainToInstance(UserRoleChangePayload, req.body);
+		await validateEntity(payload);
+
+		const targetUser = await this.userRepository.findOne({
+			where: { id: req.params.id },
+			relations: ['globalRole'],
+		});
+		if (targetUser === null) {
+			throw new NotFoundError(NO_USER);
 		}
 
-		if (!this.mailer.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');
+		if (req.user.globalRole.name === 'admin' && targetUser.globalRole.name === 'owner') {
+			throw new UnauthorizedError(NO_ADMIN_ON_OWNER);
 		}
 
-		const reinvitee = await this.userService.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.globalRole.name === 'owner' && targetUser.globalRole.name === 'owner') {
+			throw new UnauthorizedError(NO_OWNER_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');
-		}
+		const roleToSet = await this.roleService.findCached('global', payload.newRoleName);
 
-		const baseUrl = getInstanceBaseUrl();
-		const inviteAcceptUrl = `${baseUrl}/signup?inviterId=${req.user.id}&inviteeId=${reinvitee.id}`;
+		await this.userService.update(targetUser.id, { globalRoleId: roleToSet.id });
 
-		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.onUserRoleChange({
+			user: req.user,
+			target_user_id: targetUser.id,
+			target_user_new_role: ['global', payload.newRoleName].join(' '),
+			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/workflowStatistics.controller.ts b/packages/cli/src/controllers/workflowStatistics.controller.ts
index b506ac15df..a5ad163823 100644
--- a/packages/cli/src/controllers/workflowStatistics.controller.ts
+++ b/packages/cli/src/controllers/workflowStatistics.controller.ts
@@ -1,14 +1,13 @@
-import { Service } from 'typedi';
 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, WorkflowStatisticsRepository } from '@db/repositories';
+import { SharedWorkflowRepository } from '@db/repositories/sharedWorkflow.repository';
+import { WorkflowStatisticsRepository } from '@db/repositories/workflowStatistics.repository';
 import { ExecutionRequest } from '@/requests';
-import { whereClause } from '@/UserManagement/UserManagementHelper';
-import { NotFoundError } from '@/ResponseHelper';
 import type { IWorkflowStatisticsDataLoaded } from '@/Interfaces';
 import { Logger } from '@/Logger';
+import { NotFoundError } from '@/errors/response-errors/not-found.error';
 
 interface WorkflowStatisticsData<T> {
 	productionSuccess: T;
@@ -17,12 +16,11 @@ interface WorkflowStatisticsData<T> {
 	manualError: T;
 }
 
-@Service()
 @RestController('/workflow-stats')
 export class WorkflowStatisticsController {
 	constructor(
-		private sharedWorkflowRepository: SharedWorkflowRepository,
-		private workflowStatisticsRepository: WorkflowStatisticsRepository,
+		private readonly sharedWorkflowRepository: SharedWorkflowRepository,
+		private readonly workflowStatisticsRepository: WorkflowStatisticsRepository,
 		private readonly logger: Logger,
 	) {}
 
@@ -34,16 +32,10 @@ export class WorkflowStatisticsController {
 	async hasWorkflowAccess(req: ExecutionRequest.Get, res: Response, next: NextFunction) {
 		const { user } = req;
 		const workflowId = req.params.id;
-		const allowed = await this.sharedWorkflowRepository.exist({
-			relations: ['workflow'],
-			where: whereClause({
-				user,
-				entityType: 'workflow',
-				entityId: workflowId,
-			}),
-		});
 
-		if (allowed) {
+		const hasAccess = await this.sharedWorkflowRepository.hasAccess(workflowId, user);
+
+		if (hasAccess) {
 			next();
 		} else {
 			this.logger.verbose('User attempted to read a workflow without permissions', {
diff --git a/packages/cli/src/credentials/credentials.controller.ee.ts b/packages/cli/src/credentials/credentials.controller.ee.ts
index a5841a6831..eb4fd7ee4a 100644
--- a/packages/cli/src/credentials/credentials.controller.ee.ts
+++ b/packages/cli/src/credentials/credentials.controller.ee.ts
@@ -5,14 +5,17 @@ import * as Db from '@/Db';
 import * as ResponseHelper from '@/ResponseHelper';
 
 import type { CredentialRequest } from '@/requests';
-import { isSharingEnabled, rightDiff } from '@/UserManagement/UserManagementHelper';
+import { isSharingEnabled } from '@/UserManagement/UserManagementHelper';
 import { EECredentialsService as EECredentials } from './credentials.service.ee';
 import { OwnershipService } from '@/services/ownership.service';
 import { Container } from 'typedi';
 import { InternalHooks } from '@/InternalHooks';
-import type { CredentialsEntity } from '@/databases/entities/CredentialsEntity';
+import { BadRequestError } from '@/errors/response-errors/bad-request.error';
+import { NotFoundError } from '@/errors/response-errors/not-found.error';
+import { UnauthorizedError } from '@/errors/response-errors/unauthorized.error';
+import { CredentialsRepository } from '@/databases/repositories/credentials.repository';
+import * as utils from '@/utils';
 
-// eslint-disable-next-line @typescript-eslint/naming-convention
 export const EECredentialsController = express.Router();
 
 EECredentialsController.use((req, res, next) => {
@@ -35,21 +38,21 @@ EECredentialsController.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;
+		let credential = await Container.get(CredentialsRepository).findOne({
+			where: { id: credentialId },
+			relations: ['shared', 'shared.role', 'shared.user'],
+		});
 
 		if (!credential) {
-			throw new ResponseHelper.NotFoundError(
+			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.globalRole.name !== 'owner') {
-			throw new ResponseHelper.UnauthorizedError('Forbidden.');
+		if (!userSharing && !req.user.hasGlobalScope('credential:read')) {
+			throw new UnauthorizedError('Forbidden.');
 		}
 
 		credential = Container.get(OwnershipService).addOwnedByAndSharedWith(credential);
@@ -80,10 +83,13 @@ EECredentialsController.post(
 		const credentialId = credentials.id;
 		const { ownsCredential } = await EECredentials.isOwned(req.user, credentialId);
 
-		const sharing = await EECredentials.getSharing(req.user, credentialId);
+		const sharing = await EECredentials.getSharing(req.user, credentialId, {
+			allowGlobalScope: true,
+			globalScope: 'credential:read',
+		});
 		if (!ownsCredential) {
 			if (!sharing) {
-				throw new ResponseHelper.UnauthorizedError('Forbidden');
+				throw new UnauthorizedError('Forbidden');
 			}
 
 			const decryptedData = EECredentials.decrypt(sharing.credentials);
@@ -116,34 +122,57 @@ EECredentialsController.put(
 			!Array.isArray(shareWithIds) ||
 			!shareWithIds.every((userId) => typeof userId === 'string')
 		) {
-			throw new ResponseHelper.BadRequestError('Bad request');
+			throw new BadRequestError('Bad request');
 		}
 
-		const { ownsCredential, credential } = await EECredentials.isOwned(req.user, credentialId);
+		const isOwnedRes = await EECredentials.isOwned(req.user, credentialId);
+		const { ownsCredential } = isOwnedRes;
+		let { credential } = isOwnedRes;
 		if (!ownsCredential || !credential) {
-			throw new ResponseHelper.UnauthorizedError('Forbidden');
+			credential = undefined;
+			// Allow owners/admins to share
+			if (req.user.hasGlobalScope('credential:share')) {
+				const sharedRes = await EECredentials.getSharing(req.user, credentialId, {
+					allowGlobalScope: true,
+					globalScope: 'credential:share',
+				});
+				credential = sharedRes?.credentials;
+			}
+			if (!credential) {
+				throw new UnauthorizedError('Forbidden');
+			}
 		}
 
+		const ownerIds = (
+			await EECredentials.getSharings(Db.getConnection().createEntityManager(), credentialId, [
+				'shared',
+				'shared.role',
+			])
+		)
+			.filter((e) => e.role.name === '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 EECredentials.pruneSharings(trx, credentialId, [
-				req.user.id,
-				...shareWithIds,
-			]);
+			const { affected } = await Container.get(CredentialsRepository).pruneSharings(
+				trx,
+				credentialId,
+				[...ownerIds, ...shareWithIds],
+			);
 			if (affected) amountRemoved = affected;
 
 			const sharings = await EECredentials.getSharings(trx, credentialId);
 
 			// extract the new sharings that need to be added
-			newShareeIds = rightDiff(
+			newShareeIds = utils.rightDiff(
 				[sharings, (sharing) => sharing.userId],
 				[shareWithIds, (shareeId) => shareeId],
 			);
 
 			if (newShareeIds.length) {
-				await EECredentials.share(trx, credential, newShareeIds);
+				await EECredentials.share(trx, credential!, newShareeIds);
 			}
 		});
 
diff --git a/packages/cli/src/credentials/credentials.controller.ts b/packages/cli/src/credentials/credentials.controller.ts
index 3eddddc3d9..82f6bad527 100644
--- a/packages/cli/src/credentials/credentials.controller.ts
+++ b/packages/cli/src/credentials/credentials.controller.ts
@@ -2,7 +2,6 @@ import express from 'express';
 import type { INodeCredentialTestResult } from 'n8n-workflow';
 import { deepCopy } from 'n8n-workflow';
 
-import * as GenericHelpers from '@/GenericHelpers';
 import * as ResponseHelper from '@/ResponseHelper';
 import config from '@/config';
 import { EECredentialsController } from './credentials.controller.ee';
@@ -14,6 +13,9 @@ import { Container } from 'typedi';
 import { InternalHooks } from '@/InternalHooks';
 import { listQueryMiddleware } from '@/middlewares';
 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';
 
 export const credentialsController = express.Router();
 credentialsController.use('/', EECredentialsController);
@@ -36,14 +38,11 @@ credentialsController.get(
  */
 credentialsController.get(
 	'/new',
-	ResponseHelper.send(async (req: CredentialRequest.NewName): Promise<{ name: string }> => {
-		const { name: newName } = req.query;
+	ResponseHelper.send(async (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 Container.get(NamingService).getUniqueCredentialName(requestedName),
 		};
 	}),
 );
@@ -57,12 +56,15 @@ credentialsController.get(
 		const { id: credentialId } = req.params;
 		const includeDecryptedData = req.query.includeData === 'true';
 
-		const sharing = await CredentialsService.getSharing(req.user, credentialId, ['credentials']);
+		const sharing = await 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;
@@ -92,7 +94,10 @@ credentialsController.post(
 	ResponseHelper.send(async (req: CredentialRequest.Test): Promise<INodeCredentialTestResult> => {
 		const { credentials } = req.body;
 
-		const sharing = await CredentialsService.getSharing(req.user, credentials.id);
+		const sharing = await CredentialsService.getSharing(req.user, credentials.id, {
+			allowGlobalScope: true,
+			globalScope: 'credential:read',
+		});
 
 		const mergedCredentials = deepCopy(credentials);
 		if (mergedCredentials.data && sharing?.credentials) {
@@ -135,7 +140,15 @@ credentialsController.patch(
 	ResponseHelper.send(async (req: CredentialRequest.Update): Promise<ICredentialsDb> => {
 		const { id: credentialId } = req.params;
 
-		const sharing = await CredentialsService.getSharing(req.user, credentialId);
+		const sharing = await CredentialsService.getSharing(
+			req.user,
+			credentialId,
+			{
+				allowGlobalScope: true,
+				globalScope: 'credential:update',
+			},
+			['credentials', 'role'],
+		);
 
 		if (!sharing) {
 			Container.get(Logger).info(
@@ -145,11 +158,22 @@ credentialsController.patch(
 					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.name !== 'owner' && !req.user.hasGlobalScope('credential:update')) {
+			Container.get(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 decryptedData = CredentialsService.decrypt(credential);
@@ -165,9 +189,7 @@ credentialsController.patch(
 		const responseData = await 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
@@ -187,7 +209,15 @@ credentialsController.delete(
 	ResponseHelper.send(async (req: CredentialRequest.Delete) => {
 		const { id: credentialId } = req.params;
 
-		const sharing = await CredentialsService.getSharing(req.user, credentialId);
+		const sharing = await CredentialsService.getSharing(
+			req.user,
+			credentialId,
+			{
+				allowGlobalScope: true,
+				globalScope: 'credential:delete',
+			},
+			['credentials', 'role'],
+		);
 
 		if (!sharing) {
 			Container.get(Logger).info(
@@ -197,11 +227,22 @@ credentialsController.delete(
 					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.name !== 'owner' && !req.user.hasGlobalScope('credential:delete')) {
+			Container.get(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);
diff --git a/packages/cli/src/credentials/credentials.service.ee.ts b/packages/cli/src/credentials/credentials.service.ee.ts
index 94bcaa29c3..88f824b147 100644
--- a/packages/cli/src/credentials/credentials.service.ee.ts
+++ b/packages/cli/src/credentials/credentials.service.ee.ts
@@ -1,22 +1,22 @@
-import type { DeleteResult, EntityManager, FindOptionsWhere } from 'typeorm';
-import { In, Not } from 'typeorm';
-import * as Db from '@/Db';
+import type { EntityManager, FindOptionsWhere } from 'typeorm';
 import { CredentialsEntity } from '@db/entities/CredentialsEntity';
-import { SharedCredentials } from '@db/entities/SharedCredentials';
+import type { SharedCredentials } from '@db/entities/SharedCredentials';
 import type { User } from '@db/entities/User';
-import { UserService } from '@/services/user.service';
-import { CredentialsService } from './credentials.service';
+import { CredentialsService, type CredentialsGetSharedOptions } from './credentials.service';
 import { RoleService } from '@/services/role.service';
 import Container from 'typedi';
+import { SharedCredentialsRepository } from '@db/repositories/sharedCredentials.repository';
+import { UserRepository } from '@/databases/repositories/user.repository';
 
 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,
-		});
+		const sharing = await this.getSharing(user, credentialId, { allowGlobalScope: false }, [
+			'credentials',
+			'role',
+		]);
 
 		if (!sharing || sharing.role.name !== 'owner') return { ownsCredential: false };
 
@@ -31,19 +31,19 @@ export class EECredentialsService extends CredentialsService {
 	static 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 Container.get(SharedCredentialsRepository).findOne({
 			where,
 			relations,
 		});
@@ -52,38 +52,27 @@ export class EECredentialsService extends CredentialsService {
 	static async getSharings(
 		transaction: EntityManager,
 		credentialId: string,
+		relations = ['shared'],
 	): Promise<SharedCredentials[]> {
 		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);
-	}
-
 	static async share(
 		transaction: EntityManager,
 		credential: CredentialsEntity,
 		shareWithIds: string[],
 	): Promise<SharedCredentials[]> {
-		const users = await Container.get(UserService).getByIds(transaction, shareWithIds);
+		const users = await Container.get(UserRepository).getByIds(transaction, shareWithIds);
 		const role = await Container.get(RoleService).findCredentialUserRole();
 
 		const newSharedCredentials = users
 			.filter((user) => !user.isPending)
 			.map((user) =>
-				Db.collections.SharedCredentials.create({
+				Container.get(SharedCredentialsRepository).create({
 					credentialsId: credential.id,
 					userId: user.id,
 					roleId: role?.id,
diff --git a/packages/cli/src/credentials/credentials.service.ts b/packages/cli/src/credentials/credentials.service.ts
index 52d023cb22..1d720c6cd9 100644
--- a/packages/cli/src/credentials/credentials.service.ts
+++ b/packages/cli/src/credentials/credentials.service.ts
@@ -8,8 +8,9 @@ import type {
 } from 'n8n-workflow';
 import { CREDENTIAL_EMPTY_VALUE, deepCopy, NodeHelpers } from 'n8n-workflow';
 import { Container } from 'typedi';
-import type { FindManyOptions, FindOptionsWhere } from 'typeorm';
-import { In, Like } from 'typeorm';
+import type { FindOptionsWhere } from 'typeorm';
+
+import type { Scope } from '@n8n/permissions';
 
 import * as Db from '@/Db';
 import type { ICredentialsDb } from '@/Interfaces';
@@ -25,107 +26,48 @@ import { CredentialTypes } from '@/CredentialTypes';
 import { RoleService } from '@/services/role.service';
 import { OwnershipService } from '@/services/ownership.service';
 import { Logger } from '@/Logger';
+import { CredentialsRepository } from '@db/repositories/credentials.repository';
+import { SharedCredentialsRepository } from '@db/repositories/sharedCredentials.repository';
+
+export type CredentialsGetSharedOptions =
+	| { allowGlobalScope: true; globalScope: Scope }
+	| { allowGlobalScope: false };
 
 export class CredentialsService {
-	static async get(
-		where: FindOptionsWhere<ICredentialsDb>,
-		options?: { relations: string[] },
-	): Promise<ICredentialsDb | null> {
-		return Db.collections.Credentials.findOne({
+	static async get(where: FindOptionsWhere<ICredentialsDb>, options?: { relations: string[] }) {
+		return Container.get(CredentialsRepository).findOne({
 			relations: options?.relations,
 			where,
 		});
 	}
 
-	private static toFindManyOptions(listQueryOptions?: ListQuery.Options) {
-		const findManyOptions: FindManyOptions<CredentialsEntity> = {};
-
-		type Select = Array<keyof CredentialsEntity>;
-
-		const defaultRelations = ['shared', 'shared.role', 'shared.user'];
-		const defaultSelect: Select = ['id', 'name', 'type', 'nodesAccess', '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;
-	}
-
-	private static addOwnedByAndSharedWith(credentials: CredentialsEntity[]) {
-		return credentials.map((c) => Container.get(OwnershipService).addOwnedByAndSharedWith(c));
-	}
-
 	static async getMany(
 		user: User,
 		options: { listQueryOptions?: ListQuery.Options; onlyOwn?: boolean } = {},
 	) {
-		const findManyOptions = this.toFindManyOptions(options.listQueryOptions);
-
-		const returnAll = user.globalRole.name === 'owner' && !options.onlyOwn;
+		const returnAll = user.hasGlobalScope('credential:list') && !options.onlyOwn;
 		const isDefaultSelect = !options.listQueryOptions?.select;
 
 		if (returnAll) {
-			const credentials = await Db.collections.Credentials.find(findManyOptions);
+			const credentials = await Container.get(CredentialsRepository).findMany(
+				options.listQueryOptions,
+			);
 
-			return isDefaultSelect ? this.addOwnedByAndSharedWith(credentials) : credentials;
+			return isDefaultSelect
+				? credentials.map((c) => Container.get(OwnershipService).addOwnedByAndSharedWith(c))
+				: credentials;
 		}
 
-		const ids = await this.getAccessibleCredentials(user.id);
+		const ids = await Container.get(SharedCredentialsRepository).getAccessibleCredentials(user.id);
 
-		const credentials = await Db.collections.Credentials.find({
-			...findManyOptions,
-			where: { ...findManyOptions.where, id: In(ids) }, // only accessible credentials
-		});
+		const credentials = await Container.get(CredentialsRepository).findMany(
+			options.listQueryOptions,
+			ids, // only accessible credentials
+		);
 
-		return isDefaultSelect ? this.addOwnedByAndSharedWith(credentials) : credentials;
-	}
-
-	/**
-	 * Get the IDs of all credentials owned by or shared with a user.
-	 */
-	private static async getAccessibleCredentials(userId: string) {
-		const sharings = await Db.collections.SharedCredentials.find({
-			relations: ['role'],
-			where: {
-				userId,
-				role: { name: In(['owner', 'user']), scope: 'credential' },
-			},
-		});
-
-		return sharings.map((s) => s.credentialsId);
-	}
-
-	static async getManyByIds(ids: string[], { withSharings } = { withSharings: false }) {
-		const options: FindManyOptions<CredentialsEntity> = { where: { id: In(ids) } };
-
-		if (withSharings) {
-			options.relations = ['shared', 'shared.user', 'shared.role'];
-		}
-
-		return Db.collections.Credentials.find(options);
+		return isDefaultSelect
+			? credentials.map((c) => Container.get(OwnershipService).addOwnedByAndSharedWith(c))
+			: credentials;
 	}
 
 	/**
@@ -134,15 +76,15 @@ export class CredentialsService {
 	static 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)) {
 			Object.assign(where, {
 				userId: user.id,
 				role: { name: 'owner' },
@@ -152,7 +94,7 @@ export class CredentialsService {
 			}
 		}
 
-		return Db.collections.SharedCredentials.findOne({ where, relations });
+		return Container.get(SharedCredentialsRepository).findOne({ where, relations });
 	}
 
 	static async prepareCreateData(
@@ -162,7 +104,7 @@ export class CredentialsService {
 
 		// 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 = Container.get(CredentialsRepository).create(rest as ICredentialsDb);
 
 		await validateEntity(newCredentials);
 
@@ -185,7 +127,7 @@ 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 = Container.get(CredentialsRepository).create(mergedData as ICredentialsDb);
 
 		await validateEntity(updateData);
 
@@ -234,11 +176,11 @@ export class CredentialsService {
 		await Container.get(ExternalHooks).run('credentials.update', [newCredentialData]);
 
 		// Update the credentials in DB
-		await Db.collections.Credentials.update(credentialId, newCredentialData);
+		await Container.get(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 Container.get(CredentialsRepository).findOneBy({ id: credentialId });
 	}
 
 	static async save(
@@ -281,7 +223,7 @@ export class CredentialsService {
 	static async delete(credentials: CredentialsEntity): Promise<void> {
 		await Container.get(ExternalHooks).run('credentials.delete', [credentials.id]);
 
-		await Db.collections.Credentials.remove(credentials);
+		await Container.get(CredentialsRepository).remove(credentials);
 	}
 
 	static async test(
@@ -353,7 +295,6 @@ export class CredentialsService {
 		return copiedData;
 	}
 
-	// eslint-disable-next-line @typescript-eslint/no-explicit-any
 	private static unredactRestoreValues(unmerged: any, replacement: any) {
 		// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
 		for (const [key, value] of Object.entries(unmerged)) {
diff --git a/packages/cli/src/credentials/oauth2Credential.api.ts b/packages/cli/src/credentials/oauth2Credential.api.ts
deleted file mode 100644
index 6a7759df06..0000000000
--- a/packages/cli/src/credentials/oauth2Credential.api.ts
+++ /dev/null
@@ -1,333 +0,0 @@
-import type { ClientOAuth2Options } from '@n8n/client-oauth2';
-import { ClientOAuth2 } from '@n8n/client-oauth2';
-import Csrf from 'csrf';
-import express from 'express';
-import pkceChallenge from 'pkce-challenge';
-import * as qs from 'querystring';
-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 } from 'n8n-core';
-import type { WorkflowExecuteMode, INodeCredentialsDetails } from 'n8n-workflow';
-import { jsonStringify } 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 type { OAuthRequest } from '@/requests';
-import { ExternalHooks } from '@/ExternalHooks';
-import config from '@/config';
-import { getInstanceBaseUrl } from '@/UserManagement/UserManagementHelper';
-import { Container } from 'typedi';
-
-import * as WorkflowExecuteAdditionalData from '@/WorkflowExecuteAdditionalData';
-import { Logger } from '@/Logger';
-
-export const oauth2CredentialController = express.Router();
-
-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) {
-			Container.get(Logger).error('Failed to authorize OAuth2 due to lack of permissions', {
-				userId: req.user.id,
-				credentialId,
-			});
-			throw new ResponseHelper.NotFoundError(RESPONSE_ERROR_MESSAGES.NO_CREDENTIAL);
-		}
-
-		const additionalData = await WorkflowExecuteAdditionalData.getBase(req.user.id);
-
-		const credentialType = credential.type;
-
-		const mode: WorkflowExecuteMode = 'internal';
-		const timezone = config.getEnv('generic.timezone');
-		const credentialsHelper = Container.get(CredentialsHelper);
-		const decryptedDataOriginal = await credentialsHelper.getDecrypted(
-			additionalData,
-			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(
-			additionalData,
-			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 scopes = get(oauthCredentials, 'scope', 'openid') as string;
-		const oAuthOptions: ClientOAuth2Options = {
-			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(scopes, ','),
-			scopesSeparator: scopes.includes(',') ? ',' : ' ',
-			state: stateEncodedStr,
-		};
-		const authQueryParameters = get(oauthCredentials, 'authQueryParameters', '') as string;
-		if (authQueryParameters) {
-			oAuthOptions.query = qs.parse(authQueryParameters);
-		}
-
-		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.nodesAccess,
-		);
-		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;
-		}
-
-		credentials.setData(decryptedDataOriginal);
-		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);
-
-		Container.get(Logger).verbose('OAuth2 authorization url created for credential', {
-			userId: req.user.id,
-			credentialId,
-		});
-
-		return oAuthObj.code.getUri();
-	}),
-);
-
-const renderCallbackError = (res: express.Response, message: string, reason?: string) =>
-	res.render('oauth-error-callback', { error: { message, reason } });
-
-/**
- * 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';
-				Container.get(Logger).error(errorMessage, {
-					userId: req.user?.id,
-					credentialId: state.cid,
-				});
-				return renderCallbackError(res, errorMessage);
-			}
-
-			const additionalData = await WorkflowExecuteAdditionalData.getBase(state.cid);
-
-			const mode: WorkflowExecuteMode = 'internal';
-			const timezone = config.getEnv('generic.timezone');
-			const credentialsHelper = Container.get(CredentialsHelper);
-			const decryptedDataOriginal = await credentialsHelper.getDecrypted(
-				additionalData,
-				credential as INodeCredentialsDetails,
-				credential.type,
-				mode,
-				timezone,
-				true,
-			);
-			const oauthCredentials = credentialsHelper.applyDefaultsAndOverwrites(
-				additionalData,
-				decryptedDataOriginal,
-				credential.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!';
-				Container.get(Logger).debug(errorMessage, {
-					userId: req.user?.id,
-					credentialId: state.cid,
-				});
-				return renderCallbackError(res, errorMessage);
-			}
-
-			let options: Partial<ClientOAuth2Options> = {};
-
-			const scopes = get(oauthCredentials, 'scope', 'openid') as string;
-			const oAuth2Parameters: ClientOAuth2Options = {
-				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(scopes, ','),
-				scopesSeparator: scopes.includes(',') ? ',' : ' ',
-				ignoreSSLIssues: get(oauthCredentials, 'ignoreSSLIssues') as boolean,
-			};
-
-			if (oauthCredentials.grantType === 'pkce') {
-				options = {
-					body: { code_verifier: decryptedDataOriginal.codeVerifier },
-				};
-			} else if ((get(oauthCredentials, 'authentication', 'header') as string) === 'body') {
-				options = {
-					body: {
-						client_id: get(oauthCredentials, 'clientId') as string,
-						client_secret: get(oauthCredentials, 'clientSecret', '') as string,
-					},
-				};
-				// @ts-ignore
-				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 as string}?${queryParameters}`,
-				// @ts-ignore
-				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!';
-				Container.get(Logger).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;
-			}
-
-			unset(decryptedDataOriginal, 'csrfSecret');
-
-			const credentials = new Credentials(
-				credential as INodeCredentialsDetails,
-				credential.type,
-				credential.nodesAccess,
-			);
-			credentials.setData(decryptedDataOriginal);
-			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);
-			Container.get(Logger).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,
-				// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-				'body' in error ? jsonStringify(error.body) : undefined,
-			);
-		}
-	},
-);
diff --git a/packages/cli/src/databases/config.ts b/packages/cli/src/databases/config.ts
index 1354fca0eb..881b50b3c9 100644
--- a/packages/cli/src/databases/config.ts
+++ b/packages/cli/src/databases/config.ts
@@ -61,6 +61,7 @@ export const getPostgresConnectionOptions = (): PostgresConnectionOptions => ({
 	type: 'postgres',
 	...getDBConnectionOptions('postgresdb'),
 	schema: config.getEnv('database.postgresdb.schema'),
+	poolSize: config.getEnv('database.postgresdb.poolSize'),
 	migrations: postgresMigrations,
 });
 
diff --git a/packages/cli/src/databases/dsl/Indices.ts b/packages/cli/src/databases/dsl/Indices.ts
index d07c6db558..384cbb0b8a 100644
--- a/packages/cli/src/databases/dsl/Indices.ts
+++ b/packages/cli/src/databases/dsl/Indices.ts
@@ -1,4 +1,5 @@
-import { QueryRunner, TableIndex } from 'typeorm';
+import type { QueryRunner } from 'typeorm';
+import { TableIndex } from 'typeorm';
 import LazyPromise from 'p-lazy';
 
 abstract class IndexOperation extends LazyPromise<void> {
diff --git a/packages/cli/src/databases/dsl/Table.ts b/packages/cli/src/databases/dsl/Table.ts
index d58defeb61..e132042749 100644
--- a/packages/cli/src/databases/dsl/Table.ts
+++ b/packages/cli/src/databases/dsl/Table.ts
@@ -1,7 +1,8 @@
-import type { TableForeignKeyOptions, TableIndexOptions } from 'typeorm';
-import { Table, QueryRunner, TableColumn } from 'typeorm';
+import type { TableForeignKeyOptions, TableIndexOptions, QueryRunner } from 'typeorm';
+import { Table, TableColumn } from '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>;
@@ -131,7 +132,7 @@ class ModifyNotNull extends TableOperation {
 	async execute(queryRunner: QueryRunner) {
 		const { tableName, prefix, columnName, isNullable } = this;
 		const table = await queryRunner.getTable(`${prefix}${tableName}`);
-		if (!table) throw new Error(`No table found with the name ${tableName}`);
+		if (!table) throw new ApplicationError('No table found', { extra: { tableName } });
 		const oldColumn = table.findColumnByName(columnName)!;
 		const newColumn = oldColumn.clone();
 		newColumn.isNullable = isNullable;
diff --git a/packages/cli/src/databases/entities/AbstractEntity.ts b/packages/cli/src/databases/entities/AbstractEntity.ts
index ca1881c2be..3c64a43aef 100644
--- a/packages/cli/src/databases/entities/AbstractEntity.ts
+++ b/packages/cli/src/databases/entities/AbstractEntity.ts
@@ -7,6 +7,7 @@ import {
 	UpdateDateColumn,
 } from 'typeorm';
 import config from '@/config';
+import type { Class } from 'n8n-core';
 import { generateNanoId } from '../utils/generators';
 
 const dbType = config.getEnv('database.type');
@@ -27,9 +28,7 @@ const tsColumnOptions: ColumnOptions = {
 	type: datetimeColumnType,
 };
 
-type Constructor<T> = new (...args: any[]) => T;
-
-function mixinStringId<T extends Constructor<{}>>(base: T) {
+function mixinStringId<T extends Class<{}, any[]>>(base: T) {
 	class Derived extends base {
 		@PrimaryColumn('varchar')
 		id: string;
@@ -44,7 +43,7 @@ function mixinStringId<T extends Constructor<{}>>(base: T) {
 	return Derived;
 }
 
-function mixinTimestamps<T extends Constructor<{}>>(base: T) {
+function mixinTimestamps<T extends Class<{}, any[]>>(base: T) {
 	class Derived extends base {
 		@CreateDateColumn(tsColumnOptions)
 		createdAt: Date;
@@ -61,7 +60,7 @@ function mixinTimestamps<T extends Constructor<{}>>(base: T) {
 }
 
 class BaseEntity {}
-/* eslint-disable @typescript-eslint/naming-convention */
+
 export const WithStringId = mixinStringId(BaseEntity);
 export const WithTimestamps = mixinTimestamps(BaseEntity);
 export const WithTimestampsAndStringId = mixinStringId(WithTimestamps);
diff --git a/packages/cli/src/databases/entities/Role.ts b/packages/cli/src/databases/entities/Role.ts
index 7d5e287307..070e8e6be8 100644
--- a/packages/cli/src/databases/entities/Role.ts
+++ b/packages/cli/src/databases/entities/Role.ts
@@ -7,7 +7,7 @@ import type { SharedCredentials } from './SharedCredentials';
 import { WithTimestamps } from './AbstractEntity';
 import { idStringifier } from '../utils/transformers';
 
-export type RoleNames = 'owner' | 'member' | 'user' | 'editor';
+export type RoleNames = 'owner' | 'member' | 'user' | 'editor' | 'admin';
 export type RoleScopes = 'global' | 'workflow' | 'credential';
 
 @Entity()
diff --git a/packages/cli/src/databases/entities/User.ts b/packages/cli/src/databases/entities/User.ts
index a32c9f2dc0..974315cc08 100644
--- a/packages/cli/src/databases/entities/User.ts
+++ b/packages/cli/src/databases/entities/User.ts
@@ -20,10 +20,14 @@ import { objectRetriever, lowerCaser } from '../utils/transformers';
 import { WithTimestamps, jsonColumnType } from './AbstractEntity';
 import type { IPersonalizationSurveyAnswers } from '@/Interfaces';
 import type { AuthIdentity } from './AuthIdentity';
+import { ownerPermissions, memberPermissions, adminPermissions } from '@/permissions/roles';
+import { hasScope, type ScopeOptions, type Scope } from '@n8n/permissions';
 
-export const MIN_PASSWORD_LENGTH = 8;
-
-export const MAX_PASSWORD_LENGTH = 64;
+const STATIC_SCOPE_MAP: Record<string, Scope[]> = {
+	owner: ownerPermissions,
+	member: memberPermissions,
+	admin: adminPermissions,
+};
 
 @Entity()
 export class User extends WithTimestamps implements IUser {
@@ -125,4 +129,18 @@ export class User extends WithTimestamps implements IUser {
 	computeIsOwner(): void {
 		this.isOwner = this.globalRole?.name === 'owner';
 	}
+
+	get globalScopes() {
+		return STATIC_SCOPE_MAP[this.globalRole?.name] ?? [];
+	}
+
+	hasGlobalScope(scope: Scope | Scope[], scopeOptions?: ScopeOptions): boolean {
+		return hasScope(
+			scope,
+			{
+				global: this.globalScopes,
+			},
+			scopeOptions,
+		);
+	}
 }
diff --git a/packages/cli/src/databases/entities/WebhookEntity.ts b/packages/cli/src/databases/entities/WebhookEntity.ts
index 6527a7be30..89b863d427 100644
--- a/packages/cli/src/databases/entities/WebhookEntity.ts
+++ b/packages/cli/src/databases/entities/WebhookEntity.ts
@@ -23,10 +23,12 @@ export class WebhookEntity {
 	pathLength?: number;
 
 	/**
-	 * Unique section of production webhook path, appended to `${instanceUrl}/webhook/`.
-	 * - Example for static UUID webhook: `87dd035f-9606-47b7-b443-8b675fe25719`
-	 * - Example for static user-defined webhook: `user/:id/posts`
-	 * - Example for dynamic webhook: `7e0e2b2a-19ba-4a6c-b452-4b46c0e11749/user/:id/posts`
+	 * 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(':')
diff --git a/packages/cli/src/databases/entities/WorkflowEntity.ts b/packages/cli/src/databases/entities/WorkflowEntity.ts
index 5b0f5f29eb..332b71ecd5 100644
--- a/packages/cli/src/databases/entities/WorkflowEntity.ts
+++ b/packages/cli/src/databases/entities/WorkflowEntity.ts
@@ -89,6 +89,10 @@ export class WorkflowEntity extends WithTimestampsAndStringId implements IWorkfl
 
 	@Column({ default: 0 })
 	triggerCount: number;
+
+	display() {
+		return `"${this.name}" (ID: ${this.id})`;
+	}
 }
 
 /**
diff --git a/packages/cli/src/databases/migrations/common/1620821879465-UniqueWorkflowNames.ts b/packages/cli/src/databases/migrations/common/1620821879465-UniqueWorkflowNames.ts
index 61569b6cdf..15a8063ef4 100644
--- a/packages/cli/src/databases/migrations/common/1620821879465-UniqueWorkflowNames.ts
+++ b/packages/cli/src/databases/migrations/common/1620821879465-UniqueWorkflowNames.ts
@@ -20,11 +20,10 @@ export class UniqueWorkflowNames1620821879465 implements ReversibleMigration {
 				await Promise.all(
 					duplicates.map(async (workflow, index) => {
 						if (index === 0) return;
-						return runQuery(
-							`UPDATE ${tableName} SET name = :name WHERE id = :id`,
-							{ name: `${workflow.name} ${index + 1}` },
-							{ id: workflow.id },
-						);
+						return runQuery(`UPDATE ${tableName} SET name = :name WHERE id = :id`, {
+							name: `${workflow.name} ${index + 1}`,
+							id: workflow.id,
+						});
 					}),
 				);
 			}
diff --git a/packages/cli/src/databases/migrations/common/1630330987096-UpdateWorkflowCredentials.ts b/packages/cli/src/databases/migrations/common/1630330987096-UpdateWorkflowCredentials.ts
index 2a189cd06b..e8de8dd9fc 100644
--- a/packages/cli/src/databases/migrations/common/1630330987096-UpdateWorkflowCredentials.ts
+++ b/packages/cli/src/databases/migrations/common/1630330987096-UpdateWorkflowCredentials.ts
@@ -42,11 +42,10 @@ export class UpdateWorkflowCredentials1630330987096 implements ReversibleMigrati
 					}
 				});
 				if (credentialsUpdated) {
-					await runQuery(
-						`UPDATE ${workflowsTable} SET nodes = :nodes WHERE id = :id`,
-						{ nodes: JSON.stringify(nodes) },
-						{ id: workflow.id },
-					);
+					await runQuery(`UPDATE ${workflowsTable} SET nodes = :nodes WHERE id = :id`, {
+						nodes: JSON.stringify(nodes),
+						id: workflow.id,
+					});
 				}
 			});
 		});
@@ -79,8 +78,7 @@ export class UpdateWorkflowCredentials1630330987096 implements ReversibleMigrati
 					await runQuery(
 						`UPDATE ${executionsTable}
 						 SET ${escape.columnName('workflowData')} = :data WHERE id = :id`,
-						{ data: JSON.stringify(workflowData) },
-						{ id: execution.id },
+						{ data: JSON.stringify(workflowData), id: execution.id },
 					);
 				}
 			});
@@ -114,8 +112,7 @@ export class UpdateWorkflowCredentials1630330987096 implements ReversibleMigrati
 				await runQuery(
 					`UPDATE ${executionsTable}
 					 SET ${escape.columnName('workflowData')} = :data WHERE id = :id`,
-					{ data: JSON.stringify(workflowData) },
-					{ id: execution.id },
+					{ data: JSON.stringify(workflowData), id: execution.id },
 				);
 			}
 		});
@@ -160,11 +157,10 @@ export class UpdateWorkflowCredentials1630330987096 implements ReversibleMigrati
 					}
 				});
 				if (credentialsUpdated) {
-					await runQuery(
-						`UPDATE ${workflowsTable} SET nodes = :nodes WHERE id = :id`,
-						{ nodes: JSON.stringify(nodes) },
-						{ id: workflow.id },
-					);
+					await runQuery(`UPDATE ${workflowsTable} SET nodes = :nodes WHERE id = :id`, {
+						nodes: JSON.stringify(nodes),
+						id: workflow.id,
+					});
 				}
 			});
 		});
@@ -206,8 +202,7 @@ export class UpdateWorkflowCredentials1630330987096 implements ReversibleMigrati
 					await runQuery(
 						`UPDATE ${executionsTable}
 						 SET ${escape.columnName('workflowData')} = :data WHERE id = :id`,
-						{ data: JSON.stringify(workflowData) },
-						{ id: execution.id },
+						{ data: JSON.stringify(workflowData), id: execution.id },
 					);
 				}
 			});
@@ -249,8 +244,7 @@ export class UpdateWorkflowCredentials1630330987096 implements ReversibleMigrati
 				await runQuery(
 					`UPDATE ${executionsTable}
 					 SET ${escape.columnName('workflowData')} = :data WHERE id = :id`,
-					{ data: JSON.stringify(workflowData) },
-					{ id: execution.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
index d67da73990..84f1218e98 100644
--- a/packages/cli/src/databases/migrations/common/1658930531669-AddNodeIds.ts
+++ b/packages/cli/src/databases/migrations/common/1658930531669-AddNodeIds.ts
@@ -18,11 +18,10 @@ export class AddNodeIds1658930531669 implements ReversibleMigration {
 					}
 				});
 
-				await runQuery(
-					`UPDATE ${tableName} SET nodes = :nodes WHERE id = :id`,
-					{ nodes: JSON.stringify(nodes) },
-					{ id: workflow.id },
-				);
+				await runQuery(`UPDATE ${tableName} SET nodes = :nodes WHERE id = :id`, {
+					nodes: JSON.stringify(nodes),
+					id: workflow.id,
+				});
 			});
 		});
 	}
@@ -33,11 +32,10 @@ export class AddNodeIds1658930531669 implements ReversibleMigration {
 		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 },
-				);
+				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/1669739707124-AddWorkflowVersionIdColumn.ts b/packages/cli/src/databases/migrations/common/1669739707124-AddWorkflowVersionIdColumn.ts
index 12f4a0e06f..004af7d2df 100644
--- a/packages/cli/src/databases/migrations/common/1669739707124-AddWorkflowVersionIdColumn.ts
+++ b/packages/cli/src/databases/migrations/common/1669739707124-AddWorkflowVersionIdColumn.ts
@@ -12,11 +12,10 @@ export class AddWorkflowVersionIdColumn1669739707124 implements ReversibleMigrat
 
 		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 },
-			);
+			await runQuery(`UPDATE ${tableName} SET ${columnName} = :versionId WHERE id = :id`, {
+				versionId: uuidv4(),
+				id,
+			});
 		}
 	}
 
diff --git a/packages/cli/src/databases/migrations/common/1674509946020-CreateLdapEntities.ts b/packages/cli/src/databases/migrations/common/1674509946020-CreateLdapEntities.ts
index eaa0f17897..a5e6375c72 100644
--- a/packages/cli/src/databases/migrations/common/1674509946020-CreateLdapEntities.ts
+++ b/packages/cli/src/databases/migrations/common/1674509946020-CreateLdapEntities.ts
@@ -29,15 +29,15 @@ export class CreateLdapEntities1674509946020 implements ReversibleMigration {
 			dbType === 'sqlite'
 				? 'INTEGER PRIMARY KEY AUTOINCREMENT'
 				: dbType === 'postgresdb'
-				? 'SERIAL NOT NULL PRIMARY KEY'
-				: 'INTEGER NOT NULL AUTO_INCREMENT';
+				  ? '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';
+				  ? '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')} (
diff --git a/packages/cli/src/databases/migrations/common/1675940580449-PurgeInvalidWorkflowConnections.ts b/packages/cli/src/databases/migrations/common/1675940580449-PurgeInvalidWorkflowConnections.ts
index 44f7fe4689..a15c873d36 100644
--- a/packages/cli/src/databases/migrations/common/1675940580449-PurgeInvalidWorkflowConnections.ts
+++ b/packages/cli/src/databases/migrations/common/1675940580449-PurgeInvalidWorkflowConnections.ts
@@ -47,11 +47,10 @@ export class PurgeInvalidWorkflowConnections1675940580449 implements Irreversibl
 				});
 
 				// Update database with new connections
-				return runQuery(
-					`UPDATE ${workflowsTable} SET connections = :connections WHERE id = :id`,
-					{ connections: JSON.stringify(connections) },
-					{ id: workflow.id },
-				);
+				return 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/1700571993961-AddGlobalAdminRole.ts b/packages/cli/src/databases/migrations/common/1700571993961-AddGlobalAdminRole.ts
new file mode 100644
index 0000000000..c9077d79a0
--- /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/mysqldb/index.ts b/packages/cli/src/databases/migrations/mysqldb/index.ts
index 8dbc688895..66effc584b 100644
--- a/packages/cli/src/databases/migrations/mysqldb/index.ts
+++ b/packages/cli/src/databases/migrations/mysqldb/index.ts
@@ -50,6 +50,7 @@ import { DisallowOrphanExecutions1693554410387 } from '../common/1693554410387-D
 import { ExecutionSoftDelete1693491613982 } from '../common/1693491613982-ExecutionSoftDelete';
 import { AddWorkflowMetadata1695128658538 } from '../common/1695128658538-AddWorkflowMetadata';
 import { ModifyWorkflowHistoryNodesAndConnections1695829275184 } from '../common/1695829275184-ModifyWorkflowHistoryNodesAndConnections';
+import { AddGlobalAdminRole1700571993961 } from '../common/1700571993961-AddGlobalAdminRole';
 
 export const mysqlMigrations: Migration[] = [
 	InitialMigration1588157391238,
@@ -103,4 +104,5 @@ export const mysqlMigrations: Migration[] = [
 	ExecutionSoftDelete1693491613982,
 	AddWorkflowMetadata1695128658538,
 	ModifyWorkflowHistoryNodesAndConnections1695829275184,
+	AddGlobalAdminRole1700571993961,
 ];
diff --git a/packages/cli/src/databases/migrations/postgresdb/index.ts b/packages/cli/src/databases/migrations/postgresdb/index.ts
index f827b91390..6af140bd08 100644
--- a/packages/cli/src/databases/migrations/postgresdb/index.ts
+++ b/packages/cli/src/databases/migrations/postgresdb/index.ts
@@ -49,6 +49,7 @@ import { ExecutionSoftDelete1693491613982 } from '../common/1693491613982-Execut
 import { AddWorkflowMetadata1695128658538 } from '../common/1695128658538-AddWorkflowMetadata';
 import { MigrateToTimestampTz1694091729095 } from './1694091729095-MigrateToTimestampTz';
 import { ModifyWorkflowHistoryNodesAndConnections1695829275184 } from '../common/1695829275184-ModifyWorkflowHistoryNodesAndConnections';
+import { AddGlobalAdminRole1700571993961 } from '../common/1700571993961-AddGlobalAdminRole';
 
 export const postgresMigrations: Migration[] = [
 	InitialMigration1587669153312,
@@ -101,4 +102,5 @@ export const postgresMigrations: Migration[] = [
 	AddWorkflowMetadata1695128658538,
 	MigrateToTimestampTz1694091729095,
 	ModifyWorkflowHistoryNodesAndConnections1695829275184,
+	AddGlobalAdminRole1700571993961,
 ];
diff --git a/packages/cli/src/databases/migrations/sqlite/1690000000002-MigrateIntegerKeysToString.ts b/packages/cli/src/databases/migrations/sqlite/1690000000002-MigrateIntegerKeysToString.ts
index 48dfc3ad46..83b55787b2 100644
--- a/packages/cli/src/databases/migrations/sqlite/1690000000002-MigrateIntegerKeysToString.ts
+++ b/packages/cli/src/databases/migrations/sqlite/1690000000002-MigrateIntegerKeysToString.ts
@@ -208,20 +208,24 @@ const pruneExecutionsData = async ({ queryRunner, tablePrefix, logger }: Migrati
 		}
 
 		console.time('pruningData');
-		const counting = (await queryRunner.query(
-			`select count(id) as rows from "${tablePrefix}execution_entity";`,
-		)) as Array<{ rows: number }>;
+		const [{ rowCount }] = (await queryRunner.query(
+			`select count(id) as rowCount from "${tablePrefix}execution_entity";`,
+		)) as Array<{ rowCount: number }>;
 
-		const averageExecutionSize = dbFileSize / counting[0].rows;
-		const numberOfExecutionsToKeep = Math.floor(DESIRED_DATABASE_FILE_SIZE / averageExecutionSize);
+		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 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);
+			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/index.ts b/packages/cli/src/databases/migrations/sqlite/index.ts
index 024c3bbc79..d92a567bce 100644
--- a/packages/cli/src/databases/migrations/sqlite/index.ts
+++ b/packages/cli/src/databases/migrations/sqlite/index.ts
@@ -47,6 +47,7 @@ import { DisallowOrphanExecutions1693554410387 } from '../common/1693554410387-D
 import { ExecutionSoftDelete1693491613982 } from './1693491613982-ExecutionSoftDelete';
 import { AddWorkflowMetadata1695128658538 } from '../common/1695128658538-AddWorkflowMetadata';
 import { ModifyWorkflowHistoryNodesAndConnections1695829275184 } from '../common/1695829275184-ModifyWorkflowHistoryNodesAndConnections';
+import { AddGlobalAdminRole1700571993961 } from '../common/1700571993961-AddGlobalAdminRole';
 
 const sqliteMigrations: Migration[] = [
 	InitialMigration1588102412422,
@@ -97,6 +98,7 @@ const sqliteMigrations: Migration[] = [
 	ExecutionSoftDelete1693491613982,
 	AddWorkflowMetadata1695128658538,
 	ModifyWorkflowHistoryNodesAndConnections1695829275184,
+	AddGlobalAdminRole1700571993961,
 ];
 
 export { sqliteMigrations };
diff --git a/packages/cli/src/databases/repositories/credentials.repository.ts b/packages/cli/src/databases/repositories/credentials.repository.ts
index 43bc18dfb1..f596f79ae5 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 'typeorm';
+import type { FindManyOptions, DeleteResult, EntityManager, FindOptionsWhere } from '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 transaction.delete(SharedCredentials, conditions);
+	}
+
+	async findStartingWith(credentialName: string) {
+		return 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 this.find(findManyOptions);
+	}
+
+	private toFindManyOptions(listQueryOptions?: ListQuery.Options) {
+		const findManyOptions: FindManyOptions<CredentialsEntity> = {};
+
+		type Select = Array<keyof CredentialsEntity>;
+
+		const defaultRelations = ['shared', 'shared.role', 'shared.user'];
+		const defaultSelect: Select = ['id', 'name', 'type', 'nodesAccess', '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', 'shared.role'];
+		}
+
+		return this.find(findManyOptions);
+	}
 }
diff --git a/packages/cli/src/databases/repositories/execution.repository.ts b/packages/cli/src/databases/repositories/execution.repository.ts
index a6f0387405..8021433f3b 100644
--- a/packages/cli/src/databases/repositories/execution.repository.ts
+++ b/packages/cli/src/databases/repositories/execution.repository.ts
@@ -2,11 +2,11 @@ import { Service } from 'typedi';
 import {
 	Brackets,
 	DataSource,
-	Not,
 	In,
 	IsNull,
 	LessThanOrEqual,
 	MoreThanOrEqual,
+	Not,
 	Repository,
 } from 'typeorm';
 import { DateUtils } from 'typeorm/util/DateUtils';
@@ -17,7 +17,12 @@ import type {
 	SelectQueryBuilder,
 } from 'typeorm';
 import { parse, stringify } from 'flatted';
-import type { IExecutionsSummary, IRunExecutionData } from 'n8n-workflow';
+import {
+	ApplicationError,
+	type ExecutionStatus,
+	type IExecutionsSummary,
+	type IRunExecutionData,
+} from 'n8n-workflow';
 import { BinaryDataService } from 'n8n-core';
 import type {
 	ExecutionPayload,
@@ -33,7 +38,6 @@ import type { ExecutionData } from '../entities/ExecutionData';
 import { ExecutionEntity } from '../entities/ExecutionEntity';
 import { ExecutionMetadata } from '../entities/ExecutionMetadata';
 import { ExecutionDataRepository } from './executionData.repository';
-import { TIME, inTest } from '@/constants';
 import { Logger } from '@/Logger';
 
 function parseFiltersToQueryBuilder(
@@ -79,19 +83,6 @@ function parseFiltersToQueryBuilder(
 export class ExecutionRepository extends Repository<ExecutionEntity> {
 	private hardDeletionBatchSize = 100;
 
-	private rates: Record<string, number> = {
-		softDeletion: config.getEnv('executions.pruneDataIntervals.softDelete') * TIME.MINUTE,
-		hardDeletion: config.getEnv('executions.pruneDataIntervals.hardDelete') * TIME.MINUTE,
-	};
-
-	private softDeletionInterval: NodeJS.Timer | undefined;
-
-	private hardDeletionTimeout: NodeJS.Timeout | undefined;
-
-	private isMainInstance = config.get('generic.instanceType') === 'main';
-
-	private isPruningEnabled = config.getEnv('executions.pruneData');
-
 	constructor(
 		dataSource: DataSource,
 		private readonly logger: Logger,
@@ -99,43 +90,6 @@ export class ExecutionRepository extends Repository<ExecutionEntity> {
 		private readonly binaryDataService: BinaryDataService,
 	) {
 		super(ExecutionEntity, dataSource.manager);
-
-		if (!this.isMainInstance || inTest) return;
-
-		if (this.isPruningEnabled) this.setSoftDeletionInterval();
-
-		this.scheduleHardDeletion();
-	}
-
-	clearTimers() {
-		if (!this.isMainInstance) return;
-
-		this.logger.debug('Clearing soft-deletion interval and hard-deletion timeout (pruning cycle)');
-
-		clearInterval(this.softDeletionInterval);
-		clearTimeout(this.hardDeletionTimeout);
-	}
-
-	setSoftDeletionInterval(rateMs = this.rates.softDeletion) {
-		const when = [(rateMs / TIME.MINUTE).toFixed(2), 'min'].join(' ');
-
-		this.logger.debug(`Setting soft-deletion interval at every ${when} (pruning cycle)`);
-
-		this.softDeletionInterval = setInterval(
-			async () => this.softDeleteOnPruningCycle(),
-			this.rates.softDeletion,
-		);
-	}
-
-	scheduleHardDeletion(rateMs = this.rates.hardDeletion) {
-		const when = [(rateMs / TIME.MINUTE).toFixed(2), 'min'].join(' ');
-
-		this.logger.debug(`Scheduling hard-deletion for next ${when} (pruning cycle)`);
-
-		this.hardDeletionTimeout = setTimeout(
-			async () => this.hardDeleteOnPruningCycle(),
-			this.rates.hardDeletion,
-		);
 	}
 
 	async findMultipleExecutions(
@@ -233,17 +187,17 @@ export class ExecutionRepository extends Repository<ExecutionEntity> {
 			where?: FindOptionsWhere<ExecutionEntity>;
 		},
 	): Promise<IExecutionFlattedDb | IExecutionResponse | IExecutionBase | undefined> {
-		const whereClause: FindOneOptions<ExecutionEntity> = {
+		const findOptions: FindOneOptions<ExecutionEntity> = {
 			where: {
 				id,
 				...options?.where,
 			},
 		};
 		if (options?.includeData) {
-			whereClause.relations = ['executionData'];
+			findOptions.relations = ['executionData'];
 		}
 
-		const execution = await this.findOne(whereClause);
+		const execution = await this.findOne(findOptions);
 
 		if (!execution) {
 			return undefined;
@@ -268,17 +222,17 @@ export class ExecutionRepository extends Repository<ExecutionEntity> {
 		return rest;
 	}
 
-	async createNewExecution(execution: ExecutionPayload) {
+	async createNewExecution(execution: ExecutionPayload): Promise<string> {
 		const { data, workflowData, ...rest } = execution;
-
-		const newExecution = await this.save(rest);
-		await this.executionDataRepository.save({
-			execution: newExecution,
-			workflowData,
+		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 newExecution;
+		return String(executionId);
 	}
 
 	async markAsCrashed(executionIds: string[]) {
@@ -298,11 +252,15 @@ export class ExecutionRepository extends Repository<ExecutionEntity> {
 		return 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, workflowData, startedAt, ...executionInformation } = execution;
+		const { id, data, workflowId, workflowData, startedAt, ...executionInformation } = execution;
 		if (Object.keys(executionInformation).length > 0) {
 			await this.update({ id: executionId }, executionInformation);
 		}
@@ -324,10 +282,10 @@ export class ExecutionRepository extends Repository<ExecutionEntity> {
 		filters: IGetExecutionsQueryFilter | undefined,
 		accessibleWorkflowIds: string[],
 		currentlyRunningExecutions: string[],
-		isOwner: boolean,
+		hasGlobalRead: boolean,
 	): Promise<{ count: number; estimated: boolean }> {
 		const dbType = config.getEnv('database.type');
-		if (dbType !== 'postgresdb' || (filters && Object.keys(filters).length > 0) || !isOwner) {
+		if (dbType !== 'postgresdb' || (filters && Object.keys(filters).length > 0) || !hasGlobalRead) {
 			const query = this.createQueryBuilder('execution').andWhere(
 				'execution.workflowId IN (:...accessibleWorkflowIds)',
 				{ accessibleWorkflowIds },
@@ -437,7 +395,9 @@ export class ExecutionRepository extends Repository<ExecutionEntity> {
 		},
 	) {
 		if (!deleteConditions?.deleteBefore && !deleteConditions?.ids) {
-			throw new Error('Either "deleteBefore" or "ids" must be present in the request body');
+			throw new ApplicationError(
+				'Either "deleteBefore" or "ids" must be present in the request body',
+			);
 		}
 
 		const query = this.createQueryBuilder('execution')
@@ -475,12 +435,16 @@ export class ExecutionRepository extends Repository<ExecutionEntity> {
 		} while (executionIds.length > 0);
 	}
 
-	/**
-	 * Mark executions as deleted based on age and count, in a pruning cycle.
-	 */
-	async softDeleteOnPruningCycle() {
-		this.logger.debug('Starting soft-deletion of executions (pruning cycle)');
+	async getIdsSince(date: Date) {
+		return 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');
 
@@ -508,7 +472,7 @@ export class ExecutionRepository extends Repository<ExecutionEntity> {
 
 		const [timeBasedWhere, countBasedWhere] = toPrune;
 
-		const result = await this.createQueryBuilder()
+		return this.createQueryBuilder()
 			.update(ExecutionEntity)
 			.set({ deletedAt: new Date() })
 			.where({
@@ -524,16 +488,9 @@ export class ExecutionRepository extends Repository<ExecutionEntity> {
 				),
 			)
 			.execute();
-
-		if (result.affected === 0) {
-			this.logger.debug('Found no executions to soft-delete (pruning cycle)');
-		}
 	}
 
-	/**
-	 * Permanently remove all soft-deleted executions and their binary data, in a pruning cycle.
-	 */
-	private async hardDeleteOnPruningCycle() {
+	async hardDeleteSoftDeletedExecutions() {
 		const date = new Date();
 		date.setHours(date.getHours() - config.getEnv('executions.pruneDataHardDeleteBuffer'));
 
@@ -553,36 +510,34 @@ export class ExecutionRepository extends Repository<ExecutionEntity> {
 			})
 		).map(({ id: executionId, workflowId }) => ({ workflowId, executionId }));
 
-		const executionIds = workflowIdsAndExecutionIds.map((o) => o.executionId);
+		return workflowIdsAndExecutionIds;
+	}
 
-		if (executionIds.length === 0) {
-			this.logger.debug('Found no executions to hard-delete (pruning cycle)');
-			this.scheduleHardDeletion();
-			return;
+	async deleteByIds(executionIds: string[]) {
+		return 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));
 		}
 
-		try {
-			this.logger.debug('Starting hard-deletion of executions (pruning cycle)', {
-				executionIds,
-			});
-
-			await this.binaryDataService.deleteMany(workflowIdsAndExecutionIds);
-
-			await this.delete({ id: In(executionIds) });
-		} catch (error) {
-			this.logger.error('Failed to hard-delete executions (pruning cycle)', {
-				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;
-		const rate = isHighVolume ? 1 * TIME.SECOND : this.rates.hardDeletion;
-
-		this.scheduleHardDeletion(rate);
+		return this.findMultipleExecutions({
+			select: ['id', 'waitTill'],
+			where,
+			order: {
+				waitTill: 'ASC',
+			},
+		});
 	}
 }
diff --git a/packages/cli/src/databases/repositories/executionData.repository.ts b/packages/cli/src/databases/repositories/executionData.repository.ts
index 869267b86a..e0b49de7ef 100644
--- a/packages/cli/src/databases/repositories/executionData.repository.ts
+++ b/packages/cli/src/databases/repositories/executionData.repository.ts
@@ -1,5 +1,5 @@
 import { Service } from 'typedi';
-import { DataSource, Repository } from 'typeorm';
+import { DataSource, In, Repository } from 'typeorm';
 import { ExecutionData } from '../entities/ExecutionData';
 
 @Service()
@@ -7,4 +7,13 @@ export class ExecutionDataRepository extends Repository<ExecutionData> {
 	constructor(dataSource: DataSource) {
 		super(ExecutionData, dataSource.manager);
 	}
+
+	async findByExecutionIds(executionIds: string[]) {
+		return this.find({
+			select: ['workflowData'],
+			where: {
+				executionId: In(executionIds),
+			},
+		}).then((executionData) => executionData.map(({ workflowData }) => workflowData));
+	}
 }
diff --git a/packages/cli/src/databases/repositories/index.ts b/packages/cli/src/databases/repositories/index.ts
deleted file mode 100644
index 5fc7499caf..0000000000
--- a/packages/cli/src/databases/repositories/index.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-export { AuthIdentityRepository } from './authIdentity.repository';
-export { AuthProviderSyncHistoryRepository } from './authProviderSyncHistory.repository';
-export { CredentialsRepository } from './credentials.repository';
-export { EventDestinationsRepository } from './eventDestinations.repository';
-export { ExecutionDataRepository } from './executionData.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 { WorkflowHistoryRepository } from './workflowHistory.repository';
-export { WorkflowRepository } from './workflow.repository';
-export { WorkflowStatisticsRepository } from './workflowStatistics.repository';
-export { WorkflowTagMappingRepository } from './workflowTagMapping.repository';
diff --git a/packages/cli/src/databases/repositories/role.repository.ts b/packages/cli/src/databases/repositories/role.repository.ts
index a78efadf10..9694ec1033 100644
--- a/packages/cli/src/databases/repositories/role.repository.ts
+++ b/packages/cli/src/databases/repositories/role.repository.ts
@@ -1,7 +1,8 @@
 import { Service } from 'typedi';
-import { DataSource, Repository } from 'typeorm';
+import { DataSource, In, Repository } from 'typeorm';
 import type { RoleNames, RoleScopes } from '../entities/Role';
 import { Role } from '../entities/Role';
+import { User } from '../entities/User';
 
 @Service()
 export class RoleRepository extends Repository<Role> {
@@ -12,4 +13,30 @@ export class RoleRepository extends Repository<Role> {
 	async findRole(scope: RoleScopes, name: RoleNames) {
 		return this.findOne({ where: { scope, name } });
 	}
+
+	/**
+	 * Counts the number of users in each role, e.g. `{ admin: 2, member: 6, owner: 1 }`
+	 */
+	async countUsersByRole() {
+		type Row = { role_name: string; count: number | string };
+
+		const rows: Row[] = await this.createQueryBuilder('role')
+			.select('role.name')
+			.addSelect('COUNT(user.id)', 'count')
+			.innerJoin(User, 'user', 'role.id = user.globalRoleId')
+			.groupBy('role.name')
+			.getRawMany();
+
+		return rows.reduce<Record<string, number>>((acc, item) => {
+			acc[item.role_name] = typeof item.count === 'number' ? item.count : parseInt(item.count, 10);
+			return acc;
+		}, {});
+	}
+
+	async getIdsInScopeWorkflowByNames(roleNames: RoleNames[]) {
+		return this.find({
+			select: ['id'],
+			where: { name: In(roleNames), scope: 'workflow' },
+		}).then((role) => role.map(({ id }) => id));
+	}
 }
diff --git a/packages/cli/src/databases/repositories/sharedCredentials.repository.ts b/packages/cli/src/databases/repositories/sharedCredentials.repository.ts
index 29e473b885..8250a61357 100644
--- a/packages/cli/src/databases/repositories/sharedCredentials.repository.ts
+++ b/packages/cli/src/databases/repositories/sharedCredentials.repository.ts
@@ -1,10 +1,70 @@
 import { Service } from 'typedi';
-import { DataSource, Repository } from 'typeorm';
+import type { EntityManager, FindOptionsWhere } from 'typeorm';
+import { DataSource, In, Not, Repository } from 'typeorm';
 import { SharedCredentials } from '../entities/SharedCredentials';
+import type { User } from '../entities/User';
+import type { Role } from '../entities/Role';
 
 @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[]) {
+		return this.find({
+			relations: ['credentials', 'role', 'user'],
+			where: {
+				credentialsId: In(credentialIds),
+			},
+		});
+	}
+
+	async makeOwnerOfAllCredentials(user: User, role: Role) {
+		return this.update({ userId: Not(user.id), roleId: role.id }, { user });
+	}
+
+	/**
+	 * Get the IDs of all credentials owned by or shared with a user.
+	 */
+	async getAccessibleCredentials(userId: string) {
+		const sharings = await this.find({
+			relations: ['role'],
+			where: {
+				userId,
+				role: { name: In(['owner', 'user']), scope: 'credential' },
+			},
+		});
+
+		return sharings.map((s) => s.credentialsId);
+	}
+
+	async findSharings(userIds: string[], roleId?: string) {
+		const where: FindOptionsWhere<SharedCredentials> = { userId: In(userIds) };
+
+		// If credential sharing is not enabled, get only credentials owned by this user
+		if (roleId) where.roleId = roleId;
+
+		return this.find({ where });
+	}
+
+	async deleteByIds(transaction: EntityManager, sharedCredentialsIds: string[], user?: User) {
+		return 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 e8c21df379..8e026cfa00 100644
--- a/packages/cli/src/databases/repositories/sharedWorkflow.repository.ts
+++ b/packages/cli/src/databases/repositories/sharedWorkflow.repository.ts
@@ -1,10 +1,144 @@
 import { Service } from 'typedi';
-import { DataSource, Repository } from 'typeorm';
+import { DataSource, Repository, In, Not } from 'typeorm';
+import type { EntityManager, FindOptionsSelect, FindOptionsWhere } from 'typeorm';
 import { SharedWorkflow } from '../entities/SharedWorkflow';
+import { type User } from '../entities/User';
+import type { Scope } from '@n8n/permissions';
+import type { Role } from '../entities/Role';
+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 this.exist({ where });
+	}
+
+	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 this.find({
+			relations: ['role', 'user'],
+			where: {
+				role: {
+					name: 'owner',
+					scope: 'workflow',
+				},
+				workflowId: In(workflowIds),
+			},
+		});
+	}
+
+	async findSharing(
+		workflowId: string,
+		user: User,
+		scope: Scope,
+		{ roles, extraRelations }: { roles?: string[]; extraRelations?: string[] } = {},
+	) {
+		const where: FindOptionsWhere<SharedWorkflow> = {
+			workflow: { id: workflowId },
+		};
+
+		if (!user.hasGlobalScope(scope)) {
+			where.user = { id: user.id };
+		}
+
+		if (roles) {
+			where.role = { name: In(roles) };
+		}
+
+		const relations = ['workflow', 'role'];
+
+		if (extraRelations) relations.push(...extraRelations);
+
+		return this.findOne({ relations, where });
+	}
+
+	async makeOwnerOfAllWorkflows(user: User, role: Role) {
+		return this.update({ userId: Not(user.id), roleId: role.id }, { 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 this.findOne({ where, relations });
+	}
+
+	async getSharedWorkflows(
+		user: User,
+		options: {
+			relations?: string[];
+			workflowIds?: string[];
+		},
+	): Promise<SharedWorkflow[]> {
+		return this.find({
+			where: {
+				...(!['owner', 'admin'].includes(user.globalRole.name) && { userId: user.id }),
+				...(options.workflowIds && { workflowId: In(options.workflowIds) }),
+			},
+			...(options.relations && { relations: options.relations }),
+		});
+	}
+
+	async share(transaction: EntityManager, workflow: WorkflowEntity, users: User[], roleId: string) {
+		const newSharedWorkflows = users.reduce<SharedWorkflow[]>((acc, user) => {
+			if (user.isPending) {
+				return acc;
+			}
+			const entity: Partial<SharedWorkflow> = {
+				workflowId: workflow.id,
+				userId: user.id,
+				roleId,
+			};
+			acc.push(this.create(entity));
+			return acc;
+		}, []);
+
+		return transaction.save(newSharedWorkflows);
+	}
+
+	async findWithFields(workflowIds: string[], { fields }: { fields: string[] }) {
+		return this.find({
+			where: {
+				workflowId: In(workflowIds),
+			},
+			select: fields as FindOptionsSelect<SharedWorkflow>,
+		});
+	}
+
+	async deleteByIds(transaction: EntityManager, sharedWorkflowIds: string[], user?: User) {
+		return 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 3eb848446d..285a4de096 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 'typeorm';
+import { DataSource, In, Repository } from '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 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/user.repository.ts b/packages/cli/src/databases/repositories/user.repository.ts
index 863a797a45..e6be912579 100644
--- a/packages/cli/src/databases/repositories/user.repository.ts
+++ b/packages/cli/src/databases/repositories/user.repository.ts
@@ -1,10 +1,87 @@
 import { Service } from 'typedi';
-import { DataSource, Repository } from 'typeorm';
+import type { EntityManager, FindManyOptions } from 'typeorm';
+import { DataSource, In, IsNull, Not, Repository } from 'typeorm';
 import { User } from '../entities/User';
+import type { ListQuery } from '@/requests';
 
 @Service()
 export class UserRepository extends Repository<User> {
 	constructor(dataSource: DataSource) {
 		super(User, dataSource.manager);
 	}
+
+	async findManybyIds(userIds: string[]) {
+		return this.find({
+			where: { id: In(userIds) },
+			relations: ['globalRole'],
+		});
+	}
+
+	async deleteAllExcept(user: User) {
+		await this.delete({ id: Not(user.id) });
+	}
+
+	async getByIds(transaction: EntityManager, ids: string[]) {
+		return transaction.find(User, { where: { id: In(ids) } });
+	}
+
+	async findManyByEmail(emails: string[]) {
+		return this.find({
+			where: { email: In(emails) },
+			relations: ['globalRole'],
+			select: ['email', 'password', 'id'],
+		});
+	}
+
+	async deleteMany(userIds: string[]) {
+		return this.delete({ id: In(userIds) });
+	}
+
+	async findNonShellUser(email: string) {
+		return this.findOne({
+			where: {
+				email,
+				password: Not(IsNull()),
+			},
+			relations: ['authIdentities', 'globalRole'],
+		});
+	}
+
+	async toFindManyOptions(listQueryOptions?: ListQuery.Options, globalOwnerRoleId?: string) {
+		const findManyOptions: FindManyOptions<User> = {};
+
+		if (!listQueryOptions) {
+			findManyOptions.relations = ['globalRole', '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 = ['globalRole', '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 && globalOwnerRoleId) {
+				findManyOptions.relations = ['globalRole'];
+				findManyOptions.where.globalRole = {
+					id: isOwner ? globalOwnerRoleId : Not(globalOwnerRoleId),
+				};
+			}
+		}
+
+		return findManyOptions;
+	}
 }
diff --git a/packages/cli/src/databases/repositories/workflow.repository.ts b/packages/cli/src/databases/repositories/workflow.repository.ts
index 5085f47be4..79cd6461c0 100644
--- a/packages/cli/src/databases/repositories/workflow.repository.ts
+++ b/packages/cli/src/databases/repositories/workflow.repository.ts
@@ -1,10 +1,219 @@
 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 '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 this.findOne({
+			where,
+			relations: options?.relations,
+		});
+	}
+
+	async getAllActive() {
+		return this.find({
+			where: { active: true },
+			relations: ['shared', 'shared.user', 'shared.user.globalRole', 'shared.role'],
+		});
+	}
+
+	async getActiveIds() {
+		const activeWorkflows = await this.find({
+			select: ['id'],
+			where: { active: true },
+		});
+		return activeWorkflows.map((workflow) => workflow.id);
+	}
+
+	async findById(workflowId: string) {
+		return this.findOne({
+			where: { id: workflowId },
+			relations: ['shared', 'shared.user', 'shared.user.globalRole', 'shared.role'],
+		});
+	}
+
+	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 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 transaction.delete(SharedWorkflow, {
+			workflowId,
+			userId: Not(In(userIds)),
+		});
+	}
+
+	async updateWorkflowTriggerCount(id: string, triggerCount: number): Promise<UpdateResult> {
+		const qb = this.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();
+	}
+
+	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, roleId: 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.role', '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 this.find({
+			select: ['name'],
+			where: { name: Like(`${workflowName}%`) },
+		});
+	}
+
+	async findIn(workflowIds: string[]) {
+		return this.find({
+			select: ['id', 'name'],
+			where: { id: In(workflowIds) },
+		});
+	}
+
+	async findWebhookBasedActiveWorkflows() {
+		return 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 this.update({ id: workflowId }, { active: newState });
+	}
+
+	async deactivateAll() {
+		return this.update({ active: true }, { active: false });
+	}
+
+	async findByActiveState(activeState: boolean) {
+		return this.findBy({ active: activeState });
+	}
 }
diff --git a/packages/cli/src/databases/repositories/workflowHistory.repository.ts b/packages/cli/src/databases/repositories/workflowHistory.repository.ts
index 02c0beaec2..eda4a18e31 100644
--- a/packages/cli/src/databases/repositories/workflowHistory.repository.ts
+++ b/packages/cli/src/databases/repositories/workflowHistory.repository.ts
@@ -1,5 +1,5 @@
 import { Service } from 'typedi';
-import { DataSource, Repository } from 'typeorm';
+import { DataSource, LessThan, Repository } from 'typeorm';
 import { WorkflowHistory } from '../entities/WorkflowHistory';
 
 @Service()
@@ -7,4 +7,8 @@ export class WorkflowHistoryRepository extends Repository<WorkflowHistory> {
 	constructor(dataSource: DataSource) {
 		super(WorkflowHistory, dataSource.manager);
 	}
+
+	async deleteEarlierThan(date: Date) {
+		return 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 3ce4ea6d83..5d6a9261da 100644
--- a/packages/cli/src/databases/repositories/workflowStatistics.repository.ts
+++ b/packages/cli/src/databases/repositories/workflowStatistics.repository.ts
@@ -4,7 +4,7 @@ import config from '@/config';
 import type { StatisticsNames } from '../entities/WorkflowStatistics';
 import { WorkflowStatistics } from '../entities/WorkflowStatistics';
 
-type StatisticsInsertResult = 'insert' | 'failed';
+type StatisticsInsertResult = 'insert' | 'failed' | 'alreadyExists';
 type StatisticsUpsertResult = StatisticsInsertResult | 'update';
 
 @Service()
@@ -21,6 +21,13 @@ export class WorkflowStatisticsRepository extends Repository<WorkflowStatistics>
 	): 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,
diff --git a/packages/cli/src/databases/types.ts b/packages/cli/src/databases/types.ts
index f04deeceba..9574e5f201 100644
--- a/packages/cli/src/databases/types.ts
+++ b/packages/cli/src/databases/types.ts
@@ -22,11 +22,7 @@ export interface MigrationContext {
 		tableName(name: string): string;
 		indexName(name: string): string;
 	};
-	runQuery<T>(
-		sql: string,
-		unsafeParameters?: ObjectLiteral,
-		nativeParameters?: ObjectLiteral,
-	): Promise<T>;
+	runQuery<T>(sql: string, namedParameters?: ObjectLiteral): Promise<T>;
 	runInBatches<T>(
 		query: string,
 		operation: (results: T[]) => Promise<void>,
diff --git a/packages/cli/src/databases/utils/customValidators.ts b/packages/cli/src/databases/utils/customValidators.ts
index f84832fe55..8d397e982a 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/migrationHelpers.ts b/packages/cli/src/databases/utils/migrationHelpers.ts
index 097eca3d84..c254d8c44d 100644
--- a/packages/cli/src/databases/utils/migrationHelpers.ts
+++ b/packages/cli/src/databases/utils/migrationHelpers.ts
@@ -3,7 +3,7 @@ import { readFileSync, rmSync } from 'fs';
 import { InstanceSettings } from 'n8n-core';
 import type { ObjectLiteral } from 'typeorm';
 import type { QueryRunner } from 'typeorm/query-runner/QueryRunner';
-import { jsonParse } from 'n8n-workflow';
+import { ApplicationError, jsonParse } from 'n8n-workflow';
 import config from '@/config';
 import { inTest } from '@/constants';
 import type { BaseMigration, Migration, MigrationContext, MigrationFn } from '@db/types';
@@ -23,7 +23,7 @@ function loadSurveyFromDisk(): string | null {
 		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 {
 			const emptyKeys = kvPairs.reduce((acc, [, value]) => {
 				if (!value || (Array.isArray(value) && !value.length)) {
@@ -32,7 +32,7 @@ function loadSurveyFromDisk(): string | null {
 				return acc;
 			}, 0);
 			if (emptyKeys === kvPairs.length) {
-				throw new Error('incomplete personalizationSurvey');
+				throw new ApplicationError('incomplete personalizationSurvey');
 			}
 		}
 		return surveyFile;
@@ -52,14 +52,14 @@ function logMigrationStart(migrationName: string): void {
 		runningMigrations = true;
 	}
 
-	logger.debug(`Starting migration ${migrationName}`);
+	logger.info(`Starting migration ${migrationName}`);
 }
 
 function logMigrationEnd(migrationName: string): void {
 	if (inTest) return;
 
 	const logger = Container.get(Logger);
-	logger.debug(`Finished migration ${migrationName}`);
+	logger.info(`Finished migration ${migrationName}`);
 }
 
 const runDisablingForeignKeys = async (
@@ -68,7 +68,8 @@ const runDisablingForeignKeys = async (
 	fn: MigrationFn,
 ) => {
 	const { dbType, queryRunner } = context;
-	if (dbType !== 'sqlite') throw new Error('Disabling transactions only available in sqlite');
+	if (dbType !== 'sqlite')
+		throw new ApplicationError('Disabling transactions only available in sqlite');
 	await queryRunner.query('PRAGMA foreign_keys=OFF');
 	await queryRunner.startTransaction();
 	try {
@@ -110,16 +111,12 @@ const createContext = (queryRunner: QueryRunner, migration: Migration): Migratio
 		tableName: (name) => queryRunner.connection.driver.escape(`${tablePrefix}${name}`),
 		indexName: (name) => queryRunner.connection.driver.escape(`IDX_${tablePrefix}${name}`),
 	},
-	runQuery: async <T>(
-		sql: string,
-		unsafeParameters?: ObjectLiteral,
-		safeParameters?: ObjectLiteral,
-	) => {
-		if (unsafeParameters) {
+	runQuery: async <T>(sql: string, namedParameters?: ObjectLiteral) => {
+		if (namedParameters) {
 			const [query, parameters] = queryRunner.connection.driver.escapeQueryWithParameters(
 				sql,
-				unsafeParameters,
-				safeParameters ?? {},
+				namedParameters,
+				{},
 			);
 			return queryRunner.query(query, parameters) as Promise<T>;
 		} else {
diff --git a/packages/cli/src/decorators/Authorized.ts b/packages/cli/src/decorators/Authorized.ts
index 880938ae5c..4e97972a89 100644
--- a/packages/cli/src/decorators/Authorized.ts
+++ b/packages/cli/src/decorators/Authorized.ts
@@ -1,10 +1,9 @@
-/* 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) {
+	return function (target: Function | object, handlerName?: string) {
 		const controllerClass = handlerName ? target.constructor : target;
 		const authRoles = (Reflect.getMetadata(CONTROLLER_AUTH_ROLES, controllerClass) ??
 			{}) as AuthRoleMetadata;
diff --git a/packages/cli/src/decorators/Licensed.ts b/packages/cli/src/decorators/Licensed.ts
new file mode 100644
index 0000000000..b411e8fa16
--- /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 6d5e957f6e..ed26fe5bf4 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 0000000000..88eaf8fb11
--- /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 11c2d55665..ca235cba59 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 e51369a64c..64dd96d293 100644
--- a/packages/cli/src/decorators/Route.ts
+++ b/packages/cli/src/decorators/Route.ts
@@ -4,9 +4,9 @@ import type { Method, RouteMetadata } from './types';
 
 interface RouteOptions {
 	middlewares?: RequestHandler[];
+	usesTemplates?: boolean;
 }
 
-/* eslint-disable @typescript-eslint/naming-convention */
 const RouteFactory =
 	(method: Method) =>
 	(path: `/${string}`, options: RouteOptions = {}): MethodDecorator =>
@@ -19,6 +19,7 @@ const RouteFactory =
 			path,
 			middlewares: options.middlewares ?? [],
 			handlerName: String(handlerName),
+			usesTemplates: options.usesTemplates ?? 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 0000000000..9e4bdca22a
--- /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 RequireGlobalScope = (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 5a5efc938d..ba3d8a3147 100644
--- a/packages/cli/src/decorators/constants.ts
+++ b/packages/cli/src/decorators/constants.ts
@@ -2,3 +2,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 0e683d410c..5ec9e3d010 100644
--- a/packages/cli/src/decorators/index.ts
+++ b/packages/cli/src/decorators/index.ts
@@ -3,3 +3,5 @@ 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 { RequireGlobalScope } from './Scopes';
diff --git a/packages/cli/src/decorators/registerController.ts b/packages/cli/src/decorators/registerController.ts
index 80e5ff7235..c3b38c8183 100644
--- a/packages/cli/src/decorators/registerController.ts
+++ b/packages/cli/src/decorators/registerController.ts
@@ -1,21 +1,33 @@
+import { Container } from 'typedi';
 import { Router } from 'express';
 import type { Application, Request, Response, RequestHandler } from 'express';
-import type { Config } from '@/config';
+import type { Class } from 'n8n-core';
+
+import config from '@/config';
 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';
+import type { BooleanLicenseFeature } from '@/Interfaces';
+
+import { License } from '@/License';
+import type { Scope } from '@n8n/permissions';
+import { ApplicationError } from 'n8n-workflow';
 
 export const createAuthMiddleware =
 	(authRole: AuthRole): RequestHandler =>
@@ -31,23 +43,68 @@ export const createAuthMiddleware =
 		res.status(403).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' });
+		}
+
+		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' });
+		}
+
+		return next();
+	};
+
 const authFreeRoutes: string[] = [];
 
 export const canSkipAuth = (method: string, path: string): boolean =>
 	authFreeRoutes.includes(`${method.toLowerCase()} ${path}`);
 
-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');
@@ -57,24 +114,26 @@ 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);
 
-		routes.forEach(({ method, path, middlewares: routeMiddlewares, handlerName }) => {
-			const authRole = authRoles && (authRoles[handlerName] ?? authRoles['*']);
-			router[method](
-				path,
-				...(authRole ? [createAuthMiddleware(authRole)] : []),
-				...controllerMiddlewares,
-				...routeMiddlewares,
-				send(async (req: Request, res: Response) =>
-					(controller as Controller)[handlerName](req, res),
-				),
-			);
-			if (!authRole || authRole === 'none') authFreeRoutes.push(`${method} ${prefix}${path}`);
-		});
+		routes.forEach(
+			({ method, path, middlewares: routeMiddlewares, handlerName, usesTemplates }) => {
+				const authRole = authRoles?.[handlerName] ?? authRoles?.['*'];
+				const features = licenseFeatures?.[handlerName] ?? licenseFeatures?.['*'];
+				const scopes = requiredScopes?.[handlerName] ?? requiredScopes?.['*'];
+				const handler = async (req: Request, res: Response) => controller[handlerName](req, res);
+				router[method](
+					path,
+					...(authRole ? [createAuthMiddleware(authRole)] : []),
+					...(features ? [createLicenseMiddleware(features)] : []),
+					...(scopes ? [createGlobalScopeMiddleware(scopes)] : []),
+					...controllerMiddlewares,
+					...routeMiddlewares,
+					usesTemplates ? handler : send(handler),
+				);
+				if (!authRole || authRole === 'none') authFreeRoutes.push(`${method} ${prefix}${path}`);
+			},
+		);
 
 		app.use(prefix, router);
 	}
diff --git a/packages/cli/src/decorators/types.ts b/packages/cli/src/decorators/types.ts
index d118e6e6c9..919e748686 100644
--- a/packages/cli/src/decorators/types.ts
+++ b/packages/cli/src/decorators/types.ts
@@ -1,11 +1,17 @@
 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 +21,7 @@ export interface RouteMetadata {
 	path: string;
 	handlerName: string;
 	middlewares: RequestHandler[];
+	usesTemplates: boolean;
 }
 
 export type Controller = Record<
diff --git a/packages/cli/src/environments/sourceControl/constants.ts b/packages/cli/src/environments/sourceControl/constants.ts
index 5b88d858b7..6580ce9979 100644
--- a/packages/cli/src/environments/sourceControl/constants.ts
+++ b/packages/cli/src/environments/sourceControl/constants.ts
@@ -10,7 +10,6 @@ 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_API_ROOT = 'source-control';
 export const SOURCE_CONTROL_README = `
 # n8n Source Control
 `;
diff --git a/packages/cli/src/environments/sourceControl/middleware/sourceControlEnabledMiddleware.ee.ts b/packages/cli/src/environments/sourceControl/middleware/sourceControlEnabledMiddleware.ee.ts
index 271db3805a..2bf64f7ba9 100644
--- a/packages/cli/src/environments/sourceControl/middleware/sourceControlEnabledMiddleware.ee.ts
+++ b/packages/cli/src/environments/sourceControl/middleware/sourceControlEnabledMiddleware.ee.ts
@@ -8,7 +8,14 @@ export const sourceControlLicensedAndEnabledMiddleware: RequestHandler = (req, r
 	if (sourceControlPreferencesService.isSourceControlLicensedAndEnabled()) {
 		next();
 	} else {
-		res.status(401).json({ status: 'error', message: 'Unauthorized' });
+		if (!sourceControlPreferencesService.isSourceControlConnected()) {
+			res.status(412).json({
+				status: 'error',
+				message: 'source_control_not_connected',
+			});
+		} 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
index 63642c70fc..d589af30d8 100644
--- a/packages/cli/src/environments/sourceControl/sourceControl.controller.ee.ts
+++ b/packages/cli/src/environments/sourceControl/sourceControl.controller.ee.ts
@@ -1,7 +1,6 @@
-import { Container, Service } from 'typedi';
 import type { PullResult } from 'simple-git';
 import express from 'express';
-import { Authorized, Get, Post, Patch, RestController } from '@/decorators';
+import { Authorized, Get, Post, Patch, RestController, RequireGlobalScope } from '@/decorators';
 import {
 	sourceControlLicensedMiddleware,
 	sourceControlLicensedAndEnabledMiddleware,
@@ -11,19 +10,20 @@ 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_API_ROOT, SOURCE_CONTROL_DEFAULT_BRANCH } from './constants';
-import { BadRequestError } from '@/ResponseHelper';
+import { SOURCE_CONTROL_DEFAULT_BRANCH } from './constants';
 import type { ImportResult } from './types/importResult';
-import { InternalHooks } from '../../InternalHooks';
+import { InternalHooks } from '@/InternalHooks';
 import { getRepoType } from './sourceControlHelper.ee';
 import { SourceControlGetStatus } from './types/sourceControlGetStatus';
+import { BadRequestError } from '@/errors/response-errors/bad-request.error';
 
-@Service()
-@RestController(`/${SOURCE_CONTROL_API_ROOT}`)
+@Authorized()
+@RestController('/source-control')
 export class SourceControlController {
 	constructor(
-		private sourceControlService: SourceControlService,
-		private sourceControlPreferencesService: SourceControlPreferencesService,
+		private readonly sourceControlService: SourceControlService,
+		private readonly sourceControlPreferencesService: SourceControlPreferencesService,
+		private readonly internalHooks: InternalHooks,
 	) {}
 
 	@Authorized('none')
@@ -33,8 +33,8 @@ export class SourceControlController {
 		return this.sourceControlPreferencesService.getPreferences();
 	}
 
-	@Authorized(['global', 'owner'])
 	@Post('/preferences', { middlewares: [sourceControlLicensedMiddleware] })
+	@RequireGlobalScope('sourceControl:manage')
 	async setPreferences(req: SourceControlRequest.UpdatePreferences) {
 		if (
 			req.body.branchReadOnly === undefined &&
@@ -84,7 +84,7 @@ export class SourceControlController {
 			const resultingPreferences = this.sourceControlPreferencesService.getPreferences();
 			// #region Tracking Information
 			// located in controller so as to not call this multiple times when updating preferences
-			void Container.get(InternalHooks).onSourceControlSettingsUpdated({
+			void this.internalHooks.onSourceControlSettingsUpdated({
 				branch_name: resultingPreferences.branchName,
 				connected: resultingPreferences.connected,
 				read_only_instance: resultingPreferences.branchReadOnly,
@@ -97,8 +97,8 @@ export class SourceControlController {
 		}
 	}
 
-	@Authorized(['global', 'owner'])
 	@Patch('/preferences', { middlewares: [sourceControlLicensedMiddleware] })
+	@RequireGlobalScope('sourceControl:manage')
 	async updatePreferences(req: SourceControlRequest.UpdatePreferences) {
 		try {
 			const sanitizedPreferences: Partial<SourceControlPreferences> = {
@@ -129,7 +129,7 @@ export class SourceControlController {
 			}
 			await this.sourceControlService.init();
 			const resultingPreferences = this.sourceControlPreferencesService.getPreferences();
-			void Container.get(InternalHooks).onSourceControlSettingsUpdated({
+			void this.internalHooks.onSourceControlSettingsUpdated({
 				branch_name: resultingPreferences.branchName,
 				connected: resultingPreferences.connected,
 				read_only_instance: resultingPreferences.branchReadOnly,
@@ -141,8 +141,8 @@ export class SourceControlController {
 		}
 	}
 
-	@Authorized(['global', 'owner'])
 	@Post('/disconnect', { middlewares: [sourceControlLicensedMiddleware] })
+	@RequireGlobalScope('sourceControl:manage')
 	async disconnect(req: SourceControlRequest.Disconnect) {
 		try {
 			return await this.sourceControlService.disconnect(req.body);
@@ -161,8 +161,8 @@ export class SourceControlController {
 		}
 	}
 
-	@Authorized(['global', 'owner'])
 	@Post('/push-workfolder', { middlewares: [sourceControlLicensedAndEnabledMiddleware] })
+	@RequireGlobalScope('sourceControl:push')
 	async pushWorkfolder(
 		req: SourceControlRequest.PushWorkFolder,
 		res: express.Response,
@@ -183,8 +183,8 @@ export class SourceControlController {
 		}
 	}
 
-	@Authorized(['global', 'owner'])
 	@Post('/pull-workfolder', { middlewares: [sourceControlLicensedAndEnabledMiddleware] })
+	@RequireGlobalScope('sourceControl:pull')
 	async pullWorkfolder(
 		req: SourceControlRequest.PullWorkFolder,
 		res: express.Response,
@@ -202,8 +202,8 @@ export class SourceControlController {
 		}
 	}
 
-	@Authorized(['global', 'owner'])
 	@Get('/reset-workfolder', { middlewares: [sourceControlLicensedAndEnabledMiddleware] })
+	@RequireGlobalScope('sourceControl:manage')
 	async resetWorkfolder(): Promise<ImportResult | undefined> {
 		try {
 			return await this.sourceControlService.resetWorkfolder();
@@ -235,8 +235,8 @@ export class SourceControlController {
 		}
 	}
 
-	@Authorized(['global', 'owner'])
 	@Post('/generate-key-pair', { middlewares: [sourceControlLicensedMiddleware] })
+	@RequireGlobalScope('sourceControl:manage')
 	async generateKeyPair(
 		req: SourceControlRequest.GenerateKeyPair,
 	): Promise<SourceControlPreferences> {
diff --git a/packages/cli/src/environments/sourceControl/sourceControl.service.ee.ts b/packages/cli/src/environments/sourceControl/sourceControl.service.ee.ts
index 67dac2945e..a590050525 100644
--- a/packages/cli/src/environments/sourceControl/sourceControl.service.ee.ts
+++ b/packages/cli/src/environments/sourceControl/sourceControl.service.ee.ts
@@ -17,7 +17,6 @@ import {
 import { SourceControlGitService } from './sourceControlGit.service.ee';
 import type { PushResult } from 'simple-git';
 import { SourceControlExportService } from './sourceControlExport.service.ee';
-import { BadRequestError } from '@/ResponseHelper';
 import type { ImportResult } from './types/importResult';
 import type { SourceControlPushWorkFolder } from './types/sourceControlPushWorkFolder';
 import type { SourceControllPullOptions } from './types/sourceControlPullWorkFolder';
@@ -33,8 +32,10 @@ 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 '@/databases/repositories';
+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 {
@@ -83,7 +84,7 @@ export class SourceControlService {
 				false,
 			);
 			if (!foldersExisted) {
-				throw new Error();
+				throw new ApplicationError('No folders exist');
 			}
 			if (!this.gitService.git) {
 				await this.initGitService();
@@ -94,7 +95,7 @@ export class SourceControlService {
 				branches.current !==
 					this.sourceControlPreferencesService.sourceControlPreferences.branchName
 			) {
-				throw new Error();
+				throw new ApplicationError('Branch is not set up correctly');
 			}
 		} catch (error) {
 			throw new BadRequestError(
@@ -116,7 +117,7 @@ export class SourceControlService {
 			this.gitService.resetService();
 			return this.sourceControlPreferencesService.sourceControlPreferences;
 		} catch (error) {
-			throw Error(`Failed to disconnect from source control: ${(error as Error).message}`);
+			throw new ApplicationError('Failed to disconnect from source control', { cause: error });
 		}
 	}
 
@@ -195,7 +196,7 @@ export class SourceControlService {
 			await this.gitService.pull();
 		} catch (error) {
 			this.logger.error(`Failed to reset workfolder: ${(error as Error).message}`);
-			throw new Error(
+			throw new ApplicationError(
 				'Unable to fetch updates from git - your folder might be out of sync. Try reconnecting from the Source Control settings page.',
 			);
 		}
diff --git a/packages/cli/src/environments/sourceControl/sourceControlExport.service.ee.ts b/packages/cli/src/environments/sourceControl/sourceControlExport.service.ee.ts
index 025cf4b70d..2c56b84ecd 100644
--- a/packages/cli/src/environments/sourceControl/sourceControlExport.service.ee.ts
+++ b/packages/cli/src/environments/sourceControl/sourceControlExport.service.ee.ts
@@ -1,4 +1,4 @@
-import { Service } from 'typedi';
+import Container, { Service } from 'typedi';
 import path from 'path';
 import {
 	SOURCE_CONTROL_CREDENTIAL_EXPORT_FOLDER,
@@ -6,8 +6,7 @@ import {
 	SOURCE_CONTROL_TAGS_EXPORT_FILE,
 	SOURCE_CONTROL_WORKFLOW_EXPORT_FOLDER,
 } from './constants';
-import * as Db from '@/Db';
-import type { ICredentialDataDecryptedObject } from 'n8n-workflow';
+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';
@@ -22,11 +21,14 @@ import {
 	stringContainsExpression,
 } from './sourceControlHelper.ee';
 import type { WorkflowEntity } from '@db/entities/WorkflowEntity';
-import { In } from 'typeorm';
 import type { SourceControlledFile } from './types/sourceControlledFile';
-import { VariablesService } from '../variables/variables.service';
-import { TagRepository } from '@/databases/repositories';
+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 {
@@ -102,21 +104,9 @@ export class SourceControlExportService {
 		try {
 			sourceControlFoldersExistCheck([this.workflowExportFolder]);
 			const workflowIds = candidates.map((e) => e.id);
-			const sharedWorkflows = await Db.collections.SharedWorkflow.find({
-				relations: ['role', 'user'],
-				where: {
-					role: {
-						name: 'owner',
-						scope: 'workflow',
-					},
-					workflowId: In(workflowIds),
-				},
-			});
-			const workflows = await Db.collections.Workflow.find({
-				where: {
-					id: In(workflowIds),
-				},
-			});
+			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> = {};
@@ -135,7 +125,7 @@ export class SourceControlExportService {
 				})),
 			};
 		} catch (error) {
-			throw Error(`Failed to export workflows to work folder: ${(error as Error).message}`);
+			throw new ApplicationError('Failed to export workflows to work folder', { cause: error });
 		}
 	}
 
@@ -165,7 +155,9 @@ export class SourceControlExportService {
 				],
 			};
 		} catch (error) {
-			throw Error(`Failed to export variables to work folder: ${(error as Error).message}`);
+			throw new ApplicationError('Failed to export variables to work folder', {
+				cause: error,
+			});
 		}
 	}
 
@@ -181,7 +173,7 @@ export class SourceControlExportService {
 					files: [],
 				};
 			}
-			const mappings = await Db.collections.WorkflowTagMapping.find();
+			const mappings = await Container.get(WorkflowTagMappingRepository).find();
 			const fileName = path.join(this.gitFolder, SOURCE_CONTROL_TAGS_EXPORT_FILE);
 			await fsWriteFile(
 				fileName,
@@ -205,7 +197,7 @@ export class SourceControlExportService {
 				],
 			};
 		} catch (error) {
-			throw Error(`Failed to export variables to work folder: ${(error as Error).message}`);
+			throw new ApplicationError('Failed to export variables to work folder', { cause: error });
 		}
 	}
 
@@ -236,12 +228,9 @@ export class SourceControlExportService {
 		try {
 			sourceControlFoldersExistCheck([this.credentialExportFolder]);
 			const credentialIds = candidates.map((e) => e.id);
-			const credentialsToBeExported = await Db.collections.SharedCredentials.find({
-				relations: ['credentials', 'role', 'user'],
-				where: {
-					credentialsId: In(credentialIds),
-				},
-			});
+			const credentialsToBeExported = await Container.get(
+				SharedCredentialsRepository,
+			).findByCredentialIds(credentialIds);
 			let missingIds: string[] = [];
 			if (credentialsToBeExported.length !== credentialIds.length) {
 				const foundCredentialIds = credentialsToBeExported.map((e) => e.credentialsId);
@@ -277,7 +266,7 @@ export class SourceControlExportService {
 				missingIds,
 			};
 		} catch (error) {
-			throw Error(`Failed to export credentials to work folder: ${(error as Error).message}`);
+			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
index 88da95cf14..4a440f14e6 100644
--- a/packages/cli/src/environments/sourceControl/sourceControlGit.service.ee.ts
+++ b/packages/cli/src/environments/sourceControl/sourceControlGit.service.ee.ts
@@ -20,8 +20,9 @@ import {
 } from './constants';
 import { sourceControlFoldersExistCheck } from './sourceControlHelper.ee';
 import type { User } from '@db/entities/User';
-import { getInstanceOwner } from '../../UserManagement/UserManagementHelper';
 import { Logger } from '@/Logger';
+import { ApplicationError } from 'n8n-workflow';
+import { OwnershipService } from '@/services/ownership.service';
 
 @Service()
 export class SourceControlGitService {
@@ -29,7 +30,10 @@ export class SourceControlGitService {
 
 	private gitOptions: Partial<SimpleGitOptions> = {};
 
-	constructor(private readonly logger: Logger) {}
+	constructor(
+		private readonly logger: Logger,
+		private readonly ownershipService: OwnershipService,
+	) {}
 
 	/**
 	 * Run pre-checks before initialising git
@@ -43,7 +47,7 @@ export class SourceControlGitService {
 			});
 			this.logger.debug(`Git binary found: ${gitResult.toString()}`);
 		} catch (error) {
-			throw new Error(`Git binary not found: ${(error as Error).message}`);
+			throw new ApplicationError('Git binary not found', { cause: error });
 		}
 		try {
 			const sshResult = execSync('ssh -V', {
@@ -51,7 +55,7 @@ export class SourceControlGitService {
 			});
 			this.logger.debug(`SSH binary found: ${sshResult.toString()}`);
 		} catch (error) {
-			throw new Error(`SSH binary not found: ${(error as Error).message}`);
+			throw new ApplicationError('SSH binary not found', { cause: error });
 		}
 		return true;
 	}
@@ -102,8 +106,8 @@ export class SourceControlGitService {
 		}
 		if (!(await this.hasRemote(sourceControlPreferences.repositoryUrl))) {
 			if (sourceControlPreferences.connected && sourceControlPreferences.repositoryUrl) {
-				const user = await getInstanceOwner();
-				await this.initRepository(sourceControlPreferences, user);
+				const instanceOwner = await this.ownershipService.getInstanceOwner();
+				await this.initRepository(sourceControlPreferences, instanceOwner);
 			}
 		}
 	}
@@ -114,7 +118,7 @@ export class SourceControlGitService {
 
 	private async checkRepositorySetup(): Promise<boolean> {
 		if (!this.git) {
-			throw new Error('Git is not initialized (async)');
+			throw new ApplicationError('Git is not initialized (async)');
 		}
 		if (!(await this.git.checkIsRepo())) {
 			return false;
@@ -129,7 +133,7 @@ export class SourceControlGitService {
 
 	private async hasRemote(remote: string): Promise<boolean> {
 		if (!this.git) {
-			throw new Error('Git is not initialized (async)');
+			throw new ApplicationError('Git is not initialized (async)');
 		}
 		try {
 			const remotes = await this.git.getRemotes(true);
@@ -141,7 +145,7 @@ export class SourceControlGitService {
 				return true;
 			}
 		} catch (error) {
-			throw new Error(`Git is not initialized ${(error as Error).message}`);
+			throw new ApplicationError('Git is not initialized', { cause: error });
 		}
 		this.logger.debug(`Git remote not found: ${remote}`);
 		return false;
@@ -155,7 +159,7 @@ export class SourceControlGitService {
 		user: User,
 	): Promise<void> {
 		if (!this.git) {
-			throw new Error('Git is not initialized (Promise)');
+			throw new ApplicationError('Git is not initialized (Promise)');
 		}
 		if (sourceControlPreferences.initRepo) {
 			try {
@@ -174,7 +178,9 @@ export class SourceControlGitService {
 			}
 		}
 		await this.setGitUserDetails(
-			`${user.firstName} ${user.lastName}` ?? SOURCE_CONTROL_DEFAULT_NAME,
+			user.firstName && user.lastName
+				? `${user.firstName} ${user.lastName}`
+				: SOURCE_CONTROL_DEFAULT_NAME,
 			user.email ?? SOURCE_CONTROL_DEFAULT_EMAIL,
 		);
 		if (sourceControlPreferences.initRepo) {
@@ -191,7 +197,7 @@ export class SourceControlGitService {
 
 	async setGitUserDetails(name: string, email: string): Promise<void> {
 		if (!this.git) {
-			throw new Error('Git is not initialized (setGitUserDetails)');
+			throw new ApplicationError('Git is not initialized (setGitUserDetails)');
 		}
 		await this.git.addConfig('user.email', email);
 		await this.git.addConfig('user.name', name);
@@ -199,7 +205,7 @@ export class SourceControlGitService {
 
 	async getBranches(): Promise<{ branches: string[]; currentBranch: string }> {
 		if (!this.git) {
-			throw new Error('Git is not initialized (getBranches)');
+			throw new ApplicationError('Git is not initialized (getBranches)');
 		}
 
 		try {
@@ -216,13 +222,13 @@ export class SourceControlGitService {
 				currentBranch: current,
 			};
 		} catch (error) {
-			throw new Error(`Could not get remote branches from repository ${(error as Error).message}`);
+			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 Error('Git is not initialized (setBranch)');
+			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]);
@@ -231,7 +237,7 @@ export class SourceControlGitService {
 
 	async getCurrentBranch(): Promise<{ current: string; remote: string }> {
 		if (!this.git) {
-			throw new Error('Git is not initialized (getCurrentBranch)');
+			throw new ApplicationError('Git is not initialized (getCurrentBranch)');
 		}
 		const currentBranch = (await this.git.branch()).current;
 		return {
@@ -242,7 +248,7 @@ export class SourceControlGitService {
 
 	async diffRemote(): Promise<DiffResult | undefined> {
 		if (!this.git) {
-			throw new Error('Git is not initialized (diffRemote)');
+			throw new ApplicationError('Git is not initialized (diffRemote)');
 		}
 		const currentBranch = await this.getCurrentBranch();
 		if (currentBranch.remote) {
@@ -254,7 +260,7 @@ export class SourceControlGitService {
 
 	async diffLocal(): Promise<DiffResult | undefined> {
 		if (!this.git) {
-			throw new Error('Git is not initialized (diffLocal)');
+			throw new ApplicationError('Git is not initialized (diffLocal)');
 		}
 		const currentBranch = await this.getCurrentBranch();
 		if (currentBranch.remote) {
@@ -266,14 +272,14 @@ export class SourceControlGitService {
 
 	async fetch(): Promise<FetchResult> {
 		if (!this.git) {
-			throw new Error('Git is not initialized (fetch)');
+			throw new ApplicationError('Git is not initialized (fetch)');
 		}
 		return this.git.fetch();
 	}
 
 	async pull(options: { ffOnly: boolean } = { ffOnly: true }): Promise<PullResult> {
 		if (!this.git) {
-			throw new Error('Git is not initialized (pull)');
+			throw new ApplicationError('Git is not initialized (pull)');
 		}
 		const params = {};
 		if (options.ffOnly) {
@@ -291,7 +297,7 @@ export class SourceControlGitService {
 	): Promise<PushResult> {
 		const { force, branch } = options;
 		if (!this.git) {
-			throw new Error('Git is not initialized ({)');
+			throw new ApplicationError('Git is not initialized ({)');
 		}
 		if (force) {
 			return this.git.push(SOURCE_CONTROL_ORIGIN, branch, ['-f']);
@@ -301,7 +307,7 @@ export class SourceControlGitService {
 
 	async stage(files: Set<string>, deletedFiles?: Set<string>): Promise<string> {
 		if (!this.git) {
-			throw new Error('Git is not initialized (stage)');
+			throw new ApplicationError('Git is not initialized (stage)');
 		}
 		if (deletedFiles?.size) {
 			try {
@@ -317,7 +323,7 @@ export class SourceControlGitService {
 		options: { hard: boolean; target: string } = { hard: true, target: 'HEAD' },
 	): Promise<string> {
 		if (!this.git) {
-			throw new Error('Git is not initialized (Promise)');
+			throw new ApplicationError('Git is not initialized (Promise)');
 		}
 		if (options?.hard) {
 			return this.git.raw(['reset', '--hard', options.target]);
@@ -329,14 +335,14 @@ export class SourceControlGitService {
 
 	async commit(message: string): Promise<CommitResult> {
 		if (!this.git) {
-			throw new Error('Git is not initialized (commit)');
+			throw new ApplicationError('Git is not initialized (commit)');
 		}
 		return this.git.commit(message);
 	}
 
 	async status(): Promise<StatusResult> {
 		if (!this.git) {
-			throw new Error('Git is not initialized (status)');
+			throw new ApplicationError('Git is not initialized (status)');
 		}
 		const statusResult = await this.git.status();
 		return statusResult;
diff --git a/packages/cli/src/environments/sourceControl/sourceControlImport.service.ee.ts b/packages/cli/src/environments/sourceControl/sourceControlImport.service.ee.ts
index efc17ab7c3..f4743a3d67 100644
--- a/packages/cli/src/environments/sourceControl/sourceControlImport.service.ee.ts
+++ b/packages/cli/src/environments/sourceControl/sourceControlImport.service.ee.ts
@@ -7,9 +7,8 @@ import {
 	SOURCE_CONTROL_VARIABLES_EXPORT_FILE,
 	SOURCE_CONTROL_WORKFLOW_EXPORT_FOLDER,
 } from './constants';
-import * as Db from '@/Db';
 import glob from 'fast-glob';
-import { jsonParse } from 'n8n-workflow';
+import { ApplicationError, jsonParse } from 'n8n-workflow';
 import { readFile as fsReadFile } from 'fs/promises';
 import { Credentials, InstanceSettings } from 'n8n-core';
 import type { IWorkflowToImport } from '@/Interfaces';
@@ -25,10 +24,17 @@ import type { SourceControlWorkflowVersionId } from './types/sourceControlWorkfl
 import { getCredentialExportPath, getWorkflowExportPath } from './sourceControlHelper.ee';
 import type { SourceControlledFile } from './types/sourceControlledFile';
 import { RoleService } from '@/services/role.service';
-import { VariablesService } from '../variables/variables.service';
-import { TagRepository } from '@/databases/repositories';
+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 { UM_FIX_INSTRUCTION } from '@/constants';
 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 {
@@ -57,7 +63,7 @@ export class SourceControlImportService {
 		const globalOwnerRole = await Container.get(RoleService).findGlobalOwnerRole();
 
 		if (!globalOwnerRole) {
-			throw new Error(`Failed to find owner. ${UM_FIX_INSTRUCTION}`);
+			throw new ApplicationError(`Failed to find owner. ${UM_FIX_INSTRUCTION}`);
 		}
 
 		return globalOwnerRole;
@@ -67,7 +73,7 @@ export class SourceControlImportService {
 		const credentialOwnerRole = await Container.get(RoleService).findCredentialOwnerRole();
 
 		if (!credentialOwnerRole) {
-			throw new Error(`Failed to find owner. ${UM_FIX_INSTRUCTION}`);
+			throw new ApplicationError(`Failed to find owner. ${UM_FIX_INSTRUCTION}`);
 		}
 
 		return credentialOwnerRole;
@@ -77,7 +83,7 @@ export class SourceControlImportService {
 		const workflowOwnerRole = await Container.get(RoleService).findWorkflowOwnerRole();
 
 		if (!workflowOwnerRole) {
-			throw new Error(`Failed to find owner workflow role. ${UM_FIX_INSTRUCTION}`);
+			throw new ApplicationError(`Failed to find owner workflow role. ${UM_FIX_INSTRUCTION}`);
 		}
 
 		return workflowOwnerRole;
@@ -110,7 +116,7 @@ export class SourceControlImportService {
 	}
 
 	public async getLocalVersionIdsFromDb(): Promise<SourceControlWorkflowVersionId[]> {
-		const localWorkflows = await Db.collections.Workflow.find({
+		const localWorkflows = await Container.get(WorkflowRepository).find({
 			select: ['id', 'name', 'versionId', 'updatedAt'],
 		});
 		return localWorkflows.map((local) => ({
@@ -153,7 +159,7 @@ export class SourceControlImportService {
 	public async getLocalCredentialsFromDb(): Promise<
 		Array<ExportableCredential & { filename: string }>
 	> {
-		const localCredentials = await Db.collections.Credentials.find({
+		const localCredentials = await Container.get(CredentialsRepository).find({
 			select: ['id', 'name', 'type', 'nodesAccess'],
 		});
 		return localCredentials.map((local) => ({
@@ -209,7 +215,7 @@ export class SourceControlImportService {
 		const localTags = await this.tagRepository.find({
 			select: ['id', 'name'],
 		});
-		const localMappings = await Db.collections.WorkflowTagMapping.find({
+		const localMappings = await Container.get(WorkflowTagMappingRepository).find({
 			select: ['workflowId', 'tagId'],
 		});
 		return { tags: localTags, mappings: localMappings };
@@ -219,18 +225,13 @@ export class SourceControlImportService {
 		const ownerWorkflowRole = await this.getWorkflowOwnerRole();
 		const workflowRunner = this.activeWorkflowRunner;
 		const candidateIds = candidates.map((c) => c.id);
-		const existingWorkflows = await Db.collections.Workflow.find({
-			where: {
-				id: In(candidateIds),
-			},
-			select: ['id', 'name', 'versionId', 'active'],
-		});
-		const allSharedWorkflows = await Db.collections.SharedWorkflow.find({
-			where: {
-				workflowId: In(candidateIds),
-			},
-			select: ['workflowId', 'roleId', 'userId'],
+		const existingWorkflows = await Container.get(WorkflowRepository).findByIds(candidateIds, {
+			fields: ['id', 'name', 'versionId', 'active'],
 		});
+		const allSharedWorkflows = await Container.get(SharedWorkflowRepository).findWithFields(
+			candidateIds,
+			{ fields: ['workflowId', 'roleId', 'userId'] },
+		);
 		const cachedOwnerIds = new Map<string, string>();
 		const importWorkflowsResult = await Promise.all(
 			candidates.map(async (candidate) => {
@@ -244,9 +245,14 @@ export class SourceControlImportService {
 				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 Db.collections.Workflow.upsert({ ...importedWorkflow }, ['id']);
+				const upsertResult = await Container.get(WorkflowRepository).upsert(
+					{ ...importedWorkflow },
+					['id'],
+				);
 				if (upsertResult?.identifiers?.length !== 1) {
-					throw new Error(`Failed to upsert workflow ${importedWorkflow.id ?? 'new'}`);
+					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
@@ -254,7 +260,7 @@ export class SourceControlImportService {
 				if (cachedOwnerIds.has(importedWorkflow.owner)) {
 					workflowOwnerId = cachedOwnerIds.get(importedWorkflow.owner) ?? userId;
 				} else {
-					const foundUser = await Db.collections.User.findOne({
+					const foundUser = await Container.get(UserRepository).findOne({
 						where: {
 							email: importedWorkflow.owner,
 						},
@@ -278,7 +284,7 @@ export class SourceControlImportService {
 				);
 				if (!existingSharedWorkflowOwnerByUserId && !existingSharedWorkflowOwnerByRoleId) {
 					// no owner exists yet, so create one
-					await Db.collections.SharedWorkflow.insert({
+					await Container.get(SharedWorkflowRepository).insert({
 						workflowId: importedWorkflow.id,
 						userId: workflowOwnerId,
 						roleId: ownerWorkflowRole.id,
@@ -288,7 +294,7 @@ export class SourceControlImportService {
 				} else if (existingSharedWorkflowOwnerByUserId && !existingSharedWorkflowOwnerByRoleId) {
 					// if the worklflow 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 Db.collections.SharedWorkflow.update(
+					await Container.get(SharedWorkflowRepository).update(
 						{
 							workflowId: importedWorkflow.id,
 							userId: workflowOwnerId,
@@ -310,7 +316,7 @@ export class SourceControlImportService {
 					} catch (error) {
 						this.logger.error(`Failed to activate workflow ${existingWorkflow.id}`, error as Error);
 					} finally {
-						await Db.collections.Workflow.update(
+						await Container.get(WorkflowRepository).update(
 							{ id: existingWorkflow.id },
 							{ versionId: importedWorkflow.versionId },
 						);
@@ -331,7 +337,7 @@ export class SourceControlImportService {
 
 	public async importCredentialsFromWorkFolder(candidates: SourceControlledFile[], userId: string) {
 		const candidateIds = candidates.map((c) => c.id);
-		const existingCredentials = await Db.collections.Credentials.find({
+		const existingCredentials = await Container.get(CredentialsRepository).find({
 			where: {
 				id: In(candidateIds),
 			},
@@ -339,7 +345,7 @@ export class SourceControlImportService {
 		});
 		const ownerCredentialRole = await this.getCredentialOwnerRole();
 		const ownerGlobalRole = await this.getOwnerGlobalRole();
-		const existingSharedCredentials = await Db.collections.SharedCredentials.find({
+		const existingSharedCredentials = await Container.get(SharedCredentialsRepository).find({
 			select: ['userId', 'credentialsId', 'roleId'],
 			where: {
 				credentialsId: In(candidateIds),
@@ -370,7 +376,7 @@ export class SourceControlImportService {
 				newCredentialObject.nodesAccess = nodesAccess || existingCredential?.nodesAccess || [];
 
 				this.logger.debug(`Updating credential id ${newCredentialObject.id as string}`);
-				await Db.collections.Credentials.upsert(newCredentialObject, ['id']);
+				await Container.get(CredentialsRepository).upsert(newCredentialObject, ['id']);
 
 				if (!sharedOwner) {
 					const newSharedCredential = new SharedCredentials();
@@ -378,7 +384,7 @@ export class SourceControlImportService {
 					newSharedCredential.userId = userId;
 					newSharedCredential.roleId = ownerCredentialRole.id;
 
-					await Db.collections.SharedCredentials.upsert({ ...newSharedCredential }, [
+					await Container.get(SharedCredentialsRepository).upsert({ ...newSharedCredential }, [
 						'credentialsId',
 						'userId',
 					]);
@@ -413,7 +419,7 @@ export class SourceControlImportService {
 
 		const existingWorkflowIds = new Set(
 			(
-				await Db.collections.Workflow.find({
+				await Container.get(WorkflowRepository).find({
 					select: ['id'],
 				})
 			).map((e) => e.id),
@@ -426,7 +432,7 @@ export class SourceControlImportService {
 					select: ['id'],
 				});
 				if (findByName && findByName.id !== tag.id) {
-					throw new Error(
+					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.`,
 					);
 				}
@@ -442,7 +448,7 @@ export class SourceControlImportService {
 		await Promise.all(
 			mappedTags.mappings.map(async (mapping) => {
 				if (!existingWorkflowIds.has(String(mapping.workflowId))) return;
-				await Db.collections.WorkflowTagMapping.upsert(
+				await Container.get(WorkflowTagMappingRepository).upsert(
 					{ tagId: String(mapping.tagId), workflowId: String(mapping.workflowId) },
 					{
 						skipUpdateIfNoValuesChanged: true,
@@ -489,12 +495,12 @@ export class SourceControlImportService {
 				overriddenKeys.splice(overriddenKeys.indexOf(variable.key), 1);
 			}
 			try {
-				await Db.collections.Variables.upsert({ ...variable }, ['id']);
+				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 Db.collections.Variables.update({ key: variable.key }, { ...variable });
+						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);
@@ -509,8 +515,11 @@ export class SourceControlImportService {
 		if (overriddenKeys.length > 0 && valueOverrides) {
 			for (const key of overriddenKeys) {
 				result.imported.push(key);
-				const newVariable = Db.collections.Variables.create({ key, value: valueOverrides[key] });
-				await Db.collections.Variables.save(newVariable);
+				const newVariable = Container.get(VariablesRepository).create({
+					key,
+					value: valueOverrides[key],
+				});
+				await Container.get(VariablesRepository).save(newVariable);
 			}
 		}
 
diff --git a/packages/cli/src/environments/sourceControl/sourceControlPreferences.service.ee.ts b/packages/cli/src/environments/sourceControl/sourceControlPreferences.service.ee.ts
index 52b5549aae..3b8696b32b 100644
--- a/packages/cli/src/environments/sourceControl/sourceControlPreferences.service.ee.ts
+++ b/packages/cli/src/environments/sourceControl/sourceControlPreferences.service.ee.ts
@@ -1,4 +1,4 @@
-import { Service } from 'typedi';
+import Container, { Service } from 'typedi';
 import { SourceControlPreferences } from './types/sourceControlPreferences';
 import type { ValidationError } from 'class-validator';
 import { validate } from 'class-validator';
@@ -10,8 +10,7 @@ import {
 	sourceControlFoldersExistCheck,
 } from './sourceControlHelper.ee';
 import { InstanceSettings } from 'n8n-core';
-import { jsonParse } from 'n8n-workflow';
-import * as Db from '@/Db';
+import { ApplicationError, jsonParse } from 'n8n-workflow';
 import {
 	SOURCE_CONTROL_SSH_FOLDER,
 	SOURCE_CONTROL_GIT_FOLDER,
@@ -22,6 +21,7 @@ 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 {
@@ -108,7 +108,7 @@ export class SourceControlPreferencesService {
 				});
 				await fsWriteFile(this.sshKeyName, keyPair.privateKey, { encoding: 'utf8', mode: 0o600 });
 			} catch (error) {
-				throw Error(`Failed to save key pair: ${(error as Error).message}`);
+				throw new ApplicationError('Failed to save key pair', { cause: error });
 			}
 		}
 		// update preferences only after generating key pair to prevent endless loop
@@ -150,7 +150,9 @@ export class SourceControlPreferencesService {
 			validationError: { target: false },
 		});
 		if (validationResult.length > 0) {
-			throw new Error(`Invalid source control preferences: ${JSON.stringify(validationResult)}`);
+			throw new ApplicationError('Invalid source control preferences', {
+				extra: { preferences: validationResult },
+			});
 		}
 		return validationResult;
 	}
@@ -171,13 +173,13 @@ export class SourceControlPreferencesService {
 		if (saveToDb) {
 			const settingsValue = JSON.stringify(this._sourceControlPreferences);
 			try {
-				await Db.collections.Settings.save({
+				await Container.get(SettingsRepository).save({
 					key: SOURCE_CONTROL_PREFERENCES_DB_KEY,
 					value: settingsValue,
 					loadOnStartup: true,
 				});
 			} catch (error) {
-				throw new Error(`Failed to save source control preferences: ${(error as Error).message}`);
+				throw new ApplicationError('Failed to save source control preferences', { cause: error });
 			}
 		}
 		return this.sourceControlPreferences;
@@ -186,7 +188,7 @@ export class SourceControlPreferencesService {
 	async loadFromDbAndApplySourceControlPreferences(): Promise<
 		SourceControlPreferences | undefined
 	> {
-		const loadedPreferences = await Db.collections.Settings.findOne({
+		const loadedPreferences = await Container.get(SettingsRepository).findOne({
 			where: { key: SOURCE_CONTROL_PREFERENCES_DB_KEY },
 		});
 		if (loadedPreferences) {
diff --git a/packages/cli/src/environments/variables/enviromentHelpers.ts b/packages/cli/src/environments/variables/environmentHelpers.ts
similarity index 100%
rename from packages/cli/src/environments/variables/enviromentHelpers.ts
rename to packages/cli/src/environments/variables/environmentHelpers.ts
diff --git a/packages/cli/src/environments/variables/variables.controller.ee.ts b/packages/cli/src/environments/variables/variables.controller.ee.ts
index b97009552a..69a0b03d2d 100644
--- a/packages/cli/src/environments/variables/variables.controller.ee.ts
+++ b/packages/cli/src/environments/variables/variables.controller.ee.ts
@@ -1,80 +1,85 @@
-import express from 'express';
-import { Container } from 'typedi';
-
-import * as ResponseHelper from '@/ResponseHelper';
-import type { VariablesRequest } from '@/requests';
+import { VariablesRequest } from '@/requests';
 import {
-	VariablesLicenseError,
-	EEVariablesService,
-	VariablesValidationError,
-} from './variables.service.ee';
-import { isVariablesEnabled } from './enviromentHelpers';
-import { Logger } from '@/Logger';
+	Authorized,
+	Delete,
+	Get,
+	Licensed,
+	Patch,
+	Post,
+	RequireGlobalScope,
+	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';
 
-// eslint-disable-next-line @typescript-eslint/naming-convention
-export const EEVariablesController = express.Router();
+@Authorized()
+@RestController('/variables')
+export class VariablesController {
+	constructor(private readonly variablesService: VariablesService) {}
 
-EEVariablesController.use((req, res, next) => {
-	if (!isVariablesEnabled()) {
-		next('router');
-		return;
+	@Get('/')
+	@RequireGlobalScope('variable:list')
+	async getVariables() {
+		return this.variablesService.getAllCached();
 	}
 
-	next();
-});
-
-EEVariablesController.post(
-	'/',
-	ResponseHelper.send(async (req: VariablesRequest.Create) => {
-		if (req.user.globalRole.name !== 'owner') {
-			Container.get(Logger).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')
+	@RequireGlobalScope('variable:create')
+	async createVariable(req: VariablesRequest.Create) {
 		const variable = req.body;
 		delete variable.id;
 		try {
-			return await Container.get(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(\\w+)',
-	ResponseHelper.send(async (req: VariablesRequest.Update) => {
+	@Get('/:id')
+	@RequireGlobalScope('variable:read')
+	async getVariable(req: VariablesRequest.Get) {
 		const id = req.params.id;
-		if (req.user.globalRole.name !== 'owner') {
-			Container.get(Logger).info(
-				'Attempt to update a variable blocked due to lack of permissions',
-				{
-					id,
-					userId: req.user.id,
-				},
-			);
-			throw new ResponseHelper.AuthError('Unauthorized');
+		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')
+	@RequireGlobalScope('variable:update')
+	async updateVariable(req: VariablesRequest.Update) {
+		const id = req.params.id;
 		const variable = req.body;
 		delete variable.id;
 		try {
-			return await Container.get(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+)')
+	@RequireGlobalScope('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 baaa8dd7a4..0000000000
--- a/packages/cli/src/environments/variables/variables.controller.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-import express from 'express';
-import { Container } from 'typedi';
-
-import * as ResponseHelper from '@/ResponseHelper';
-import type { VariablesRequest } from '@/requests';
-import { VariablesService } from './variables.service';
-import { EEVariablesController } from './variables.controller.ee';
-import { Logger } from '@/Logger';
-
-export const variablesController = express.Router();
-
-variablesController.use('/', EEVariablesController);
-variablesController.use(EEVariablesController);
-
-variablesController.get(
-	'/',
-	ResponseHelper.send(async () => {
-		return Container.get(VariablesService).getAllCached();
-	}),
-);
-
-variablesController.post(
-	'/',
-	ResponseHelper.send(async () => {
-		throw new ResponseHelper.BadRequestError('No variables license found');
-	}),
-);
-
-variablesController.get(
-	'/:id(\\w+)',
-	ResponseHelper.send(async (req: VariablesRequest.Get) => {
-		const id = req.params.id;
-		const variable = await Container.get(VariablesService).getCached(id);
-		if (variable === null) {
-			throw new ResponseHelper.NotFoundError(`Variable with id ${req.params.id} not found`);
-		}
-		return variable;
-	}),
-);
-
-variablesController.patch(
-	'/:id(\\w+)',
-	ResponseHelper.send(async () => {
-		throw new ResponseHelper.BadRequestError('No variables license found');
-	}),
-);
-
-variablesController.delete(
-	'/:id(\\w+)',
-	ResponseHelper.send(async (req: VariablesRequest.Delete) => {
-		const id = req.params.id;
-		if (req.user.globalRole.name !== 'owner') {
-			Container.get(Logger).info(
-				'Attempt to delete a variable blocked due to lack of permissions',
-				{
-					id,
-					userId: req.user.id,
-				},
-			);
-			throw new ResponseHelper.AuthError('Unauthorized');
-		}
-		await Container.get(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 74e8926f8b..c249b31f60 100644
--- a/packages/cli/src/environments/variables/variables.service.ee.ts
+++ b/packages/cli/src/environments/variables/variables.service.ee.ts
@@ -2,29 +2,71 @@ import { Container, Service } from 'typedi';
 import type { Variables } from '@db/entities/Variables';
 import { InternalHooks } from '@/InternalHooks';
 import { generateNanoId } from '@db/utils/generators';
-import { canCreateNewVariable } from './enviromentHelpers';
-import { VariablesService } from './variables.service';
-
-export class VariablesLicenseError extends Error {}
-export class VariablesValidationError extends Error {}
+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';
 
 @Service()
-export class EEVariablesService extends VariablesService {
+export class VariablesService {
+	constructor(
+		protected cacheService: CacheService,
+		protected variablesRepository: VariablesRepository,
+	) {}
+
+	async getAllCached(): Promise<Variables[]> {
+		const variables = await this.cacheService.get('variables', {
+			async refreshFn() {
+				return Container.get(VariablesService).findAll();
+			},
+		});
+		return (variables as Array<Partial<Variables>>).map((v) => this.variablesRepository.create(v));
+	}
+
+	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 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');
+			throw new VariableValidationError('value cannot be longer than 255 characters');
 		}
 	}
 
 	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);
 
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 c05d9bb08b..0000000000
--- a/packages/cli/src/environments/variables/variables.service.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-import type { Variables } from '@db/entities/Variables';
-import { CacheService } from '@/services/cache.service';
-import Container, { Service } from 'typedi';
-import { VariablesRepository } from '@/databases/repositories';
-import type { DeepPartial } from 'typeorm';
-
-@Service()
-export class VariablesService {
-	constructor(
-		protected cacheService: CacheService,
-		protected variablesRepository: VariablesRepository,
-	) {}
-
-	async getAllCached(): Promise<Variables[]> {
-		const variables = await this.cacheService.get('variables', {
-			async refreshFunction() {
-				// TODO: log refresh cache metric
-				return Container.get(VariablesService).findAll();
-			},
-		});
-		return (variables as Array<DeepPartial<Variables>>).map((v) =>
-			this.variablesRepository.create(v),
-		);
-	}
-
-	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 DeepPartial<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 this.variablesRepository.find();
-	}
-}
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 0000000000..178cbc8582
--- /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 0000000000..7888ee97b2
--- /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 0000000000..ac47a0eaea
--- /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 0000000000..422236d148
--- /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 0000000000..1419501941
--- /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 0000000000..fc5ebb8aa9
--- /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/not-string-array.error.ts b/packages/cli/src/errors/not-string-array.error.ts
new file mode 100644
index 0000000000..22e9fae902
--- /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/response-errors/abstract/response.error.ts b/packages/cli/src/errors/response-errors/abstract/response.error.ts
new file mode 100644
index 0000000000..f756afce41
--- /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 0000000000..cb3441211b
--- /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 0000000000..560688f2cb
--- /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 0000000000..fdf3390371
--- /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/internal-server.error.ts b/packages/cli/src/errors/response-errors/internal-server.error.ts
new file mode 100644
index 0000000000..4c10e93f95
--- /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 0000000000..9d9e0e12d5
--- /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 0000000000..7736e85f5f
--- /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 0000000000..bc8993c014
--- /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 0000000000..723acbfbaf
--- /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 0000000000..617c119a1e
--- /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 'Execute 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 0000000000..ae4c99f3f3
--- /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/unrecognized-node-type.error.ts b/packages/cli/src/errors/unrecognized-node-type.error.ts
new file mode 100644
index 0000000000..1ca5281de5
--- /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 0000000000..67d14efebf
--- /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 0000000000..bd2026e7ef
--- /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 0000000000..104385672f
--- /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 0000000000..469ee6f4f0
--- /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/AbstractEventMessage.ts b/packages/cli/src/eventbus/EventMessageClasses/AbstractEventMessage.ts
index 7d4fbff4ad..f71b03a413 100644
--- a/packages/cli/src/eventbus/EventMessageClasses/AbstractEventMessage.ts
+++ b/packages/cli/src/eventbus/EventMessageClasses/AbstractEventMessage.ts
@@ -3,7 +3,7 @@ import { DateTime } from 'luxon';
 import type { EventMessageTypeNames, JsonObject } from 'n8n-workflow';
 import { v4 as uuid } from 'uuid';
 import type { AbstractEventPayload } from './AbstractEventPayload';
-import { AbstractEventMessageOptions } from './AbstractEventMessageOptions';
+import type { AbstractEventMessageOptions } from './AbstractEventMessageOptions';
 import type { EventNamesTypes } from '.';
 
 function modifyUnderscoredKeys(
diff --git a/packages/cli/src/eventbus/MessageEventBus/MessageEventBus.ts b/packages/cli/src/eventbus/MessageEventBus/MessageEventBus.ts
index 80ed8d3507..e578aed95f 100644
--- a/packages/cli/src/eventbus/MessageEventBus/MessageEventBus.ts
+++ b/packages/cli/src/eventbus/MessageEventBus/MessageEventBus.ts
@@ -11,7 +11,6 @@ import type { MessageEventBusDestination } from '../MessageEventBusDestination/M
 import { MessageEventBusLogWriter } from '../MessageEventBusWriter/MessageEventBusLogWriter';
 import EventEmitter from 'events';
 import config from '@/config';
-import * as Db from '@/Db';
 import { messageEventBusDestinationFromDb } from '../MessageEventBusDestination/MessageEventBusDestinationFromDb';
 import uniqby from 'lodash/uniqBy';
 import type { EventMessageConfirmSource } from '../EventMessageClasses/EventMessageConfirm';
@@ -29,11 +28,13 @@ import {
 import { recoverExecutionDataFromEventLogMessages } from './recoverEvents';
 import { METRICS_EVENT_NAME } from '../MessageEventBusDestination/Helpers.ee';
 import { Container, Service } from 'typedi';
-import { ExecutionRepository, WorkflowRepository } from '@/databases/repositories';
+import { ExecutionRepository } from '@db/repositories/execution.repository';
+import { WorkflowRepository } from '@db/repositories/workflow.repository';
 import type { AbstractEventMessageOptions } from '../EventMessageClasses/AbstractEventMessageOptions';
 import { getEventMessageObjectByType } from '../EventMessageClasses/Helpers';
-import { OrchestrationMainService } from '@/services/orchestration/main/orchestration.main.service';
+import { SingleMainSetup } from '@/services/orchestration/main/SingleMainSetup';
 import { Logger } from '@/Logger';
+import { EventDestinationsRepository } from '@db/repositories/eventDestinations.repository';
 
 export type EventMessageReturnMode = 'sent' | 'unsent' | 'all' | 'unfinished';
 
@@ -79,7 +80,7 @@ export class MessageEventBus extends EventEmitter {
 
 		this.logger.debug('Initializing event bus...');
 
-		const savedEventDestinations = await Db.collections.EventDestinations.find({});
+		const savedEventDestinations = await Container.get(EventDestinationsRepository).find({});
 		if (savedEventDestinations.length > 0) {
 			for (const destinationData of savedEventDestinations) {
 				try {
@@ -206,9 +207,7 @@ export class MessageEventBus extends EventEmitter {
 		this.destinations[destination.getId()] = destination;
 		this.destinations[destination.getId()].startListening();
 		if (notifyWorkers) {
-			await Container.get(
-				OrchestrationMainService,
-			).broadcastRestartEventbusAfterDestinationUpdate();
+			await Container.get(SingleMainSetup).broadcastRestartEventbusAfterDestinationUpdate();
 		}
 		return destination;
 	}
@@ -234,9 +233,7 @@ export class MessageEventBus extends EventEmitter {
 			delete this.destinations[id];
 		}
 		if (notifyWorkers) {
-			await Container.get(
-				OrchestrationMainService,
-			).broadcastRestartEventbusAfterDestinationUpdate();
+			await Container.get(SingleMainSetup).broadcastRestartEventbusAfterDestinationUpdate();
 		}
 		return result;
 	}
diff --git a/packages/cli/src/eventbus/MessageEventBus/recoverEvents.ts b/packages/cli/src/eventbus/MessageEventBus/recoverEvents.ts
index 1e02cc9512..6aa3fe616c 100644
--- a/packages/cli/src/eventbus/MessageEventBus/recoverEvents.ts
+++ b/packages/cli/src/eventbus/MessageEventBus/recoverEvents.ts
@@ -6,7 +6,7 @@ import { Push } from '@/push';
 import { Container } from 'typedi';
 import { InternalHooks } from '@/InternalHooks';
 import { getWorkflowHooksMain } from '@/WorkflowExecuteAdditionalData';
-import { ExecutionRepository } from '@db/repositories';
+import { ExecutionRepository } from '@db/repositories/execution.repository';
 
 export async function recoverExecutionDataFromEventLogMessages(
 	executionId: string,
@@ -195,7 +195,7 @@ export async function recoverExecutionDataFromEventLogMessages(
 			push.once('editorUiConnected', function handleUiBackUp() {
 				// add a small timeout to make sure the UI is back up
 				setTimeout(() => {
-					push.send('executionRecovered', { executionId });
+					push.broadcast('executionRecovered', { executionId });
 				}, 1000);
 			});
 		}
diff --git a/packages/cli/src/eventbus/MessageEventBusDestination/MessageEventBusDestination.ee.ts b/packages/cli/src/eventbus/MessageEventBusDestination/MessageEventBusDestination.ee.ts
index 1aea086b3d..28736873cc 100644
--- a/packages/cli/src/eventbus/MessageEventBusDestination/MessageEventBusDestination.ee.ts
+++ b/packages/cli/src/eventbus/MessageEventBusDestination/MessageEventBusDestination.ee.ts
@@ -1,18 +1,13 @@
 import { v4 as uuid } from 'uuid';
 import { Container } from 'typedi';
-import type { DeleteResult, InsertResult } from 'typeorm';
-import type { INodeCredentials } from 'n8n-workflow';
-import {
-	MessageEventBusDestinationTypeNames,
-	MessageEventBusDestinationOptions,
-} from 'n8n-workflow';
-import * as Db from '@/Db';
+import type { INodeCredentials, MessageEventBusDestinationOptions } from 'n8n-workflow';
+import { MessageEventBusDestinationTypeNames } from 'n8n-workflow';
 import { Logger } from '@/Logger';
 import type { AbstractEventMessage } from '../EventMessageClasses/AbstractEventMessage';
 import type { EventMessageTypes } from '../EventMessageClasses';
 import type { EventMessageConfirmSource } from '../EventMessageClasses/EventMessageConfirm';
-import { MessageEventBus } from '../MessageEventBus/MessageEventBus';
-import type { MessageWithCallback } from '../MessageEventBus/MessageEventBus';
+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.
@@ -96,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'],
 		});
@@ -107,8 +102,8 @@ export abstract class MessageEventBusDestination implements MessageEventBusDesti
 		return 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
index 348e5cf8c6..27951448ce 100644
--- a/packages/cli/src/eventbus/MessageEventBusDestination/MessageEventBusDestinationFromDb.ts
+++ b/packages/cli/src/eventbus/MessageEventBusDestination/MessageEventBusDestinationFromDb.ts
@@ -1,5 +1,5 @@
 import { MessageEventBusDestinationTypeNames } from 'n8n-workflow';
-import type { EventDestinations } from '@/databases/entities/EventDestinations';
+import type { EventDestinations } from '@db/entities/EventDestinations';
 import type { MessageEventBus } from '../MessageEventBus/MessageEventBus';
 import type { MessageEventBusDestination } from './MessageEventBusDestination.ee';
 import { MessageEventBusDestinationSentry } from './MessageEventBusDestinationSentry.ee';
diff --git a/packages/cli/src/eventbus/MessageEventBusDestination/MessageEventBusDestinationSentry.ee.ts b/packages/cli/src/eventbus/MessageEventBusDestination/MessageEventBusDestinationSentry.ee.ts
index 3eeda0aa22..7c03927aac 100644
--- a/packages/cli/src/eventbus/MessageEventBusDestination/MessageEventBusDestinationSentry.ee.ts
+++ b/packages/cli/src/eventbus/MessageEventBusDestination/MessageEventBusDestinationSentry.ee.ts
@@ -2,16 +2,15 @@
 
 import { MessageEventBusDestination } from './MessageEventBusDestination.ee';
 import * as Sentry from '@sentry/node';
-import {
-	MessageEventBusDestinationTypeNames,
+import { MessageEventBusDestinationTypeNames } from 'n8n-workflow';
+import type {
+	MessageEventBusDestinationOptions,
 	MessageEventBusDestinationSentryOptions,
 } from 'n8n-workflow';
-import type { MessageEventBusDestinationOptions } from 'n8n-workflow';
 import { isLogStreamingEnabled } from '../MessageEventBus/MessageEventBusHelper';
 import { eventMessageGenericDestinationTestEvent } from '../EventMessageClasses/EventMessageGeneric';
 import { N8N_VERSION } from '@/constants';
-import { MessageEventBus } from '../MessageEventBus/MessageEventBus';
-import type { MessageWithCallback } from '../MessageEventBus/MessageEventBus';
+import type { MessageEventBus, MessageWithCallback } from '../MessageEventBus/MessageEventBus';
 
 export const isMessageEventBusDestinationSentryOptions = (
 	candidate: unknown,
diff --git a/packages/cli/src/eventbus/MessageEventBusDestination/MessageEventBusDestinationSyslog.ee.ts b/packages/cli/src/eventbus/MessageEventBusDestination/MessageEventBusDestinationSyslog.ee.ts
index d6ef934595..5fe894ee7d 100644
--- a/packages/cli/src/eventbus/MessageEventBusDestination/MessageEventBusDestinationSyslog.ee.ts
+++ b/packages/cli/src/eventbus/MessageEventBusDestination/MessageEventBusDestinationSyslog.ee.ts
@@ -1,16 +1,15 @@
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 import syslog from 'syslog-client';
 
-import type { MessageEventBusDestinationOptions } from 'n8n-workflow';
-import {
-	MessageEventBusDestinationTypeNames,
+import type {
+	MessageEventBusDestinationOptions,
 	MessageEventBusDestinationSyslogOptions,
 } from 'n8n-workflow';
+import { MessageEventBusDestinationTypeNames } from 'n8n-workflow';
 import { MessageEventBusDestination } from './MessageEventBusDestination.ee';
 import { isLogStreamingEnabled } from '../MessageEventBus/MessageEventBusHelper';
 import { eventMessageGenericDestinationTestEvent } from '../EventMessageClasses/EventMessageGeneric';
-import { MessageEventBus } from '../MessageEventBus/MessageEventBus';
-import type { MessageWithCallback } from '../MessageEventBus/MessageEventBus';
+import type { MessageEventBus, MessageWithCallback } from '../MessageEventBus/MessageEventBus';
 export const isMessageEventBusDestinationSyslogOptions = (
 	candidate: unknown,
 ): candidate is MessageEventBusDestinationSyslogOptions => {
diff --git a/packages/cli/src/eventbus/MessageEventBusDestination/MessageEventBusDestinationWebhook.ee.ts b/packages/cli/src/eventbus/MessageEventBusDestination/MessageEventBusDestinationWebhook.ee.ts
index 034b8776de..348eb0ef66 100644
--- a/packages/cli/src/eventbus/MessageEventBusDestination/MessageEventBusDestinationWebhook.ee.ts
+++ b/packages/cli/src/eventbus/MessageEventBusDestination/MessageEventBusDestinationWebhook.ee.ts
@@ -5,24 +5,19 @@
 import { MessageEventBusDestination } from './MessageEventBusDestination.ee';
 import axios from 'axios';
 import type { AxiosRequestConfig, Method } from 'axios';
-import {
-	jsonParse,
-	MessageEventBusDestinationTypeNames,
-	MessageEventBusDestinationWebhookOptions,
-} from 'n8n-workflow';
+import { jsonParse, MessageEventBusDestinationTypeNames } from 'n8n-workflow';
 import type {
 	MessageEventBusDestinationOptions,
 	MessageEventBusDestinationWebhookParameterItem,
 	MessageEventBusDestinationWebhookParameterOptions,
 	IWorkflowExecuteAdditionalData,
+	MessageEventBusDestinationWebhookOptions,
 } from 'n8n-workflow';
 import { CredentialsHelper } from '@/CredentialsHelper';
 import { Agent as HTTPSAgent } from 'https';
-import config from '@/config';
 import { isLogStreamingEnabled } from '../MessageEventBus/MessageEventBusHelper';
 import { eventMessageGenericDestinationTestEvent } from '../EventMessageClasses/EventMessageGeneric';
-import { MessageEventBus } from '../MessageEventBus/MessageEventBus';
-import type { MessageWithCallback } from '../MessageEventBus/MessageEventBus';
+import type { MessageEventBus, MessageWithCallback } from '../MessageEventBus/MessageEventBus';
 import * as SecretsHelpers from '@/ExternalSecrets/externalSecretsHelper.ee';
 import Container from 'typedi';
 
@@ -107,13 +102,12 @@ export class MessageEventBusDestinationWebhook
 	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;
@@ -168,7 +162,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 },
 		) => {
@@ -332,9 +325,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,
diff --git a/packages/cli/src/eventbus/MessageEventBusWriter/MessageEventBusLogWriterWorker.ts b/packages/cli/src/eventbus/MessageEventBusWriter/MessageEventBusLogWriterWorker.ts
index 5e2d771186..53bdc2a829 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';
diff --git a/packages/cli/src/eventbus/eventBus.controller.ee.ts b/packages/cli/src/eventbus/eventBus.controller.ee.ts
index 67077725e7..32346dd27f 100644
--- a/packages/cli/src/eventbus/eventBus.controller.ee.ts
+++ b/packages/cli/src/eventbus/eventBus.controller.ee.ts
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
 import express from 'express';
 import { eventBus } from './MessageEventBus/MessageEventBus';
 import {
@@ -10,17 +9,16 @@ import {
 	MessageEventBusDestinationSyslog,
 } from './MessageEventBusDestination/MessageEventBusDestinationSyslog.ee';
 import { MessageEventBusDestinationWebhook } from './MessageEventBusDestination/MessageEventBusDestinationWebhook.ee';
-import { BadRequestError } from '@/ResponseHelper';
 import type {
 	MessageEventBusDestinationWebhookOptions,
 	MessageEventBusDestinationOptions,
 } from 'n8n-workflow';
 import { MessageEventBusDestinationTypeNames } from 'n8n-workflow';
-import { RestController, Get, Post, Delete, Authorized } from '@/decorators';
+import { RestController, Get, Post, Delete, Authorized, RequireGlobalScope } from '@/decorators';
 import type { MessageEventBusDestination } from './MessageEventBusDestination/MessageEventBusDestination.ee';
-import type { DeleteResult } from 'typeorm';
 import { AuthenticatedRequest } from '@/requests';
 import { logStreamingLicensedMiddleware } from './middleware/logStreamingEnabled.middleware.ee';
+import { BadRequestError } from '@/errors/response-errors/bad-request.error';
 
 // ----------------------------------------
 // TypeGuards
@@ -60,6 +58,7 @@ export class EventBusControllerEE {
 	// ----------------------------------------
 
 	@Get('/destination', { middlewares: [logStreamingLicensedMiddleware] })
+	@RequireGlobalScope('eventBusDestination:list')
 	async getDestination(req: express.Request): Promise<MessageEventBusDestinationOptions[]> {
 		if (isWithIdString(req.query)) {
 			return eventBus.findDestination(req.query.id);
@@ -68,8 +67,8 @@ export class EventBusControllerEE {
 		}
 	}
 
-	@Authorized(['global', 'owner'])
 	@Post('/destination', { middlewares: [logStreamingLicensedMiddleware] })
+	@RequireGlobalScope('eventBusDestination:create')
 	async postDestination(req: AuthenticatedRequest): Promise<any> {
 		let result: MessageEventBusDestination | undefined;
 		if (isMessageEventBusDestinationOptions(req.body)) {
@@ -113,6 +112,7 @@ export class EventBusControllerEE {
 	}
 
 	@Get('/testmessage', { middlewares: [logStreamingLicensedMiddleware] })
+	@RequireGlobalScope('eventBusDestination:test')
 	async sendTestMessage(req: express.Request): Promise<boolean> {
 		if (isWithIdString(req.query)) {
 			return eventBus.testDestination(req.query.id);
@@ -120,9 +120,9 @@ export class EventBusControllerEE {
 		return false;
 	}
 
-	@Authorized(['global', 'owner'])
 	@Delete('/destination', { middlewares: [logStreamingLicensedMiddleware] })
-	async deleteDestination(req: AuthenticatedRequest): Promise<DeleteResult | undefined> {
+	@RequireGlobalScope('eventBusDestination:delete')
+	async deleteDestination(req: AuthenticatedRequest) {
 		if (isWithIdString(req.query)) {
 			return eventBus.removeDestination(req.query.id);
 		} else {
diff --git a/packages/cli/src/eventbus/eventBus.controller.ts b/packages/cli/src/eventbus/eventBus.controller.ts
index 50d2f84525..6e46c75d55 100644
--- a/packages/cli/src/eventbus/eventBus.controller.ts
+++ b/packages/cli/src/eventbus/eventBus.controller.ts
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
 import express from 'express';
 import { isEventMessageOptions } from './EventMessageClasses/AbstractEventMessage';
 import { EventMessageGeneric } from './EventMessageClasses/EventMessageGeneric';
@@ -10,13 +9,13 @@ import type { EventMessageTypes, FailedEventSummary } from './EventMessageClasse
 import { eventNamesAll } from './EventMessageClasses';
 import type { EventMessageAuditOptions } from './EventMessageClasses/EventMessageAudit';
 import { EventMessageAudit } from './EventMessageClasses/EventMessageAudit';
-import { BadRequestError } from '@/ResponseHelper';
 import type { IRunExecutionData } from 'n8n-workflow';
 import { EventMessageTypeNames } from 'n8n-workflow';
 import type { EventMessageNodeOptions } from './EventMessageClasses/EventMessageNode';
 import { EventMessageNode } from './EventMessageClasses/EventMessageNode';
 import { recoverExecutionDataFromEventLogMessages } from './MessageEventBus/recoverEvents';
-import { RestController, Get, Post, Authorized } from '@/decorators';
+import { RestController, Get, Post, Authorized, RequireGlobalScope } from '@/decorators';
+import { BadRequestError } from '@/errors/response-errors/bad-request.error';
 
 // ----------------------------------------
 // TypeGuards
@@ -38,8 +37,8 @@ export class EventBusController {
 	// ----------------------------------------
 	// Events
 	// ----------------------------------------
-	@Authorized(['global', 'owner'])
 	@Get('/event')
+	@RequireGlobalScope('eventBusEvent:query')
 	async getEvents(
 		req: express.Request,
 	): Promise<EventMessageTypes[] | Record<string, EventMessageTypes[]>> {
@@ -61,12 +60,14 @@ export class EventBusController {
 	}
 
 	@Get('/failed')
+	@RequireGlobalScope('eventBusEvent:list')
 	async getFailedEvents(req: express.Request): Promise<FailedEventSummary[]> {
 		const amount = parseInt(req.query?.amount as string) ?? 5;
 		return eventBus.getEventsFailed(amount);
 	}
 
 	@Get('/execution/:id')
+	@RequireGlobalScope('eventBusEvent:read')
 	async getEventForExecutionId(req: express.Request): Promise<EventMessageTypes[] | undefined> {
 		if (req.params?.id) {
 			let logHistory;
@@ -79,6 +80,7 @@ export class EventBusController {
 	}
 
 	@Get('/execution-recover/:id')
+	@RequireGlobalScope('eventBusEvent:read')
 	async getRecoveryForExecutionId(req: express.Request): Promise<IRunExecutionData | undefined> {
 		const { id } = req.params;
 		if (req.params?.id) {
@@ -92,8 +94,8 @@ export class EventBusController {
 		return;
 	}
 
-	@Authorized(['global', 'owner'])
 	@Post('/event')
+	@RequireGlobalScope('eventBusEvent:create')
 	async postEvent(req: express.Request): Promise<EventMessageTypes | undefined> {
 		let msg: EventMessageTypes | undefined;
 		if (isEventMessageOptions(req.body)) {
diff --git a/packages/cli/src/executionLifecycleHooks/restoreBinaryDataId.ts b/packages/cli/src/executionLifecycleHooks/restoreBinaryDataId.ts
index c43788c094..84780a785e 100644
--- a/packages/cli/src/executionLifecycleHooks/restoreBinaryDataId.ts
+++ b/packages/cli/src/executionLifecycleHooks/restoreBinaryDataId.ts
@@ -1,13 +1,18 @@
 import Container from 'typedi';
 import { BinaryDataService } from 'n8n-core';
-import type { IRun } from 'n8n-workflow';
+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
@@ -16,29 +21,55 @@ import type { BinaryData } from 'n8n-core';
  * s3:workflows/123/executions/390/binary_data/69055-83c4-4493-876a-9092c4708b9b
  * ```
  */
-export async function restoreBinaryDataId(run: IRun, executionId: string) {
-	const { runData } = run.data.resultData;
+export async function restoreBinaryDataId(
+	run: IRun,
+	executionId: string,
+	workflowExecutionMode: WorkflowExecuteMode,
+) {
+	if (
+		workflowExecutionMode !== 'webhook' ||
+		config.getEnv('binaryDataManager.mode') === 'default'
+	) {
+		return;
+	}
 
-	const promises = Object.keys(runData).map(async (nodeName) => {
-		const binaryDataId = runData[nodeName]?.[0]?.data?.main?.[0]?.[0]?.binary?.data?.id;
+	try {
+		const { runData } = run.data.resultData;
 
-		if (!binaryDataId) return;
+		const promises = Object.keys(runData).map(async (nodeName) => {
+			const binaryDataId = runData[nodeName]?.[0]?.data?.main?.[0]?.[0]?.binary?.data?.id;
 
-		const [mode, fileId] = binaryDataId.split(':') as [BinaryData.StoredMode, string];
+			if (!binaryDataId) return;
 
-		const isMissingExecutionId = fileId.includes('/temp/');
+			const [mode, fileId] = binaryDataId.split(':') as [BinaryData.StoredMode, string];
 
-		if (!isMissingExecutionId) return;
+			const isMissingExecutionId = fileId.includes('/temp/');
 
-		const correctFileId = fileId.replace('temp', executionId);
+			if (!isMissingExecutionId) return;
 
-		await Container.get(BinaryDataService).rename(fileId, correctFileId);
+			const correctFileId = fileId.replace('temp', executionId);
 
-		const correctBinaryDataId = `${mode}:${correctFileId}`;
+			await Container.get(BinaryDataService).rename(fileId, correctFileId);
 
-		// @ts-expect-error Validated at the top
-		run.data.resultData.runData[nodeName][0].data.main[0][0].binary.data.id = correctBinaryDataId;
-	});
+			const correctBinaryDataId = `${mode}:${correctFileId}`;
 
-	await Promise.all(promises);
+			// @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 0000000000..d5f0d7237d
--- /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,
+	sessionId?: 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,
+				sessionId,
+				workflowId: workflowData.id,
+			},
+		);
+	}
+}
diff --git a/packages/cli/src/executionLifecycleHooks/shared/sharedHookFunctions.ts b/packages/cli/src/executionLifecycleHooks/shared/sharedHookFunctions.ts
index eba4c6cf25..dc520d90b2 100644
--- a/packages/cli/src/executionLifecycleHooks/shared/sharedHookFunctions.ts
+++ b/packages/cli/src/executionLifecycleHooks/shared/sharedHookFunctions.ts
@@ -3,15 +3,19 @@ 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';
+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 === 'failed';
 	const workflowDidSucceed =
-		!runData.data.resultData.error && !workflowHasCrashed && !workflowWasCanceled;
+		!runData.data.resultData?.error &&
+		!workflowHasCrashed &&
+		!workflowWasCanceled &&
+		!workflowHasFailed;
 	let workflowStatusFinal: ExecutionStatus = workflowDidSucceed ? 'success' : 'failed';
 	if (workflowHasCrashed) workflowStatusFinal = 'crashed';
 	if (workflowWasCanceled) workflowStatusFinal = 'canceled';
@@ -50,6 +54,7 @@ export function prepareExecutionDataForDbUpdate(parameters: {
 		workflowData: pristineWorkflowData,
 		waitTill: runData.waitTill,
 		status: workflowStatusFinal,
+		workflowId: pristineWorkflowData.id,
 	};
 
 	if (retryOf !== undefined) {
diff --git a/packages/cli/src/executionLifecycleHooks/toSaveSettings.ts b/packages/cli/src/executionLifecycleHooks/toSaveSettings.ts
new file mode 100644
index 0000000000..4b4aac2b85
--- /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/executions.controller.ee.ts b/packages/cli/src/executions/executions.controller.ee.ts
index 0a7a1c329d..673d74d15c 100644
--- a/packages/cli/src/executions/executions.controller.ee.ts
+++ b/packages/cli/src/executions/executions.controller.ee.ts
@@ -9,7 +9,6 @@ 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) => {
diff --git a/packages/cli/src/executions/executions.service.ee.ts b/packages/cli/src/executions/executions.service.ee.ts
index e46d873a42..662ce38759 100644
--- a/packages/cli/src/executions/executions.service.ee.ts
+++ b/packages/cli/src/executions/executions.service.ee.ts
@@ -3,8 +3,10 @@ import { getSharedWorkflowIds } from '@/WorkflowHelpers';
 import { ExecutionsService } from './executions.service';
 import type { ExecutionRequest } from '@/requests';
 import type { IExecutionResponse, IExecutionFlattedResponse } from '@/Interfaces';
-import { EEWorkflowsService as EEWorkflows } from '../workflows/workflows.services.ee';
+import { EnterpriseWorkflowService } from '../workflows/workflow.service.ee';
 import type { WorkflowWithSharingsAndCredentials } from '@/workflows/workflows.types';
+import Container from 'typedi';
+import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
 
 export class EEExecutionsService extends ExecutionsService {
 	/**
@@ -23,14 +25,17 @@ export class EEExecutionsService extends ExecutionsService {
 		if (!execution) return;
 
 		const relations = ['shared', 'shared.user', 'shared.role'];
-		const workflow = (await EEWorkflows.get(
+
+		const workflow = (await Container.get(WorkflowRepository).get(
 			{ id: execution.workflowId },
 			{ relations },
 		)) as WorkflowWithSharingsAndCredentials;
 		if (!workflow) return;
 
-		EEWorkflows.addOwnerAndSharings(workflow);
-		await EEWorkflows.addCredentialsToWorkflow(workflow, req.user);
+		const enterpriseWorkflowService = Container.get(EnterpriseWorkflowService);
+
+		enterpriseWorkflowService.addOwnerAndSharings(workflow);
+		await enterpriseWorkflowService.addCredentialsToWorkflow(workflow, req.user);
 
 		execution.workflowData = {
 			...execution.workflowData,
diff --git a/packages/cli/src/executions/executions.service.ts b/packages/cli/src/executions/executions.service.ts
index 2ab3bdda32..64fb3ff6c9 100644
--- a/packages/cli/src/executions/executions.service.ts
+++ b/packages/cli/src/executions/executions.service.ts
@@ -1,29 +1,40 @@
 import { validate as jsonSchemaValidate } from 'jsonschema';
-import type { IWorkflowBase, JsonObject, ExecutionStatus } from 'n8n-workflow';
-import { jsonParse, Workflow } from 'n8n-workflow';
+import type {
+	IWorkflowBase,
+	JsonObject,
+	ExecutionStatus,
+	ExecutionError,
+	INode,
+	IRunExecutionData,
+	WorkflowExecuteMode,
+} from 'n8n-workflow';
+import { ApplicationError, jsonParse, Workflow, WorkflowOperationError } from 'n8n-workflow';
 import type { FindOperator } from 'typeorm';
 import { In } from 'typeorm';
 import { ActiveExecutions } from '@/ActiveExecutions';
 import config from '@/config';
 import type { User } from '@db/entities/User';
 import type {
+	ExecutionPayload,
 	IExecutionFlattedResponse,
 	IExecutionResponse,
 	IExecutionsListResponse,
+	IWorkflowDb,
 	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 { Container } from 'typedi';
+import { Container, Service } from 'typedi';
 import { getStatusUsingPreviousExecutionStatusMethod } from './executionHelpers';
-import { ExecutionRepository } from '@db/repositories';
+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';
 
 export interface IGetExecutionsQueryFilter {
 	id?: FindOperator<string> | string;
@@ -33,7 +44,6 @@ export interface IGetExecutionsQueryFilter {
 	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;
@@ -75,6 +85,7 @@ const schemaGetExecutionsQueryFilter = {
 
 const allowedExecutionsQueryFilterFields = Object.keys(schemaGetExecutionsQueryFilter.properties);
 
+@Service()
 export class ExecutionsService {
 	/**
 	 * Function to get the workflow Ids for a User
@@ -115,9 +126,7 @@ export class ExecutionsService {
 					userId: req.user.id,
 					filter: req.query.filter,
 				});
-				throw new ResponseHelper.InternalServerError(
-					'Parameter "filter" contained invalid JSON string.',
-				);
+				throw new InternalServerError('Parameter "filter" contained invalid JSON string.');
 			}
 		}
 
@@ -157,7 +166,7 @@ export class ExecutionsService {
 			filter,
 			sharedWorkflowIds,
 			executingWorkflowIds,
-			req.user.globalRole.name === 'owner',
+			req.user.hasGlobalScope('workflow:list'),
 		);
 
 		const formattedExecutions = await Container.get(ExecutionRepository).searchExecutions(
@@ -232,13 +241,11 @@ export class ExecutionsService {
 					executionId,
 				},
 			);
-			throw new ResponseHelper.NotFoundError(
-				`The execution with the ID "${executionId}" does not exist.`,
-			);
+			throw new NotFoundError(`The execution with the ID "${executionId}" does not exist.`);
 		}
 
 		if (execution.finished) {
-			throw new Error('The execution succeeded, so it cannot be retried.');
+			throw new ApplicationError('The execution succeeded, so it cannot be retried.');
 		}
 
 		const executionMode = 'retry';
@@ -274,21 +281,22 @@ export class ExecutionsService {
 		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 as string;
-			const workflowData = (await Db.collections.Workflow.findOneBy({
+			const workflowId = execution.workflowData.id;
+			const workflowData = (await Container.get(WorkflowRepository).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.`,
+				throw new ApplicationError(
+					'Workflow could not be found and so the data not be loaded for the retry.',
+					{ extra: { workflowId } },
 				);
 			}
 
 			data.workflowData = workflowData;
 			const nodeTypes = Container.get(NodeTypes);
 			const workflowInstance = new Workflow({
-				id: workflowData.id as string,
+				id: workflowData.id,
 				name: workflowData.name,
 				nodes: workflowData.nodes,
 				connections: workflowData.connections,
@@ -311,7 +319,7 @@ export class ExecutionsService {
 							nodeName: stack.node.name,
 						},
 					);
-					throw new Error(
+					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.`,
 					);
 				}
@@ -328,7 +336,7 @@ export class ExecutionsService {
 			await Container.get(ActiveExecutions).getPostExecutePromise(retriedExecutionId);
 
 		if (!executionData) {
-			throw new Error('The retry did not start for an unknown reason.');
+			throw new ApplicationError('The retry did not start for an unknown reason.');
 		}
 
 		return !!executionData.finished;
@@ -352,9 +360,7 @@ export class ExecutionsService {
 					requestFilters = requestFiltersRaw as IGetExecutionsQueryFilter;
 				}
 			} catch (error) {
-				throw new ResponseHelper.InternalServerError(
-					'Parameter "filter" contained invalid JSON string.',
-				);
+				throw new InternalServerError('Parameter "filter" contained invalid JSON string.');
 			}
 		}
 
@@ -367,4 +373,75 @@ export class ExecutionsService {
 			},
 		);
 	}
+
+	async createErrorExecution(
+		error: ExecutionError,
+		node: INode,
+		workflowData: IWorkflowDb,
+		workflow: Workflow,
+		mode: WorkflowExecuteMode,
+	): Promise<void> {
+		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 Container.get(ExecutionRepository).createNewExecution(fullExecutionData);
+	}
 }
diff --git a/packages/cli/src/license/License.service.ts b/packages/cli/src/license/License.service.ts
deleted file mode 100644
index adba06ca9c..0000000000
--- 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 0aa27b74bb..ea0df696c9 100644
--- a/packages/cli/src/license/license.controller.ts
+++ b/packages/cli/src/license/license.controller.ts
@@ -1,129 +1,35 @@
-import express from 'express';
-import { Container } from 'typedi';
+import { Authorized, Get, Post, RequireGlobalScope, RestController } from '@/decorators';
+import { LicenseRequest } from '@/requests';
+import { LicenseService } from './license.service';
 
-import { Logger } 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 { InternalHooks } from '@/InternalHooks';
+@Authorized()
+@RestController('/license')
+export class LicenseController {
+	constructor(private readonly licenseService: LicenseService) {}
 
-export const licenseController = express.Router();
-
-const OWNER_ROUTES = ['/activate', '/renew'];
-
-/**
- * Owner checking
- */
-licenseController.use((req: AuthenticatedRequest, res, next) => {
-	if (OWNER_ROUTES.includes(req.path) && req.user) {
-		if (!req.user.isOwner) {
-			Container.get(Logger).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;
-		}
+	@Get('/')
+	async getLicenseData() {
+		return this.licenseService.getLicenseData();
 	}
-	next();
-});
 
-/**
- * GET /license
- * Get the license data, usable by everyone
- */
-licenseController.get(
-	'/',
-	ResponseHelper.send(async (): Promise<ILicenseReadResponse> => {
-		return LicenseService.getLicenseData();
-	}),
-);
+	@Post('/activate')
+	@RequireGlobalScope('license:manage')
+	async activateLicense(req: LicenseRequest.Activate) {
+		const { activationKey } = req.body;
+		await this.licenseService.activateLicense(activationKey);
+		return this.getTokenAndData();
+	}
 
-/**
- * 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 };
+	@Post('/renew')
+	@RequireGlobalScope('license:manage')
+	async renewLicense() {
+		await this.licenseService.renewLicense();
+		return this.getTokenAndData();
+	}
 
-			let message = 'Failed to activate license';
-
-			//override specific error messages (to map License Server vocabulary to n8n terms)
-			switch (error.errorId ?? 'UNSPECIFIED') {
-				case 'SCHEMA_VALIDATION':
-					message = 'Activation key is in the wrong format';
-					break;
-				case 'RESERVATION_EXHAUSTED':
-					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':
-					message = 'Activation key has expired';
-					break;
-				case 'NOT_FOUND':
-				case 'RESERVATION_CONFLICT':
-					message = 'Activation key not found';
-					break;
-				case 'RESERVATION_DUPLICATE':
-					message = 'Activation key has already been used on this instance';
-					break;
-				default:
-					message += `: ${error.message}`;
-					Container.get(Logger).error(message, { stack: error.stack ?? 'n/a' });
-			}
-
-			throw new ResponseHelper.BadRequestError(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 });
-
-		// 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 0000000000..32d30b16c5
--- /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/middlewares/auth.ts b/packages/cli/src/middlewares/auth.ts
index e02383d6fe..195b174b74 100644
--- a/packages/cli/src/middlewares/auth.ts
+++ b/packages/cli/src/middlewares/auth.ts
@@ -6,11 +6,11 @@ import { Strategy } from 'passport-jwt';
 import { sync as globSync } from 'fast-glob';
 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 { canSkipAuth } from '@/decorators/registerController';
 import { Logger } from '@/Logger';
+import { JwtService } from '@/services/jwt.service';
 
 const jwtFromRequest = (req: Request) => {
 	// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
@@ -21,7 +21,7 @@ const userManagementJwtAuth = (): RequestHandler => {
 	const jwtStrategy = new Strategy(
 		{
 			jwtFromRequest,
-			secretOrKey: config.getEnv('userManagement.jwtSecret'),
+			secretOrKey: Container.get(JwtService).jwtSecret,
 		},
 		async (jwtPayload: JwtPayload, done) => {
 			try {
@@ -60,10 +60,10 @@ const staticAssets = globSync(['**/*.html', '**/*.svg', '**/*.png', '**/*.ico'],
 });
 
 // TODO: delete this
-const isPostUsersId = (req: Request, restEndpoint: string): boolean =>
+const isPostInvitationAccept = (req: Request, restEndpoint: string): boolean =>
 	req.method === 'POST' &&
-	new RegExp(`/${restEndpoint}/users/[\\w\\d-]*`).test(req.url) &&
-	!req.url.includes('reinvite');
+	new RegExp(`/${restEndpoint}/invitations/[\\w\\d-]*`).test(req.url) &&
+	req.url.includes('accept');
 
 const isAuthExcluded = (url: string, ignoredEndpoints: Readonly<string[]>): boolean =>
 	!!ignoredEndpoints
@@ -89,9 +89,7 @@ export const setupAuthMiddlewares = (
 			canSkipAuth(req.method, req.path) ||
 			isAuthExcluded(req.url, ignoredEndpoints) ||
 			req.url.startsWith(`/${restEndpoint}/settings`) ||
-			isPostUsersId(req, restEndpoint) ||
-			req.url.startsWith(`/${restEndpoint}/oauth2-credential/callback`) ||
-			req.url.startsWith(`/${restEndpoint}/oauth1-credential/callback`)
+			isPostInvitationAccept(req, restEndpoint)
 		) {
 			return next();
 		}
diff --git a/packages/cli/src/middlewares/bodyParser.ts b/packages/cli/src/middlewares/bodyParser.ts
index 2f2efe709e..f7ee9615b4 100644
--- a/packages/cli/src/middlewares/bodyParser.ts
+++ b/packages/cli/src/middlewares/bodyParser.ts
@@ -7,7 +7,7 @@ import { Parser as XmlParser } from 'xml2js';
 import { parseIncomingMessage } from 'n8n-core';
 import { jsonParse } from 'n8n-workflow';
 import config from '@/config';
-import { UnprocessableRequestError } from '@/ResponseHelper';
+import { UnprocessableRequestError } from '@/errors/response-errors/unprocessable.error';
 
 const xmlParser = new XmlParser({
 	async: true,
diff --git a/packages/cli/src/middlewares/listQuery/dtos/base.filter.dto.ts b/packages/cli/src/middlewares/listQuery/dtos/base.filter.dto.ts
index 47a7273b5b..d57def77cf 100644
--- a/packages/cli/src/middlewares/listQuery/dtos/base.filter.dto.ts
+++ b/packages/cli/src/middlewares/listQuery/dtos/base.filter.dto.ts
@@ -3,13 +3,13 @@
 import { isObjectLiteral } from '@/utils';
 import { plainToInstance, instanceToPlain } from 'class-transformer';
 import { validate } from 'class-validator';
-import { jsonParse } from 'n8n-workflow';
+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 Error('Filter must be an object literal');
+		if (!isObjectLiteral(dto)) throw new ApplicationError('Filter must be an object literal');
 
 		const instance = plainToInstance(Filter, dto, {
 			excludeExtraneousValues: true, // remove fields not in class
@@ -25,6 +25,6 @@ export class BaseFilter {
 	private async validate() {
 		const result = await validate(this);
 
-		if (result.length > 0) throw new Error('Parsed filter does not fit the schema');
+		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
index da7ba6752d..fc947fdcc8 100644
--- a/packages/cli/src/middlewares/listQuery/dtos/base.select.dto.ts
+++ b/packages/cli/src/middlewares/listQuery/dtos/base.select.dto.ts
@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/naming-convention */
 
 import { isStringArray } from '@/utils';
-import { jsonParse } from 'n8n-workflow';
+import { ApplicationError, jsonParse } from 'n8n-workflow';
 
 export class BaseSelect {
 	static selectableFields: Set<string>;
@@ -9,7 +9,7 @@ export class BaseSelect {
 	protected static toSelect(rawFilter: string, Select: typeof BaseSelect) {
 		const dto = jsonParse(rawFilter, { errorMessage: 'Failed to parse filter JSON' });
 
-		if (!isStringArray(dto)) throw new Error('Parsed select is not a string array');
+		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;
diff --git a/packages/cli/src/middlewares/listQuery/dtos/pagination.dto.ts b/packages/cli/src/middlewares/listQuery/dtos/pagination.dto.ts
index a7750aee6b..1a837d159c 100644
--- a/packages/cli/src/middlewares/listQuery/dtos/pagination.dto.ts
+++ b/packages/cli/src/middlewares/listQuery/dtos/pagination.dto.ts
@@ -1,13 +1,14 @@
 import { isIntegerString } from '@/utils';
+import { ApplicationError } from 'n8n-workflow';
 
 export class Pagination {
 	static fromString(rawTake: string, rawSkip: string) {
 		if (!isIntegerString(rawTake)) {
-			throw new Error('Parameter take is not an integer string');
+			throw new ApplicationError('Parameter take is not an integer string');
 		}
 
 		if (!isIntegerString(rawSkip)) {
-			throw new Error('Parameter skip is not an integer string');
+			throw new ApplicationError('Parameter skip is not an integer string');
 		}
 
 		const [take, skip] = [rawTake, rawSkip].map((o) => parseInt(o, 10));
diff --git a/packages/cli/src/middlewares/listQuery/filter.ts b/packages/cli/src/middlewares/listQuery/filter.ts
index bfdb35d76d..9db1d85cd8 100644
--- a/packages/cli/src/middlewares/listQuery/filter.ts
+++ b/packages/cli/src/middlewares/listQuery/filter.ts
@@ -1,5 +1,3 @@
-/* eslint-disable @typescript-eslint/naming-convention */
-
 import * as ResponseHelper from '@/ResponseHelper';
 import { WorkflowFilter } from './dtos/workflow.filter.dto';
 import { CredentialsFilter } from './dtos/credentials.filter.dto';
diff --git a/packages/cli/src/middlewares/listQuery/pagination.ts b/packages/cli/src/middlewares/listQuery/pagination.ts
index 2438292be7..cb101af8c1 100644
--- a/packages/cli/src/middlewares/listQuery/pagination.ts
+++ b/packages/cli/src/middlewares/listQuery/pagination.ts
@@ -3,6 +3,7 @@ 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,
@@ -13,7 +14,7 @@ export const paginationListQueryMiddleware: RequestHandler = (
 
 	try {
 		if (!rawTake && req.query.skip) {
-			throw new Error('Please specify `take` when using `skip`');
+			throw new ApplicationError('Please specify `take` when using `skip`');
 		}
 
 		if (!rawTake) return next();
diff --git a/packages/cli/src/middlewares/listQuery/select.ts b/packages/cli/src/middlewares/listQuery/select.ts
index a96a3cd31c..6511410a8c 100644
--- a/packages/cli/src/middlewares/listQuery/select.ts
+++ b/packages/cli/src/middlewares/listQuery/select.ts
@@ -1,5 +1,3 @@
-/* eslint-disable @typescript-eslint/naming-convention */
-
 import { WorkflowSelect } from './dtos/workflow.select.dto';
 import { UserSelect } from './dtos/user.select.dto';
 import { CredentialsSelect } from './dtos/credentials.select.dto';
diff --git a/packages/cli/src/permissions/roles.ts b/packages/cli/src/permissions/roles.ts
new file mode 100644
index 0000000000..f8619cb882
--- /dev/null
+++ b/packages/cli/src/permissions/roles.ts
@@ -0,0 +1,84 @@
+import type { Scope } from '@n8n/permissions';
+
+export const ownerPermissions: Scope[] = [
+	'auditLogs:manage',
+	'credential:create',
+	'credential:read',
+	'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 202a8cea97..b62a6eba8d 100644
--- a/packages/cli/src/posthog/index.ts
+++ b/packages/cli/src/posthog/index.ts
@@ -17,7 +17,6 @@ export class PostHogClient {
 			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'),
diff --git a/packages/cli/src/push/abstract.push.ts b/packages/cli/src/push/abstract.push.ts
index 3660be0556..655e5486b5 100644
--- a/packages/cli/src/push/abstract.push.ts
+++ b/packages/cli/src/push/abstract.push.ts
@@ -1,52 +1,125 @@
-import { jsonStringify } from 'n8n-workflow';
+import { EventEmitter } from 'events';
+import { assert, jsonStringify } from 'n8n-workflow';
 import type { IPushDataType } from '@/Interfaces';
-import { Logger } from '@/Logger';
+import type { Logger } from '@/Logger';
+import type { User } from '@db/entities/User';
+import type { MultiMainSetup } from '@/services/orchestration/main/MultiMainSetup.ee';
 
-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 userIdBySessionId: 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;
 
-	constructor(private readonly logger: Logger) {}
+	constructor(
+		protected readonly logger: Logger,
+		private readonly multiMainSetup: MultiMainSetup,
+	) {
+		super();
+	}
 
-	protected add(sessionId: string, connection: T): void {
-		const { connections } = this;
+	protected add(sessionId: string, userId: User['id'], connection: T) {
+		const { connections, userIdBySessionId: userIdsBySessionId } = this;
 		this.logger.debug('Add editor-UI session', { sessionId });
 
 		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;
+		userIdsBySessionId[sessionId] = userId;
 	}
 
-	protected remove(sessionId?: string): void {
-		if (sessionId !== undefined) {
-			this.logger.debug('Remove editor-UI session', { sessionId });
-			delete this.connections[sessionId];
+	protected onMessageReceived(sessionId: string, msg: unknown) {
+		this.logger.debug('Received message from editor-UI', { sessionId, msg });
+
+		const userId = this.userIdBySessionId[sessionId];
+
+		this.emit('message', { sessionId, userId, msg });
+	}
+
+	protected remove(sessionId?: string) {
+		if (!sessionId) return;
+
+		this.logger.debug('Removed editor-UI session', { sessionId });
+
+		delete this.connections[sessionId];
+		delete this.userIdBySessionId[sessionId];
+	}
+
+	private sendToSessions(type: IPushDataType, data: unknown, sessionIds: string[]) {
+		this.logger.debug(`Send data of type "${type}" to editor-UI`, {
+			dataType: type,
+			sessionIds: sessionIds.join(', '),
+		});
+
+		const stringifiedPayload = jsonStringify({ type, data }, { replaceCircularRefs: true });
+
+		for (const sessionId of sessionIds) {
+			const connection = this.connections[sessionId];
+			assert(connection);
+			this.sendToOneConnection(connection, stringifiedPayload);
 		}
 	}
 
-	send<D>(type: IPushDataType, data: D, sessionId: string | undefined) {
-		const { connections } = this;
-		if (sessionId !== undefined && connections[sessionId] === undefined) {
+	sendToAllSessions(type: IPushDataType, data?: unknown) {
+		this.sendToSessions(type, data, Object.keys(this.connections));
+	}
+
+	sendToOneSession(type: IPushDataType, data: unknown, sessionId: 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 lifecyle events to the creator's frontend.
+		 */
+		if (this.multiMainSetup.isEnabled && !this.hasSessionId(sessionId)) {
+			const payload = { type, args: data, sessionId };
+
+			void this.multiMainSetup.publish('relay-execution-lifecycle-event', payload);
+
+			return;
+		}
+
+		if (this.connections[sessionId] === undefined) {
 			this.logger.error(`The session "${sessionId}" is not registered.`, { sessionId });
 			return;
 		}
 
-		this.logger.debug(`Send data of type "${type}" to editor-UI`, { dataType: type, sessionId });
+		this.sendToSessions(type, data, [sessionId]);
+	}
 
-		const sendData = jsonStringify({ type, data }, { replaceCircularRefs: true });
+	sendToUsers(type: IPushDataType, data: unknown, userIds: Array<User['id']>) {
+		const { connections } = this;
+		const userSessionIds = Object.keys(connections).filter((sessionId) =>
+			userIds.includes(this.userIdBySessionId[sessionId]),
+		);
 
-		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.sendToSessions(type, data, userSessionIds);
+	}
+
+	closeAllConnections() {
+		for (const sessionId 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[sessionId]);
 		}
 	}
+
+	hasSessionId(sessionId: string) {
+		return this.connections[sessionId] !== undefined;
+	}
 }
diff --git a/packages/cli/src/push/index.ts b/packages/cli/src/push/index.ts
index 9fb26d795c..e740821321 100644
--- a/packages/cli/src/push/index.ts
+++ b/packages/cli/src/push/index.ts
@@ -13,26 +13,67 @@ 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';
 
 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 extends EventEmitter {
+	public isBidirectional = useWebSockets;
+
 	private backend = useWebSockets ? Container.get(WebSocketPush) : Container.get(SSEPush);
 
-	handleRequest(req: SSEPushRequest | WebSocketPushRequest, res: PushResponse) {
-		if (req.ws) {
-			(this.backend as WebSocketPush).add(req.query.sessionId, req.ws);
-		} else if (!useWebSockets) {
-			(this.backend as SSEPush).add(req.query.sessionId, { req, res });
-		} else {
-			res.status(401).send('Unauthorized');
-		}
-		this.emit('editorUiConnected', req.query.sessionId);
+	constructor() {
+		super();
+
+		if (useWebSockets) this.backend.on('message', (msg) => this.emit('message', msg));
 	}
 
-	send<D>(type: IPushDataType, data: D, sessionId: string | undefined = undefined) {
-		this.backend.send(type, data, sessionId);
+	handleRequest(req: SSEPushRequest | WebSocketPushRequest, res: PushResponse) {
+		const {
+			userId,
+			query: { sessionId },
+		} = req;
+
+		if (req.ws) {
+			(this.backend as WebSocketPush).add(sessionId, userId, req.ws);
+		} else if (!useWebSockets) {
+			(this.backend as SSEPush).add(sessionId, userId, { req, res });
+		} else {
+			res.status(401).send('Unauthorized');
+			return;
+		}
+
+		this.emit('editorUiConnected', sessionId);
+	}
+
+	broadcast(type: IPushDataType, data?: unknown) {
+		this.backend.sendToAllSessions(type, data);
+	}
+
+	send(type: IPushDataType, data: unknown, sessionId: string) {
+		this.backend.sendToOneSession(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();
 	}
 }
 
@@ -82,7 +123,8 @@ export const setupPushHandler = (restEndpoint: string, app: Application) => {
 		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);
+			const user = await resolveJwt(authCookie);
+			req.userId = user.id;
 		} catch (error) {
 			if (ws) {
 				ws.send(`Unauthorized: ${(error as Error).message}`);
diff --git a/packages/cli/src/push/sse.push.ts b/packages/cli/src/push/sse.push.ts
index 80d02bb8a4..17f4c7ad9e 100644
--- a/packages/cli/src/push/sse.push.ts
+++ b/packages/cli/src/push/sse.push.ts
@@ -3,6 +3,8 @@ 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 { MultiMainSetup } from '@/services/orchestration/main/MultiMainSetup.ee';
 
 type Connection = { req: PushRequest; res: PushResponse };
 
@@ -12,24 +14,25 @@ export class SSEPush extends AbstractPush<Connection> {
 
 	readonly connections: Record<string, Connection> = {};
 
-	constructor(logger: Logger) {
-		super(logger);
+	constructor(logger: Logger, multiMainSetup: MultiMainSetup) {
+		super(logger, multiMainSetup);
+
 		this.channel.on('disconnect', (channel, { req }) => {
 			this.remove(req?.query?.sessionId);
 		});
 	}
 
-	add(sessionId: string, connection: Connection) {
-		super.add(sessionId, connection);
+	add(sessionId: string, userId: User['id'], connection: Connection) {
+		super.add(sessionId, 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 26baea050b..2a65b08131 100644
--- a/packages/cli/src/push/types.ts
+++ b/packages/cli/src/push/types.ts
@@ -1,3 +1,4 @@
+import type { User } from '@db/entities/User';
 import type { Request, Response } from 'express';
 import type { WebSocket } from 'ws';
 
@@ -5,7 +6,13 @@ import type { WebSocket } from 'ws';
 
 export type PushRequest = Request<{}, {}, {}, { sessionId: string }>;
 
-export type SSEPushRequest = PushRequest & { ws: undefined };
-export type WebSocketPushRequest = PushRequest & { ws: WebSocket };
+export type SSEPushRequest = PushRequest & { ws: undefined; userId: User['id'] };
+export type WebSocketPushRequest = PushRequest & { ws: WebSocket; userId: User['id'] };
 
 export type PushResponse = Response & { req: PushRequest };
+
+export type OnPushMessageEvent = {
+	sessionId: 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 090546cf58..6f47b1fb62 100644
--- a/packages/cli/src/push/websocket.push.ts
+++ b/packages/cli/src/push/websocket.push.ts
@@ -2,6 +2,8 @@ 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 { MultiMainSetup } from '@/services/orchestration/main/MultiMainSetup.ee';
 
 function heartbeat(this: WebSocket) {
 	this.isAlive = true;
@@ -9,31 +11,48 @@ function heartbeat(this: WebSocket) {
 
 @Service()
 export class WebSocketPush extends AbstractPush<WebSocket> {
-	constructor(logger: Logger) {
-		super(logger);
+	constructor(logger: Logger, multiMainSetup: MultiMainSetup) {
+		super(logger, multiMainSetup);
 
 		// Ping all connected clients every 60 seconds
 		setInterval(() => this.pingAll(), 60 * 1000);
 	}
 
-	add(sessionId: string, connection: WebSocket) {
+	add(sessionId: string, userId: User['id'], connection: WebSocket) {
 		connection.isAlive = true;
 		connection.on('pong', heartbeat);
 
-		super.add(sessionId, connection);
+		super.add(sessionId, userId, connection);
+
+		const onMessage = (data: WebSocket.RawData) => {
+			try {
+				const buffer = Array.isArray(data) ? Buffer.concat(data) : Buffer.from(data);
+
+				this.onMessageReceived(sessionId, JSON.parse(buffer.toString('utf8')));
+			} catch (error) {
+				this.logger.error("Couldn't parse message from editor-UI", {
+					error: error as unknown,
+					sessionId,
+					data,
+				});
+			}
+		};
 
 		// Makes sure to remove the session if the connection is closed
 		connection.once('close', () => {
 			connection.off('pong', heartbeat);
+			connection.off('message', onMessage);
 			this.remove(sessionId);
 		});
+
+		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);
 	}
 
diff --git a/packages/cli/src/requests.ts b/packages/cli/src/requests.ts
index f50cdfda8c..641d1c72fd 100644
--- a/packages/cli/src/requests.ts
+++ b/packages/cli/src/requests.ts
@@ -1,34 +1,31 @@
 import type express from 'express';
 import type {
 	BannerName,
-	IConnections,
 	ICredentialDataDecryptedObject,
 	ICredentialNodeAccess,
 	IDataObject,
-	INode,
 	INodeCredentialTestRequest,
-	IPinData,
-	IRunData,
+	INodeCredentials,
+	INodeParameters,
+	INodeTypeNameVersion,
 	IUser,
-	IWorkflowSettings,
 } from 'n8n-workflow';
 
-import { IsBoolean, IsEmail, IsOptional, IsString, Length } from 'class-validator';
+import { IsBoolean, IsEmail, IsIn, IsOptional, IsString, Length } from 'class-validator';
 import { NoXss } from '@db/utils/customValidators';
 import type {
 	PublicUser,
 	IExecutionDeleteFilter,
-	IWorkflowDb,
 	SecretsProvider,
 	SecretsProviderState,
 } from '@/Interfaces';
-import type { Role } from '@db/entities/Role';
+import type { Role, RoleNames } from '@db/entities/Role';
 import type { User } from '@db/entities/User';
 import type { UserManagementMailer } from '@/UserManagement/email';
 import type { Variables } from '@db/entities/Variables';
-import type { WorkflowEntity } from './databases/entities/WorkflowEntity';
-import type { CredentialsEntity } from './databases/entities/CredentialsEntity';
-import type { WorkflowHistory } from './databases/entities/WorkflowHistory';
+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'> {
 	@IsEmail()
@@ -44,6 +41,7 @@ export class UserUpdatePayload implements Pick<User, 'email' | 'firstName' | 'la
 	@Length(1, 32, { message: 'Last name must be $constraint1 to $constraint2 characters long.' })
 	lastName: string;
 }
+
 export class UserSettingsUpdatePayload {
 	@IsBoolean({ message: 'userActivated should be a boolean' })
 	@IsOptional()
@@ -54,6 +52,11 @@ export class UserSettingsUpdatePayload {
 	allowSSOManualLogin?: boolean;
 }
 
+export class UserRoleChangePayload {
+	@IsIn(['member', 'admin'])
+	newRoleName: Exclude<RoleNames, 'user' | 'editor' | 'owner'>;
+}
+
 export type AuthlessRequest<
 	RouteParams = {},
 	ResponseBody = {},
@@ -72,55 +75,6 @@ export type AuthenticatedRequest<
 	globalMemberRole?: Role;
 };
 
-// ----------------------------------
-//           /workflows
-// ----------------------------------
-
-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?: string[];
-		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 GetAllActive = AuthenticatedRequest;
-
-	type GetAllActivationErrors = Get;
-
-	type ManualRun = AuthenticatedRequest<{}, {}, ManualRunPayload>;
-
-	type Share = AuthenticatedRequest<{ workflowId: string }, {}, { shareWithIds: string[] }>;
-}
-
 // ----------------------------------
 //            list query
 // ----------------------------------
@@ -155,25 +109,31 @@ export namespace ListQuery {
 
 		type SharedField = Partial<Pick<WorkflowEntity, 'shared'>>;
 
-		type OwnedByField = { ownedBy: Pick<IUser, 'id'> | null };
+		type OwnedByField = { ownedBy: SlimUser | null };
 
 		export type Plain = BaseFields;
 
 		export type WithSharing = BaseFields & SharedField;
 
 		export type WithOwnership = BaseFields & OwnedByField;
+
+		type SharedWithField = { sharedWith: SlimUser[] };
+
+		export type WithOwnedByAndSharedWith = BaseFields & OwnedByField & SharedWithField;
+	}
+
+	export namespace Credentials {
+		type OwnedByField = { ownedBy: SlimUser | null };
+
+		type SharedWithField = { sharedWith: SlimUser[] };
+
+		export type WithSharing = CredentialsEntity & Partial<Pick<CredentialsEntity, 'shared'>>;
+
+		export type WithOwnedByAndSharedWith = CredentialsEntity & OwnedByField & SharedWithField;
 	}
 }
 
-export namespace Credentials {
-	type SlimUser = Pick<IUser, 'id' | 'email' | 'firstName' | 'lastName'>;
-
-	type OwnedByField = { ownedBy: SlimUser | null };
-
-	type SharedWithField = { sharedWith: SlimUser[] };
-
-	export type WithOwnedByAndSharedWith = CredentialsEntity & OwnedByField & SharedWithField;
-}
+type SlimUser = Pick<IUser, 'id' | 'email' | 'firstName' | 'lastName'>;
 
 export function hasSharing(
 	workflows: ListQuery.Workflow.Plain[] | ListQuery.Workflow.WithSharing[],
@@ -204,7 +164,7 @@ export declare namespace CredentialRequest {
 
 	type Update = AuthenticatedRequest<{ id: string }, {}, CredentialProperties>;
 
-	type NewName = WorkflowRequest.NewName;
+	type NewName = AuthenticatedRequest<{}, {}, {}, { name?: string }>;
 
 	type Test = AuthenticatedRequest<{}, {}, INodeCredentialTestRequest>;
 
@@ -293,7 +253,16 @@ export declare namespace PasswordResetRequest {
 // ----------------------------------
 
 export declare namespace UserRequest {
-	export type Invite = AuthenticatedRequest<{}, {}, Array<{ email: string }>>;
+	export type Invite = AuthenticatedRequest<
+		{},
+		{},
+		Array<{ email: string; role?: 'member' | 'admin' }>
+	>;
+
+	export type InviteResponse = {
+		user: { id: string; email: string; inviteAcceptUrl?: string; emailSent: boolean };
+		error?: string;
+	};
 
 	export type ResolveSignUp = AuthlessRequest<
 		{},
@@ -314,6 +283,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 },
 		{},
@@ -392,63 +363,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;
+	/** GET /dynamic-node-parameters/options */
+	type Options = BaseRequest<{
+		loadOptions?: string;
+	}>;
+
+	/** GET /dynamic-node-parameters/resource-locator-results */
+	type ResourceLocatorResults = BaseRequest<{
 		methodName: string;
-		path: string;
-		currentNodeParameters: string;
-		credentials: string;
-	}
->;
-
-// ----------------------------------
-//        /node-list-search
-// ----------------------------------
-
-export type NodeListSearchRequest = AuthenticatedRequest<
-	{},
-	{},
-	{},
-	{
-		nodeTypeAndVersion: string;
-		methodName: string;
-		path: string;
-		currentNodeParameters: string;
-		credentials: string;
 		filter?: string;
 		paginationToken?: string;
-	}
->;
+	}>;
 
-// ----------------------------------
-//        /get-mapping-fields
-// ----------------------------------
-
-export type ResourceMapperRequest = AuthenticatedRequest<
-	{},
-	{},
-	{},
-	{
-		nodeTypeAndVersion: string;
+	/** GET dynamic-node-parameters/resource-mapper-fields */
+	type ResourceMapperFields = BaseRequest<{
 		methodName: string;
-		path: string;
-		currentNodeParameters: string;
-		credentials: string;
-	}
->;
+	}>;
+}
 
 // ----------------------------------
 //             /tags
@@ -564,3 +521,13 @@ export declare namespace WorkflowHistoryRequest {
 		WorkflowHistory
 	>;
 }
+
+// ----------------------------------
+//        /active-workflows
+// ----------------------------------
+
+export declare namespace ActiveWorkflowRequest {
+	type GetAllActive = AuthenticatedRequest;
+
+	type GetActivationError = AuthenticatedRequest<{ id: string }>;
+}
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 0000000000..3c41df5e39
--- /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) => 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/audit/constants.ts b/packages/cli/src/security-audit/constants.ts
similarity index 98%
rename from packages/cli/src/audit/constants.ts
rename to packages/cli/src/security-audit/constants.ts
index 9c2658158d..a47b39986c 100644
--- a/packages/cli/src/audit/constants.ts
+++ b/packages/cli/src/security-audit/constants.ts
@@ -1,4 +1,4 @@
-import type { Risk } from '@/audit/types';
+import type { Risk } from '@/security-audit/types';
 
 /**
  * Risk categories
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 0000000000..869aa7c7e3
--- /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 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 0000000000..2632917f8f
--- /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 0000000000..f2cb5eb092
--- /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 0000000000..55aec055da
--- /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';
+
+@Service()
+export class InstanceRiskReporter implements RiskReporter {
+	constructor(private readonly instanceSettings: InstanceSettings) {}
+
+	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.auth = {
+			authExcludeEndpoints: config.getEnv('security.excludeEndpoints') || 'none',
+		};
+
+		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) {
+				console.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 0000000000..f98afb8a3d
--- /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/audit/types.ts b/packages/cli/src/security-audit/types.ts
similarity index 95%
rename from packages/cli/src/audit/types.ts
rename to packages/cli/src/security-audit/types.ts
index aa88f21aa5..131eb0616d 100644
--- a/packages/cli/src/audit/types.ts
+++ b/packages/cli/src/security-audit/types.ts
@@ -84,3 +84,7 @@ export namespace n8n {
 		securityIssueFixVersion: string;
 	};
 }
+
+export interface RiskReporter {
+	report(workflows: Workflow[]): Promise<Risk.Report | null>;
+}
diff --git a/packages/cli/src/audit/utils.ts b/packages/cli/src/security-audit/utils.ts
similarity index 93%
rename from packages/cli/src/audit/utils.ts
rename to packages/cli/src/security-audit/utils.ts
index 9a0bf208e6..14dd1ff9d1 100644
--- a/packages/cli/src/audit/utils.ts
+++ b/packages/cli/src/security-audit/utils.ts
@@ -1,5 +1,5 @@
 import type { WorkflowEntity as Workflow } from '@db/entities/WorkflowEntity';
-import type { Risk } from '@/audit/types';
+import type { Risk } from '@/security-audit/types';
 
 type Node = Workflow['nodes'][number];
 
diff --git a/packages/cli/src/services/activeWorkflows.service.ts b/packages/cli/src/services/activeWorkflows.service.ts
new file mode 100644
index 0000000000..7684cb3275
--- /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 this.activationErrorsService.get(workflowId);
+	}
+}
diff --git a/packages/cli/src/services/cache.service.ts b/packages/cli/src/services/cache.service.ts
deleted file mode 100644
index 641e65050b..0000000000
--- a/packages/cli/src/services/cache.service.ts
+++ /dev/null
@@ -1,308 +0,0 @@
-import { Service } from 'typedi';
-import config from '@/config';
-import { caching } from 'cache-manager';
-import type { MemoryCache } from 'cache-manager';
-import type { RedisCache } from 'cache-manager-ioredis-yet';
-import { jsonStringify } from 'n8n-workflow';
-import { getDefaultRedisClient, getRedisPrefix } from './redis/RedisServiceHelper';
-import EventEmitter from 'events';
-
-@Service()
-export class CacheService extends EventEmitter {
-	/**
-	 * Keys and values:
-	 * - `'cache:workflow-owner:${workflowId}'`: `User`
-	 */
-	private cache: RedisCache | MemoryCache | undefined;
-
-	metricsCounterEvents = {
-		cacheHit: 'metrics.cache.hit',
-
-		cacheMiss: 'metrics.cache.miss',
-		cacheUpdate: 'metrics.cache.update',
-	};
-
-	isRedisCache(): boolean {
-		return (this.cache as RedisCache)?.store?.isCacheable !== undefined;
-	}
-
-	/**
-	 * Initialize the cache service.
-	 *
-	 * If the cache is enabled, it will initialize the cache from the provided config options. By default, it will use
-	 * the `memory` backend and create a simple in-memory cache. If running in `queue` mode, or if `redis` backend is selected,
-	 * it use Redis as the cache backend (either a local Redis instance or a Redis cluster, depending on the config)
-	 *
-	 * If the cache is disabled, this does nothing.
-	 */
-	async init(): Promise<void> {
-		if (!config.getEnv('cache.enabled')) {
-			return;
-		}
-		const backend = config.getEnv('cache.backend');
-		if (
-			backend === 'redis' ||
-			(backend === 'auto' && config.getEnv('executions.mode') === 'queue')
-		) {
-			const { redisInsStore } = await import('cache-manager-ioredis-yet');
-			const redisPrefix = getRedisPrefix(config.getEnv('redis.prefix'));
-			const cachePrefix = config.getEnv('cache.redis.prefix');
-			const keyPrefix = `${redisPrefix}:${cachePrefix}:`;
-			const redisClient = await getDefaultRedisClient({ keyPrefix }, 'client(cache)');
-			const redisStore = redisInsStore(redisClient, {
-				ttl: config.getEnv('cache.redis.ttl'),
-			});
-			this.cache = await caching(redisStore);
-		} else {
-			// using TextEncoder to get the byte length of the string even if it contains unicode characters
-			const textEncoder = new TextEncoder();
-			this.cache = await caching('memory', {
-				ttl: config.getEnv('cache.memory.ttl'),
-				maxSize: config.getEnv('cache.memory.maxSize'),
-				sizeCalculation: (item) => {
-					return textEncoder.encode(jsonStringify(item, { replaceCircularRefs: true })).length;
-				},
-			});
-		}
-	}
-
-	/**
-	 * Get a value from the cache by key.
-	 *
-	 * If the value is not in the cache or expired, the refreshFunction is called if defined,
-	 * which will set the key with the function's result and returns it. If no refreshFunction is set, the fallback value is returned.
-	 *
-	 * If the cache is disabled, refreshFunction's result or fallbackValue is returned.
-	 *
-	 * If cache is not hit, and neither refreshFunction nor fallbackValue are provided, `undefined` is returned.
-	 * @param key The key to fetch from the cache
-	 * @param options.refreshFunction Optional function to call to set the cache if the key is not found
-	 * @param options.refreshTtl Optional ttl for the refreshFunction's set call
-	 * @param options.fallbackValue Optional value returned is cache is not hit and refreshFunction is not provided
-	 */
-	async get(
-		key: string,
-		options: {
-			fallbackValue?: unknown;
-			refreshFunction?: (key: string) => Promise<unknown>;
-			refreshTtl?: number;
-		} = {},
-	): Promise<unknown> {
-		if (!key || key.length === 0) {
-			return;
-		}
-		const value = await this.cache?.store.get(key);
-		if (value !== undefined) {
-			this.emit(this.metricsCounterEvents.cacheHit);
-			return value;
-		}
-		this.emit(this.metricsCounterEvents.cacheMiss);
-		if (options.refreshFunction) {
-			this.emit(this.metricsCounterEvents.cacheUpdate);
-			const refreshValue = await options.refreshFunction(key);
-			await this.set(key, refreshValue, options.refreshTtl);
-			return refreshValue;
-		}
-		return options.fallbackValue ?? undefined;
-	}
-
-	/**
-	 * Get many values from a list of keys.
-	 *
-	 * If a value is not in the cache or expired, the returned list will have `undefined` at that index.
-	 * If the cache is disabled, refreshFunction's result or fallbackValue is returned.
-	 * If cache is not hit, and neither refreshFunction nor fallbackValue are provided, a list of `undefined` is returned.
-	 * @param keys A list of keys to fetch from the cache
-	 * @param options.refreshFunctionEach Optional, if defined, undefined values will be replaced with the result of the refreshFunctionEach call and the cache will be updated
-	 * @param options.refreshFunctionMany Optional, if defined, all values will be replaced with the result of the refreshFunctionMany call and the cache will be updated
-	 * @param options.refreshTtl Optional ttl for the refreshFunction's set call
-	 * @param options.fallbackValue Optional value returned is cache is not hit and refreshFunction is not provided
-	 */
-	async getMany(
-		keys: string[],
-		options: {
-			fallbackValues?: unknown[];
-			refreshFunctionEach?: (key: string) => Promise<unknown>;
-			refreshFunctionMany?: (keys: string[]) => Promise<unknown[]>;
-			refreshTtl?: number;
-		} = {},
-	): Promise<unknown[]> {
-		if (keys.length === 0) {
-			return [];
-		}
-		let values = await this.cache?.store.mget(...keys);
-		if (values === undefined) {
-			values = keys.map(() => undefined);
-		}
-		if (!values.includes(undefined)) {
-			this.emit(this.metricsCounterEvents.cacheHit);
-			return values;
-		}
-		this.emit(this.metricsCounterEvents.cacheMiss);
-		if (options.refreshFunctionEach) {
-			for (let i = 0; i < keys.length; i++) {
-				if (values[i] === undefined) {
-					const key = keys[i];
-					let fallback = undefined;
-					if (options.fallbackValues && options.fallbackValues.length > i) {
-						fallback = options.fallbackValues[i];
-					}
-					const refreshValue = await this.get(key, {
-						refreshFunction: options.refreshFunctionEach,
-						refreshTtl: options.refreshTtl,
-						fallbackValue: fallback,
-					});
-					values[i] = refreshValue;
-				}
-			}
-			return values;
-		}
-		if (options.refreshFunctionMany) {
-			this.emit(this.metricsCounterEvents.cacheUpdate);
-			const refreshValues: unknown[] = await options.refreshFunctionMany(keys);
-			if (keys.length !== refreshValues.length) {
-				throw new Error('refreshFunctionMany must return the same number of values as keys');
-			}
-			const newKV: Array<[string, unknown]> = [];
-			for (let i = 0; i < keys.length; i++) {
-				newKV.push([keys[i], refreshValues[i]]);
-			}
-			await this.setMany(newKV, options.refreshTtl);
-			return refreshValues;
-		}
-		return options.fallbackValues ?? values;
-	}
-
-	/**
-	 * Set a value in the cache by key.
-	 * @param key The key to set
-	 * @param value The value to set
-	 * @param ttl Optional time to live in ms
-	 */
-	async set(key: string, value: unknown, ttl?: number): Promise<void> {
-		if (!this.cache) {
-			await this.init();
-		}
-		if (!key || key.length === 0) {
-			return;
-		}
-		if (value === undefined || value === null) {
-			return;
-		}
-		if (this.isRedisCache()) {
-			if (!(this.cache as RedisCache)?.store?.isCacheable(value)) {
-				throw new Error('Value is not cacheable');
-			}
-		}
-		await this.cache?.store.set(key, value, ttl);
-	}
-
-	/**
-	 * Set a multiple values in the cache at once.
-	 * @param values An array of [key, value] tuples to set
-	 * @param ttl Optional time to live in ms
-	 */
-	async setMany(values: Array<[string, unknown]>, ttl?: number): Promise<void> {
-		if (!this.cache) {
-			await this.init();
-		}
-		if (values.length === 0) {
-			return;
-		}
-		const nonNullValues = values.filter(
-			([key, value]) => value !== undefined && value !== null && key && key.length > 0,
-		);
-		if (this.isRedisCache()) {
-			nonNullValues.forEach(([_key, value]) => {
-				if (!(this.cache as RedisCache)?.store?.isCacheable(value)) {
-					throw new Error('Value is not cacheable');
-				}
-			});
-		}
-		await this.cache?.store.mset(nonNullValues, ttl);
-	}
-
-	/**
-	 * Delete a value from the cache by key.
-	 * @param key The key to delete
-	 */
-	async delete(key: string): Promise<void> {
-		if (!key || key.length === 0) {
-			return;
-		}
-		await this.cache?.store.del(key);
-	}
-
-	/**
-	 * Delete multiple values from the cache.
-	 * @param keys List of keys to delete
-	 */
-	async deleteMany(keys: string[]): Promise<void> {
-		if (keys.length === 0) {
-			return;
-		}
-		return this.cache?.store.mdel(...keys);
-	}
-
-	/**
-	 * Delete all values and uninitialized the cache.
-	 */
-	async destroy() {
-		if (this.cache) {
-			await this.reset();
-			this.cache = undefined;
-		}
-	}
-
-	/**
-	 * Enable and initialize the cache.
-	 */
-	async enable() {
-		config.set('cache.enabled', true);
-		await this.init();
-	}
-
-	/**
-	 * Disable and destroy the cache.
-	 */
-	async disable() {
-		config.set('cache.enabled', false);
-		await this.destroy();
-	}
-
-	async getCache(): Promise<RedisCache | MemoryCache | undefined> {
-		if (!this.cache) {
-			await this.init();
-		}
-		return this.cache;
-	}
-
-	async reset(): Promise<void> {
-		await this.cache?.store.reset();
-	}
-
-	/**
-	 * Return all keys in the cache.
-	 */
-	async keys(): Promise<string[]> {
-		return this.cache?.store.keys() ?? [];
-	}
-
-	/**
-	 * Return all key/value pairs in the cache. This is a potentially very expensive operation and is only meant to be used for debugging
-	 */
-	async keyValues(): Promise<Map<string, unknown>> {
-		const keys = await this.keys();
-		const values = await this.getMany(keys);
-		const map = new Map<string, unknown>();
-		if (keys.length === values.length) {
-			for (let i = 0; i < keys.length; i++) {
-				map.set(keys[i], values[i]);
-			}
-			return map;
-		}
-		throw new Error(
-			'Keys and values do not match, this should not happen and appears to result from some cache corruption.',
-		);
-	}
-}
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 0000000000..421597a172
--- /dev/null
+++ b/packages/cli/src/services/cache/cache.service.ts
@@ -0,0 +1,360 @@
+import EventEmitter from 'node:events';
+
+import { Service } from 'typedi';
+import { caching } from 'cache-manager';
+import { 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') {
+			setTimeout(async () => {
+				await this.cache.store.del(key);
+			}, ttlMs);
+			return;
+		}
+
+		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 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 0000000000..4e96b8012a
--- /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 0000000000..d556dacdc7
--- /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) =>
+			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) => redisCache.pttl(key),
+		keys: async (pattern = '*') => 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 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 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) => 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
index 8c1cdd123d..53b37b99ea 100644
--- a/packages/cli/src/services/communityPackages.service.ts
+++ b/packages/cli/src/services/communityPackages.service.ts
@@ -5,13 +5,13 @@ import { Service } from 'typedi';
 import { promisify } from 'util';
 import axios from 'axios';
 
-import type { PublicInstalledPackage } from 'n8n-workflow';
+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 '@/databases/repositories/installedPackages.repository';
-import type { InstalledPackages } from '@/databases/entities/InstalledPackages';
+import { InstalledPackagesRepository } from '@db/repositories/installedPackages.repository';
+import type { InstalledPackages } from '@db/entities/InstalledPackages';
 import {
 	NODE_PACKAGE_PREFIX,
 	NPM_COMMAND_TOKENS,
@@ -93,10 +93,10 @@ export class CommunityPackagesService {
 	}
 
 	parseNpmPackageName(rawString?: string): CommunityPackages.ParsedPackageName {
-		if (!rawString) throw new Error(PACKAGE_NAME_NOT_PROVIDED);
+		if (!rawString) throw new ApplicationError(PACKAGE_NAME_NOT_PROVIDED);
 
 		if (INVALID_OR_SUSPICIOUS_PACKAGE_NAME.test(rawString)) {
-			throw new Error('Package name must be a single word');
+			throw new ApplicationError('Package name must be a single word');
 		}
 
 		const scope = rawString.includes('/') ? rawString.split('/')[0] : undefined;
@@ -104,7 +104,7 @@ export class CommunityPackagesService {
 		const packageNameWithoutScope = scope ? rawString.replace(`${scope}/`, '') : rawString;
 
 		if (!packageNameWithoutScope.startsWith(NODE_PACKAGE_PREFIX)) {
-			throw new Error(`Package name must start with ${NODE_PACKAGE_PREFIX}`);
+			throw new ApplicationError(`Package name must start with ${NODE_PACKAGE_PREFIX}`);
 		}
 
 		const version = packageNameWithoutScope.includes('@')
@@ -155,12 +155,12 @@ export class CommunityPackagesService {
 			};
 
 			Object.entries(map).forEach(([npmMessage, n8nMessage]) => {
-				if (errorMessage.includes(npmMessage)) throw new Error(n8nMessage);
+				if (errorMessage.includes(npmMessage)) throw new ApplicationError(n8nMessage);
 			});
 
 			this.logger.warn('npm command failed', { errorMessage });
 
-			throw new Error(PACKAGE_FAILED_TO_INSTALL);
+			throw new ApplicationError(PACKAGE_FAILED_TO_INSTALL);
 		}
 	}
 
@@ -327,7 +327,7 @@ export class CommunityPackagesService {
 			await this.executeNpmCommand(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 new ApplicationError('npm package not found', { extra: { packageName } });
 			}
 			throw error;
 		}
@@ -341,7 +341,7 @@ export class CommunityPackagesService {
 			try {
 				await this.executeNpmCommand(removeCommand);
 			} catch {}
-			throw new Error(RESPONSE_ERROR_MESSAGES.PACKAGE_LOADING_FAILED, { cause: error });
+			throw new ApplicationError(RESPONSE_ERROR_MESSAGES.PACKAGE_LOADING_FAILED, { cause: error });
 		}
 
 		if (loader.loadedNodes.length > 0) {
@@ -354,7 +354,10 @@ export class CommunityPackagesService {
 				await this.loadNodesAndCredentials.postProcessLoaders();
 				return installedPackage;
 			} catch (error) {
-				throw new Error(`Failed to save installed package: ${packageName}`, { cause: error });
+				throw new ApplicationError('Failed to save installed package', {
+					extra: { packageName },
+					cause: error,
+				});
 			}
 		} else {
 			// Remove this package since it contains no loadable nodes
@@ -363,7 +366,7 @@ export class CommunityPackagesService {
 				await this.executeNpmCommand(removeCommand);
 			} catch {}
 
-			throw new Error(RESPONSE_ERROR_MESSAGES.PACKAGE_DOES_NOT_CONTAIN_NODES);
+			throw new ApplicationError(RESPONSE_ERROR_MESSAGES.PACKAGE_DOES_NOT_CONTAIN_NODES);
 		}
 	}
 }
diff --git a/packages/cli/src/services/dynamicNodeParameters.service.ts b/packages/cli/src/services/dynamicNodeParameters.service.ts
new file mode 100644
index 0000000000..1788bac6e1
--- /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
index 72cd10f983..64c8a0e499 100644
--- a/packages/cli/src/services/events.service.ts
+++ b/packages/cli/src/services/events.service.ts
@@ -2,7 +2,7 @@ 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';
+import { WorkflowStatisticsRepository } from '@db/repositories/workflowStatistics.repository';
 import { UserService } from '@/services/user.service';
 import { Logger } from '@/Logger';
 import { OwnershipService } from './ownership.service';
@@ -73,7 +73,7 @@ export class EventsService extends EventEmitter {
 			StatisticsNames.dataLoaded,
 			workflowId,
 		);
-		if (insertResult === 'failed') return;
+		if (insertResult === 'failed' || insertResult === 'alreadyExists') return;
 
 		// Compile the metrics since this was a new data loaded event
 		const owner = await this.ownershipService.getWorkflowOwnerCached(workflowId);
diff --git a/packages/cli/src/services/executionMetadata.service.ts b/packages/cli/src/services/executionMetadata.service.ts
index bccb7172ee..6b62ee2365 100644
--- a/packages/cli/src/services/executionMetadata.service.ts
+++ b/packages/cli/src/services/executionMetadata.service.ts
@@ -1,6 +1,6 @@
-import { ExecutionMetadataRepository } from '@/databases/repositories';
 import { Service } from 'typedi';
-import type { ExecutionMetadata } from '@/databases/entities/ExecutionMetadata';
+import { ExecutionMetadataRepository } from '@db/repositories/executionMetadata.repository';
+import type { ExecutionMetadata } from '@db/entities/ExecutionMetadata';
 
 @Service()
 export class ExecutionMetadataService {
diff --git a/packages/cli/src/services/frontend.service.ts b/packages/cli/src/services/frontend.service.ts
index a493cdf3eb..9c0828c912 100644
--- a/packages/cli/src/services/frontend.service.ts
+++ b/packages/cli/src/services/frontend.service.ts
@@ -12,18 +12,16 @@ import type {
 } from 'n8n-workflow';
 import { InstanceSettings } from 'n8n-core';
 
-import { GENERATED_STATIC_DIR, LICENSE_FEATURES } from '@/constants';
+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 { getInstanceBaseUrl } from '@/UserManagement/UserManagementHelper';
-import * as WebhookHelpers from '@/WebhookHelpers';
-import config from '@/config';
 import { getCurrentAuthenticationMethod } from '@/sso/ssoHelpers';
 import { getLdapLoginLabel } from '@/Ldap/helpers';
 import { getSamlLoginLabel } from '@/sso/saml/samlHelpers';
-import { getVariablesLimit } from '@/environments/variables/enviromentHelpers';
+import { getVariablesLimit } from '@/environments/variables/environmentHelpers';
 import {
 	getWorkflowHistoryLicensePruneTime,
 	getWorkflowHistoryPruneTime,
@@ -31,6 +29,8 @@ import {
 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 {
@@ -46,6 +46,8 @@ export class FrontendService {
 		private readonly license: License,
 		private readonly mailer: UserManagementMailer,
 		private readonly instanceSettings: InstanceSettings,
+		private readonly urlService: UrlService,
+		private readonly internalHooks: InternalHooks,
 	) {
 		loadNodesAndCredentials.addPostProcessor(async () => this.generateTypes());
 		void this.generateTypes();
@@ -61,7 +63,7 @@ export class FrontendService {
 	}
 
 	private initSettings() {
-		const instanceBaseUrl = getInstanceBaseUrl();
+		const instanceBaseUrl = this.urlService.getInstanceBaseUrl();
 		const restEndpoint = config.getEnv('endpoints.rest');
 
 		const telemetrySettings: ITelemetrySettings = {
@@ -81,6 +83,9 @@ export class FrontendService {
 		}
 
 		this.settings = {
+			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'),
@@ -90,7 +95,7 @@ export class FrontendService {
 			maxExecutionTimeout: config.getEnv('executions.maxTimeout'),
 			workflowCallerPolicyDefaultOption: config.getEnv('workflows.callerPolicyDefaultOption'),
 			timezone: config.getEnv('generic.timezone'),
-			urlBaseWebhook: WebhookHelpers.getWebhookBaseUrl(),
+			urlBaseWebhook: this.urlService.getWebhookBaseUrl(),
 			urlBaseEditor: instanceBaseUrl,
 			versionCli: '',
 			releaseChannel: config.getEnv('generic.releaseChannel'),
@@ -175,6 +180,8 @@ export class FrontendService {
 				debugInEditor: false,
 				binaryDataS3: false,
 				workflowHistory: false,
+				workerView: false,
+				advancedPermissions: false,
 			},
 			mfa: {
 				enabled: false,
@@ -205,19 +212,22 @@ export class FrontendService {
 	async generateTypes() {
 		this.overwriteCredentialsProperties();
 
+		const { staticCacheDir } = this.instanceSettings;
 		// pre-render all the node and credential types as static json files
-		await mkdir(path.join(GENERATED_STATIC_DIR, 'types'), { recursive: true });
+		await mkdir(path.join(staticCacheDir, 'types'), { recursive: true });
 		const { credentials, nodes } = this.loadNodesAndCredentials.types;
 		this.writeStaticJSON('nodes', nodes);
 		this.writeStaticJSON('credentials', credentials);
 	}
 
-	getSettings(): IN8nUISettings {
+	getSettings(sessionId?: string): IN8nUISettings {
+		void this.internalHooks.onFrontendSettingsAPI(sessionId);
+
 		const restEndpoint = config.getEnv('endpoints.rest');
 
 		// Update all urls, in case `WEBHOOK_URL` was updated by `--tunnel`
-		const instanceBaseUrl = getInstanceBaseUrl();
-		this.settings.urlBaseWebhook = WebhookHelpers.getWebhookBaseUrl();
+		const instanceBaseUrl = this.urlService.getInstanceBaseUrl();
+		this.settings.urlBaseWebhook = this.urlService.getWebhookBaseUrl();
 		this.settings.urlBaseEditor = instanceBaseUrl;
 		this.settings.oauthCallbackUrls = {
 			oauth1: `${instanceBaseUrl}/${restEndpoint}/oauth1-credential/callback`,
@@ -262,6 +272,8 @@ export class FrontendService {
 			binaryDataS3: isS3Available && isS3Selected && isS3Licensed,
 			workflowHistory:
 				this.license.isWorkflowHistoryLicensed() && config.getEnv('workflowHistory.enabled'),
+			workerView: this.license.isWorkerViewLicensed(),
+			advancedPermissions: this.license.isAdvancedPermissionsLicensed(),
 		});
 
 		if (this.license.isLdapEnabled()) {
@@ -295,6 +307,8 @@ export class FrontendService {
 
 		this.settings.mfa.enabled = config.get('mfa.enabled');
 
+		this.settings.executionMode = config.getEnv('executions.mode');
+
 		return this.settings;
 	}
 
@@ -303,7 +317,8 @@ export class FrontendService {
 	}
 
 	private writeStaticJSON(name: string, data: INodeTypeBaseDescription[] | ICredentialType[]) {
-		const filePath = path.join(GENERATED_STATIC_DIR, `types/${name}.json`);
+		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) => {
diff --git a/packages/cli/src/services/import.service.ts b/packages/cli/src/services/import.service.ts
new file mode 100644
index 0000000000..df9050e82a
--- /dev/null
+++ b/packages/cli/src/services/import.service.ts
@@ -0,0 +1,114 @@
+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 '@/databases/repositories/credentials.repository';
+import { TagRepository } from '@/databases/repositories/tag.repository';
+import { SharedWorkflow } from '@/databases/entities/SharedWorkflow';
+import { RoleService } from '@/services/role.service';
+import { replaceInvalidCredentials } from '@/WorkflowHelpers';
+import { WorkflowEntity } from '@/databases/entities/WorkflowEntity';
+import { WorkflowTagMapping } from '@/databases/entities/WorkflowTagMapping';
+
+import type { TagEntity } from '@/databases/entities/TagEntity';
+import type { Role } from '@/databases/entities/Role';
+import type { ICredentialsDb } from '@/Interfaces';
+
+@Service()
+export class ImportService {
+	private dbCredentials: ICredentialsDb[] = [];
+
+	private dbTags: TagEntity[] = [];
+
+	private workflowOwnerRole: Role;
+
+	constructor(
+		private readonly logger: Logger,
+		private readonly credentialsRepository: CredentialsRepository,
+		private readonly tagRepository: TagRepository,
+		private readonly roleService: RoleService,
+	) {}
+
+	async initRecords() {
+		this.dbCredentials = await this.credentialsRepository.find();
+		this.dbTags = await this.tagRepository.find();
+		this.workflowOwnerRole = await this.roleService.findWorkflowOwnerRole();
+	}
+
+	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 upsertResult = await tx.upsert(WorkflowEntity, workflow, ['id']);
+
+				const workflowId = upsertResult.identifiers.at(0)?.id as string;
+
+				await tx.upsert(SharedWorkflow, { workflowId, userId, roleId: this.workflowOwnerRole.id }, [
+					'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
index 094b595d8d..7f9f4fdd84 100644
--- a/packages/cli/src/services/jwt.service.ts
+++ b/packages/cli/src/services/jwt.service.ts
@@ -1,17 +1,34 @@
 import { Service } from 'typedi';
-import * as jwt from 'jsonwebtoken';
+import { createHash } from 'crypto';
+import jwt from 'jsonwebtoken';
+import { InstanceSettings } from 'n8n-core';
 import config from '@/config';
 
 @Service()
 export class JwtService {
-	private readonly userManagementSecret = config.getEnv('userManagement.jwtSecret');
+	readonly jwtSecret = config.getEnv('userManagement.jwtSecret');
 
-	public signData(payload: object, options: jwt.SignOptions = {}): string {
-		return jwt.sign(payload, this.userManagementSecret, options);
+	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 verifyToken(token: string, options: jwt.VerifyOptions = {}) {
-		return jwt.verify(token, this.userManagementSecret, options) as jwt.JwtPayload;
+	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;
 	}
 }
 
diff --git a/packages/cli/src/services/metrics.service.ts b/packages/cli/src/services/metrics.service.ts
index 57fa90d8a9..3d2ba25e6a 100644
--- a/packages/cli/src/services/metrics.service.ts
+++ b/packages/cli/src/services/metrics.service.ts
@@ -7,7 +7,7 @@ import semverParse from 'semver/functions/parse';
 import { Service } from 'typedi';
 import EventEmitter from 'events';
 
-import { CacheService } from '@/services/cache.service';
+import { CacheService } from '@/services/cache/cache.service';
 import type { EventMessageTypes } from '@/eventbus/EventMessageClasses';
 import {
 	METRICS_EVENT_NAME,
@@ -97,7 +97,7 @@ export class MetricsService extends EventEmitter {
 			labelNames: ['cache'],
 		});
 		this.counters.cacheHitsTotal.inc(0);
-		this.cacheService.on(this.cacheService.metricsCounterEvents.cacheHit, (amount: number = 1) => {
+		this.cacheService.on('metrics.cache.hit', (amount: number = 1) => {
 			this.counters.cacheHitsTotal?.inc(amount);
 		});
 
@@ -107,7 +107,7 @@ export class MetricsService extends EventEmitter {
 			labelNames: ['cache'],
 		});
 		this.counters.cacheMissesTotal.inc(0);
-		this.cacheService.on(this.cacheService.metricsCounterEvents.cacheMiss, (amount: number = 1) => {
+		this.cacheService.on('metrics.cache.miss', (amount: number = 1) => {
 			this.counters.cacheMissesTotal?.inc(amount);
 		});
 
@@ -117,12 +117,9 @@ export class MetricsService extends EventEmitter {
 			labelNames: ['cache'],
 		});
 		this.counters.cacheUpdatesTotal.inc(0);
-		this.cacheService.on(
-			this.cacheService.metricsCounterEvents.cacheUpdate,
-			(amount: number = 1) => {
-				this.counters.cacheUpdatesTotal?.inc(amount);
-			},
-		);
+		this.cacheService.on('metrics.cache.update', (amount: number = 1) => {
+			this.counters.cacheUpdatesTotal?.inc(amount);
+		});
 	}
 
 	private getCounterForEvent(event: EventMessageTypes): Counter<string> | null {
diff --git a/packages/cli/src/services/naming.service.ts b/packages/cli/src/services/naming.service.ts
new file mode 100644
index 0000000000..3b49e48803
--- /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 this.getUniqueName(requestedName, 'workflow');
+	}
+
+	async getUniqueCredentialName(requestedName: string) {
+		return 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.base.service.ts b/packages/cli/src/services/orchestration.base.service.ts
index 8440407283..a2540a4a5a 100644
--- a/packages/cli/src/services/orchestration.base.service.ts
+++ b/packages/cli/src/services/orchestration.base.service.ts
@@ -2,9 +2,12 @@ import Container from 'typedi';
 import { RedisService } from './redis.service';
 import type { RedisServicePubSubPublisher } from './redis/RedisServicePubSubPublisher';
 import config from '@/config';
+import { EventEmitter } from 'node:events';
 
-export abstract class OrchestrationService {
-	protected initialized = false;
+export abstract class OrchestrationService extends EventEmitter {
+	protected isInitialized = false;
+
+	protected queueModeId: string;
 
 	redisPublisher: RedisServicePubSubPublisher;
 
@@ -27,24 +30,26 @@ export abstract class OrchestrationService {
 	}
 
 	constructor() {
+		super();
 		this.redisService = Container.get(RedisService);
+		this.queueModeId = config.getEnv('redis.queueModeId');
 	}
 
 	sanityCheck(): boolean {
-		return this.initialized && this.isQueueMode;
+		return this.isInitialized && this.isQueueMode;
 	}
 
 	async init() {
 		await this.initPublisher();
-		this.initialized = true;
+		this.isInitialized = true;
 	}
 
 	async shutdown() {
 		await this.redisPublisher?.destroy();
-		this.initialized = false;
+		this.isInitialized = false;
 	}
 
-	private async initPublisher() {
+	protected async initPublisher() {
 		this.redisPublisher = await this.redisService.getPubSubPublisher();
 	}
 }
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 0000000000..55822c9ac8
--- /dev/null
+++ b/packages/cli/src/services/orchestration/main/MultiMainSetup.ee.ts
@@ -0,0 +1,142 @@
+import config from '@/config';
+import { Service } from 'typedi';
+import { TIME } from '@/constants';
+import { SingleMainSetup } from '@/services/orchestration/main/SingleMainSetup';
+import { getRedisPrefix } from '@/services/redis/RedisServiceHelper';
+import { ErrorReporterProxy as EventReporter } from 'n8n-workflow';
+import type {
+	RedisServiceBaseCommand,
+	RedisServiceCommand,
+} from '@/services/redis/RedisServiceCommands';
+
+@Service()
+export class MultiMainSetup extends SingleMainSetup {
+	private id = this.queueModeId;
+
+	private isLicensed = false;
+
+	get isEnabled() {
+		return (
+			config.getEnv('executions.mode') === 'queue' &&
+			config.getEnv('multiMainSetup.enabled') &&
+			config.getEnv('generic.instanceType') === 'main' &&
+			this.isLicensed
+		);
+	}
+
+	get isLeader() {
+		return config.getEnv('multiMainSetup.instanceType') === 'leader';
+	}
+
+	get isFollower() {
+		return !this.isLeader;
+	}
+
+	get instanceId() {
+		return this.id;
+	}
+
+	setLicensed(newState: boolean) {
+		this.isLicensed = newState;
+	}
+
+	private readonly leaderKey = getRedisPrefix() + ':main_instance_leader';
+
+	private readonly leaderKeyTtl = config.getEnv('multiMainSetup.ttl');
+
+	private leaderCheckInterval: NodeJS.Timer | undefined;
+
+	async init() {
+		if (!this.isEnabled || this.isInitialized) return;
+
+		await this.initPublisher();
+
+		this.isInitialized = true;
+
+		await this.tryBecomeLeader(); // prevent initial wait
+
+		this.leaderCheckInterval = setInterval(
+			async () => {
+				await this.checkLeader();
+			},
+			config.getEnv('multiMainSetup.interval') * TIME.SECOND,
+		);
+	}
+
+	async shutdown() {
+		if (!this.isInitialized) return;
+
+		clearInterval(this.leaderCheckInterval);
+
+		if (this.isLeader) await this.redisPublisher.clear(this.leaderKey);
+	}
+
+	private async checkLeader() {
+		const leaderId = await this.redisPublisher.get(this.leaderKey);
+
+		if (leaderId === this.id) {
+			this.logger.debug(`[Instance ID ${this.id}] Leader is this instance`);
+
+			await this.redisPublisher.setExpiration(this.leaderKey, this.leaderKeyTtl);
+
+			return;
+		}
+
+		if (leaderId && leaderId !== this.id) {
+			this.logger.debug(`[Instance ID ${this.id}] Leader is other instance "${leaderId}"`);
+
+			if (config.getEnv('multiMainSetup.instanceType') === 'leader') {
+				this.emit('leadershipChange', leaderId); // stop triggers, pruning, etc.
+
+				EventReporter.report('[Multi-main setup] Leader failed to renew leader key', {
+					level: 'info',
+				});
+
+				config.set('multiMainSetup.instanceType', 'follower');
+			}
+
+			return;
+		}
+
+		if (!leaderId) {
+			this.logger.debug(
+				`[Instance ID ${this.id}] Leadership vacant, attempting to become leader...`,
+			);
+
+			config.set('multiMainSetup.instanceType', 'follower');
+
+			await this.tryBecomeLeader();
+		}
+	}
+
+	private async tryBecomeLeader() {
+		// this can only succeed if leadership is currently vacant
+		const keySetSuccessfully = await this.redisPublisher.setIfNotExists(this.leaderKey, this.id);
+
+		if (keySetSuccessfully) {
+			this.logger.debug(`[Instance ID ${this.id}] Leader is now this instance`);
+
+			config.set('multiMainSetup.instanceType', 'leader');
+
+			await this.redisPublisher.setExpiration(this.leaderKey, this.leaderKeyTtl);
+
+			this.emit('leadershipChange', this.id);
+		} else {
+			config.set('multiMainSetup.instanceType', 'follower');
+		}
+	}
+
+	async publish(command: RedisServiceCommand, data: unknown) {
+		if (!this.sanityCheck()) return;
+
+		const payload = data as RedisServiceBaseCommand['payload'];
+
+		this.logger.debug(`[Instance ID ${this.id}] Publishing command "${command}"`, payload);
+
+		await this.redisPublisher.publishToCommandChannel({ command, payload });
+	}
+
+	async fetchLeaderKey() {
+		return this.redisPublisher.get(this.leaderKey);
+	}
+}
diff --git a/packages/cli/src/services/orchestration/main/SingleMainSetup.ts b/packages/cli/src/services/orchestration/main/SingleMainSetup.ts
new file mode 100644
index 0000000000..10b020b7d8
--- /dev/null
+++ b/packages/cli/src/services/orchestration/main/SingleMainSetup.ts
@@ -0,0 +1,60 @@
+import { Logger } from '@/Logger';
+import { Service } from 'typedi';
+import { OrchestrationService } from '@/services/orchestration.base.service';
+
+/**
+ * For use in main instance, in single main instance scenario.
+ */
+@Service()
+export class SingleMainSetup extends OrchestrationService {
+	constructor(protected readonly logger: Logger) {
+		super();
+	}
+
+	sanityCheck() {
+		return this.isInitialized && this.isQueueMode && this.isMainInstance;
+	}
+
+	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 });
+	}
+
+	async broadcastRestartEventbusAfterDestinationUpdate() {
+		if (!this.sanityCheck()) return;
+
+		const command = 'restartEventBus';
+
+		this.logger.debug(`Sending "${command}" to command channel`);
+
+		await this.redisPublisher.publishToCommandChannel({ command });
+	}
+
+	async broadcastReloadExternalSecretsProviders() {
+		if (!this.sanityCheck()) return;
+
+		const command = 'reloadExternalSecretsProviders';
+
+		this.logger.debug(`Sending "${command}" to command channel`);
+
+		await this.redisPublisher.publishToCommandChannel({ command });
+	}
+}
diff --git a/packages/cli/src/services/orchestration/main/handleCommandMessageMain.ts b/packages/cli/src/services/orchestration/main/handleCommandMessageMain.ts
index 5fb3de35c8..f41106ca2d 100644
--- a/packages/cli/src/services/orchestration/main/handleCommandMessageMain.ts
+++ b/packages/cli/src/services/orchestration/main/handleCommandMessageMain.ts
@@ -5,12 +5,18 @@ import { MessageEventBus } from '@/eventbus/MessageEventBus/MessageEventBus';
 import { ExternalSecretsManager } from '@/ExternalSecrets/ExternalSecretsManager.ee';
 import { License } from '@/License';
 import { Logger } from '@/Logger';
+import { ActiveWorkflowRunner } from '@/ActiveWorkflowRunner';
+import { Push } from '@/push';
+import { MultiMainSetup } from './MultiMainSetup.ee';
+import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
+import { TestWebhooks } from '@/TestWebhooks';
 
 export async function handleCommandMessageMain(messageString: string) {
-	const queueModeId = config.get('redis.queueModeId');
-	const isMainInstance = config.get('generic.instanceType') === 'main';
+	const queueModeId = config.getEnv('redis.queueModeId');
+	const isMainInstance = config.getEnv('generic.instanceType') === 'main';
 	const message = messageToRedisServiceCommandObject(messageString);
 	const logger = Container.get(Logger);
+	const activeWorkflowRunner = Container.get(ActiveWorkflowRunner);
 
 	if (message) {
 		logger.debug(
@@ -26,6 +32,9 @@ export async function handleCommandMessageMain(messageString: string) {
 			);
 			return message;
 		}
+
+		const push = Container.get(Push);
+
 		switch (message.command) {
 			case 'reloadLicense':
 				if (!debounceMessageReceiver(message, 500)) {
@@ -34,7 +43,8 @@ export async function handleCommandMessageMain(messageString: string) {
 					};
 					return message;
 				}
-				if (isMainInstance) {
+
+				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.',
@@ -59,6 +69,104 @@ export async function handleCommandMessageMain(messageString: string) {
 					return message;
 				}
 				await Container.get(ExternalSecretsManager).reloadAllProviders();
+				break;
+
+			case 'workflowActiveStateChanged': {
+				if (!debounceMessageReceiver(message, 100)) {
+					message.payload = { result: 'debounced' };
+					return message;
+				}
+
+				const { workflowId, oldState, newState, versionId } = message.payload ?? {};
+
+				if (
+					typeof workflowId !== 'string' ||
+					typeof oldState !== 'boolean' ||
+					typeof newState !== 'boolean' ||
+					typeof versionId !== 'string'
+				) {
+					break;
+				}
+
+				if (!oldState && newState) {
+					try {
+						await activeWorkflowRunner.add(workflowId, 'activate');
+						push.broadcast('workflowActivated', { workflowId });
+					} catch (e) {
+						const error = e instanceof Error ? e : new Error(`${e}`);
+
+						await Container.get(WorkflowRepository).update(workflowId, {
+							active: false,
+							versionId,
+						});
+
+						await Container.get(MultiMainSetup).publish('workflowFailedToActivate', {
+							workflowId,
+							errorMessage: error.message,
+						});
+					}
+				} else if (oldState && !newState) {
+					await activeWorkflowRunner.remove(workflowId);
+					push.broadcast('workflowDeactivated', { workflowId });
+				} else {
+					await activeWorkflowRunner.remove(workflowId);
+					await activeWorkflowRunner.add(workflowId, 'update');
+				}
+
+				await activeWorkflowRunner.removeActivationError(workflowId);
+			}
+
+			case 'workflowFailedToActivate': {
+				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, sessionId } = message.payload;
+
+				if (!push.getBackend().hasSessionId(sessionId)) break;
+
+				push.send(type, args, sessionId);
+
+				break;
+			}
+
+			case 'clear-test-webhooks': {
+				if (!debounceMessageReceiver(message, 100)) {
+					// @ts-expect-error Legacy typing
+					message.payload = { result: 'debounced' };
+					return message;
+				}
+
+				const { webhookKey, workflowEntity, sessionId } = message.payload;
+
+				if (!push.getBackend().hasSessionId(sessionId)) break;
+
+				const testWebhooks = Container.get(TestWebhooks);
+
+				testWebhooks.clearTimeout(webhookKey);
+
+				const workflow = testWebhooks.toWorkflow(workflowEntity);
+
+				await testWebhooks.deactivateWebhooks(workflow);
+
+				break;
+			}
+
 			default:
 				break;
 		}
diff --git a/packages/cli/src/services/orchestration/main/handleWorkerResponseMessageMain.ts b/packages/cli/src/services/orchestration/main/handleWorkerResponseMessageMain.ts
index 246df5e4f7..47a1a08019 100644
--- a/packages/cli/src/services/orchestration/main/handleWorkerResponseMessageMain.ts
+++ b/packages/cli/src/services/orchestration/main/handleWorkerResponseMessageMain.ts
@@ -1,15 +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) {
-		// TODO: Handle worker response
-		Container.get(Logger).debug(
-			`Received worker response ${workerResponse.command} from ${workerResponse.workerId}`,
-		);
+		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.main.service.ts b/packages/cli/src/services/orchestration/main/orchestration.main.service.ts
deleted file mode 100644
index c8105dbe17..0000000000
--- a/packages/cli/src/services/orchestration/main/orchestration.main.service.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { Service } from 'typedi';
-import { OrchestrationService } from '../../orchestration.base.service';
-
-@Service()
-export class OrchestrationMainService extends OrchestrationService {
-	sanityCheck(): boolean {
-		return this.initialized && this.isQueueMode && this.isMainInstance;
-	}
-
-	async getWorkerStatus(id?: string) {
-		if (!this.sanityCheck()) return;
-		await this.redisPublisher.publishToCommandChannel({
-			command: 'getStatus',
-			targets: id ? [id] : undefined,
-		});
-	}
-
-	async getWorkerIds() {
-		if (!this.sanityCheck()) return;
-		await this.redisPublisher.publishToCommandChannel({
-			command: 'getId',
-		});
-	}
-
-	async broadcastRestartEventbusAfterDestinationUpdate() {
-		if (!this.sanityCheck()) return;
-		await this.redisPublisher.publishToCommandChannel({
-			command: 'restartEventBus',
-		});
-	}
-
-	async broadcastReloadExternalSecretsProviders() {
-		if (!this.sanityCheck()) return;
-		await this.redisPublisher.publishToCommandChannel({
-			command: 'reloadExternalSecretsProviders',
-		});
-	}
-}
diff --git a/packages/cli/src/services/orchestration/webhook/orchestration.webhook.service.ts b/packages/cli/src/services/orchestration/webhook/orchestration.webhook.service.ts
index dc9dc8172e..c186a9c1d8 100644
--- a/packages/cli/src/services/orchestration/webhook/orchestration.webhook.service.ts
+++ b/packages/cli/src/services/orchestration/webhook/orchestration.webhook.service.ts
@@ -4,6 +4,6 @@ import { OrchestrationService } from '../../orchestration.base.service';
 @Service()
 export class OrchestrationWebhookService extends OrchestrationService {
 	sanityCheck(): boolean {
-		return this.initialized && this.isQueueMode && this.isWebhookInstance;
+		return this.isInitialized && this.isQueueMode && this.isWebhookInstance;
 	}
 }
diff --git a/packages/cli/src/services/orchestration/worker/handleCommandMessageWorker.ts b/packages/cli/src/services/orchestration/worker/handleCommandMessageWorker.ts
index 91b801b066..ec68be49a8 100644
--- a/packages/cli/src/services/orchestration/worker/handleCommandMessageWorker.ts
+++ b/packages/cli/src/services/orchestration/worker/handleCommandMessageWorker.ts
@@ -9,6 +9,7 @@ import { ExternalSecretsManager } from '@/ExternalSecrets/ExternalSecretsManager
 import { debounceMessageReceiver, getOsCpuString } from '../helpers';
 import type { WorkerCommandReceivedHandlerOptions } from './types';
 import { Logger } from '@/Logger';
+import { N8N_VERSION } from '@/constants';
 
 export function getWorkerCommandReceivedHandler(options: WorkerCommandReceivedHandlerOptions) {
 	return async (channel: string, messageString: string) => {
@@ -33,13 +34,12 @@ export function getWorkerCommandReceivedHandler(options: WorkerCommandReceivedHa
 				}
 				switch (message.command) {
 					case 'getStatus':
-						if (!debounceMessageReceiver(message, 200)) return;
+						if (!debounceMessageReceiver(message, 500)) return;
 						await options.redisPublisher.publishToWorkerChannel({
 							workerId: options.queueModeId,
-							command: message.command,
+							command: 'getStatus',
 							payload: {
 								workerId: options.queueModeId,
-								runningJobs: options.getRunningJobIds(),
 								runningJobsSummary: options.getRunningJobsSummary(),
 								freeMem: os.freemem(),
 								totalMem: os.totalmem(),
@@ -49,27 +49,32 @@ export function getWorkerCommandReceivedHandler(options: WorkerCommandReceivedHa
 								arch: os.arch(),
 								platform: os.platform(),
 								hostname: os.hostname(),
-								net: Object.values(os.networkInterfaces()).flatMap(
+								interfaces: Object.values(os.networkInterfaces()).flatMap(
 									(interfaces) =>
-										interfaces?.map((net) => `${net.family} - address: ${net.address}`) ?? '',
+										(interfaces ?? [])?.map((net) => ({
+											family: net.family,
+											address: net.address,
+											internal: net.internal,
+										})),
 								),
+								version: N8N_VERSION,
 							},
 						});
 						break;
 					case 'getId':
-						if (!debounceMessageReceiver(message, 200)) return;
+						if (!debounceMessageReceiver(message, 500)) return;
 						await options.redisPublisher.publishToWorkerChannel({
 							workerId: options.queueModeId,
-							command: message.command,
+							command: 'getId',
 						});
 						break;
 					case 'restartEventBus':
-						if (!debounceMessageReceiver(message, 100)) return;
+						if (!debounceMessageReceiver(message, 500)) return;
 						try {
 							await Container.get(MessageEventBus).restart();
 							await options.redisPublisher.publishToWorkerChannel({
 								workerId: options.queueModeId,
-								command: message.command,
+								command: 'restartEventBus',
 								payload: {
 									result: 'success',
 								},
@@ -77,7 +82,7 @@ export function getWorkerCommandReceivedHandler(options: WorkerCommandReceivedHa
 						} catch (error) {
 							await options.redisPublisher.publishToWorkerChannel({
 								workerId: options.queueModeId,
-								command: message.command,
+								command: 'restartEventBus',
 								payload: {
 									result: 'error',
 									error: (error as Error).message,
@@ -86,12 +91,12 @@ export function getWorkerCommandReceivedHandler(options: WorkerCommandReceivedHa
 						}
 						break;
 					case 'reloadExternalSecretsProviders':
-						if (!debounceMessageReceiver(message, 200)) return;
+						if (!debounceMessageReceiver(message, 500)) return;
 						try {
 							await Container.get(ExternalSecretsManager).reloadAllProviders();
 							await options.redisPublisher.publishToWorkerChannel({
 								workerId: options.queueModeId,
-								command: message.command,
+								command: 'reloadExternalSecretsProviders',
 								payload: {
 									result: 'success',
 								},
@@ -99,7 +104,7 @@ export function getWorkerCommandReceivedHandler(options: WorkerCommandReceivedHa
 						} catch (error) {
 							await options.redisPublisher.publishToWorkerChannel({
 								workerId: options.queueModeId,
-								command: message.command,
+								command: 'reloadExternalSecretsProviders',
 								payload: {
 									result: 'error',
 									error: (error as Error).message,
@@ -117,6 +122,13 @@ export function getWorkerCommandReceivedHandler(options: WorkerCommandReceivedHa
 						// 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}"`,
diff --git a/packages/cli/src/services/orchestration/worker/orchestration.worker.service.ts b/packages/cli/src/services/orchestration/worker/orchestration.worker.service.ts
index 0a6fb9cff2..f044e5403b 100644
--- a/packages/cli/src/services/orchestration/worker/orchestration.worker.service.ts
+++ b/packages/cli/src/services/orchestration/worker/orchestration.worker.service.ts
@@ -5,7 +5,7 @@ import { OrchestrationService } from '../../orchestration.base.service';
 @Service()
 export class OrchestrationWorkerService extends OrchestrationService {
 	sanityCheck(): boolean {
-		return this.initialized && this.isQueueMode && this.isWorkerInstance;
+		return this.isInitialized && this.isQueueMode && this.isWorkerInstance;
 	}
 
 	async publishToEventLog(message: AbstractEventMessage) {
diff --git a/packages/cli/src/services/ownership.service.ts b/packages/cli/src/services/ownership.service.ts
index 3d0e59c166..669356250f 100644
--- a/packages/cli/src/services/ownership.service.ts
+++ b/packages/cli/src/services/ownership.service.ts
@@ -1,18 +1,17 @@
 import { Service } from 'typedi';
-import { CacheService } from './cache.service';
-import { SharedWorkflowRepository } from '@/databases/repositories';
-import type { User } from '@/databases/entities/User';
+import { CacheService } from '@/services/cache/cache.service';
+import { SharedWorkflowRepository } from '@db/repositories/sharedWorkflow.repository';
+import type { User } from '@db/entities/User';
 import { RoleService } from './role.service';
-import { UserService } from './user.service';
-import type { Credentials, ListQuery } from '@/requests';
-import type { Role } from '@/databases/entities/Role';
-import type { CredentialsEntity } from '@/databases/entities/CredentialsEntity';
+import { UserRepository } from '@/databases/repositories/user.repository';
+import type { ListQuery } from '@/requests';
+import { ApplicationError } from 'n8n-workflow';
 
 @Service()
 export class OwnershipService {
 	constructor(
 		private cacheService: CacheService,
-		private userService: UserService,
+		private userRepository: UserRepository,
 		private roleService: RoleService,
 		private sharedWorkflowRepository: SharedWorkflowRepository,
 	) {}
@@ -21,55 +20,63 @@ export class OwnershipService {
 	 * Retrieve the user who owns the workflow. Note that workflow ownership is **immutable**.
 	 */
 	async getWorkflowOwnerCached(workflowId: string) {
-		const cachedValue = (await this.cacheService.get(`cache:workflow-owner:${workflowId}`)) as User;
+		const cachedValue = await this.cacheService.getHashValue<User>(
+			'workflow-ownership',
+			workflowId,
+		);
 
-		if (cachedValue) return this.userService.create(cachedValue);
+		if (cachedValue) return this.userRepository.create(cachedValue);
 
 		const workflowOwnerRole = await this.roleService.findWorkflowOwnerRole();
 
-		if (!workflowOwnerRole) throw new Error('Failed to find workflow owner role');
+		if (!workflowOwnerRole) throw new ApplicationError('Failed to find workflow owner role');
 
 		const sharedWorkflow = await this.sharedWorkflowRepository.findOneOrFail({
 			where: { workflowId, roleId: workflowOwnerRole.id },
 			relations: ['user', 'user.globalRole'],
 		});
 
-		void this.cacheService.set(`cache:workflow-owner:${workflowId}`, sharedWorkflow.user);
+		void this.cacheService.setHash('workflow-ownership', { [workflowId]: sharedWorkflow.user });
 
 		return sharedWorkflow.user;
 	}
 
-	addOwnedBy(
-		workflow: ListQuery.Workflow.WithSharing,
-		workflowOwnerRole: Role,
-	): ListQuery.Workflow.WithOwnership {
-		const { shared, ...rest } = workflow;
+	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 ownerId = shared?.find((s) => s.roleId.toString() === workflowOwnerRole.id)?.userId;
+		const entity = rest as
+			| ListQuery.Workflow.WithOwnedByAndSharedWith
+			| ListQuery.Credentials.WithOwnedByAndSharedWith;
 
-		return Object.assign(rest, {
-			ownedBy: ownerId ? { id: ownerId } : null,
-		});
-	}
-
-	addOwnedByAndSharedWith(_credential: CredentialsEntity): Credentials.WithOwnedByAndSharedWith {
-		const { shared, ...rest } = _credential;
-
-		const credential = rest as Credentials.WithOwnedByAndSharedWith;
-
-		credential.ownedBy = null;
-		credential.sharedWith = [];
+		Object.assign(entity, { ownedBy: null, sharedWith: [] });
 
 		shared?.forEach(({ user, role }) => {
 			const { id, email, firstName, lastName } = user;
 
 			if (role.name === 'owner') {
-				credential.ownedBy = { id, email, firstName, lastName };
+				entity.ownedBy = { id, email, firstName, lastName };
 			} else {
-				credential.sharedWith.push({ id, email, firstName, lastName });
+				entity.sharedWith.push({ id, email, firstName, lastName });
 			}
 		});
 
-		return credential;
+		return entity;
+	}
+
+	async getInstanceOwner() {
+		const globalOwnerRole = await this.roleService.findGlobalOwnerRole();
+
+		return this.userRepository.findOneOrFail({
+			where: { globalRoleId: globalOwnerRole.id },
+			relations: ['globalRole'],
+		});
 	}
 }
diff --git a/packages/cli/src/services/password.utility.ts b/packages/cli/src/services/password.utility.ts
new file mode 100644
index 0000000000..d600371e55
--- /dev/null
+++ b/packages/cli/src/services/password.utility.ts
@@ -0,0 +1,45 @@
+import { BadRequestError } from '@/errors/response-errors/bad-request.error';
+import { Service as Utility } from 'typedi';
+import { compare, genSaltSync, hash } from 'bcryptjs';
+import {
+	MAX_PASSWORD_CHAR_LENGTH as maxLength,
+	MIN_PASSWORD_CHAR_LENGTH as minLength,
+} from '@/constants';
+
+@Utility()
+export class PasswordUtility {
+	async hash(plaintext: string) {
+		const SALT_ROUNDS = 10;
+		const salt = genSaltSync(SALT_ROUNDS);
+
+		return hash(plaintext, salt);
+	}
+
+	async compare(plaintext: string, hashed: string) {
+		return 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 0000000000..f2b142bf1f
--- /dev/null
+++ b/packages/cli/src/services/pruning.service.ts
@@ -0,0 +1,165 @@
+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,
+	) {}
+
+	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.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() {
+		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 () => 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
index 46557fb0df..d6cb11b294 100644
--- a/packages/cli/src/services/redis.service.ts
+++ b/packages/cli/src/services/redis.service.ts
@@ -1,10 +1,6 @@
 import { Service } from 'typedi';
 import { RedisServicePubSubSubscriber } from './redis/RedisServicePubSubSubscriber';
 import { RedisServicePubSubPublisher } from './redis/RedisServicePubSubPublisher';
-import { RedisServiceListReceiver } from './redis/RedisServiceListReceiver';
-import { RedisServiceListSender } from './redis/RedisServiceListSender';
-import { RedisServiceStreamConsumer } from './redis/RedisServiceStreamConsumer';
-import { RedisServiceStreamProducer } from './redis/RedisServiceStreamProducer';
 
 /*
  * This is a convenience service that provides access to all the Redis clients.
@@ -14,10 +10,6 @@ export class RedisService {
 	constructor(
 		private redisServicePubSubSubscriber: RedisServicePubSubSubscriber,
 		private redisServicePubSubPublisher: RedisServicePubSubPublisher,
-		private redisServiceListReceiver: RedisServiceListReceiver,
-		private redisServiceListSender: RedisServiceListSender,
-		private redisServiceStreamConsumer: RedisServiceStreamConsumer,
-		private redisServiceStreamProducer: RedisServiceStreamProducer,
 	) {}
 
 	async getPubSubSubscriber() {
@@ -29,24 +21,4 @@ export class RedisService {
 		await this.redisServicePubSubPublisher.init();
 		return this.redisServicePubSubPublisher;
 	}
-
-	async getListSender() {
-		await this.redisServiceListSender.init();
-		return this.redisServiceListSender;
-	}
-
-	async getListReceiver() {
-		await this.redisServiceListReceiver.init();
-		return this.redisServiceListReceiver;
-	}
-
-	async getStreamProducer() {
-		await this.redisServiceStreamProducer.init();
-		return this.redisServiceStreamProducer;
-	}
-
-	async getStreamConsumer() {
-		await this.redisServiceStreamConsumer.init();
-		return this.redisServiceStreamConsumer;
-	}
 }
diff --git a/packages/cli/src/services/redis/RedisServiceCommands.ts b/packages/cli/src/services/redis/RedisServiceCommands.ts
index 8423c3a0f7..e1c20d71a6 100644
--- a/packages/cli/src/services/redis/RedisServiceCommands.ts
+++ b/packages/cli/src/services/redis/RedisServiceCommands.ts
@@ -1,4 +1,4 @@
-import type { WorkerJobStatusSummary } from '../orchestration/worker/types';
+import type { IPushDataType, IPushDataWorkerStatusPayload, IWorkflowDb } from '@/Interfaces';
 
 export type RedisServiceCommand =
 	| 'getStatus'
@@ -6,7 +6,11 @@ export type RedisServiceCommand =
 	| 'restartEventBus'
 	| 'stopWorker'
 	| 'reloadLicense'
-	| 'reloadExternalSecretsProviders';
+	| 'reloadExternalSecretsProviders'
+	| 'workflowActiveStateChanged' // multi-main only
+	| 'workflowFailedToActivate' // 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.
@@ -14,13 +18,27 @@ export type RedisServiceCommand =
  * @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.
  */
-type RedisServiceBaseCommand = {
-	senderId: string;
-	command: RedisServiceCommand;
-	payload?: {
-		[key: string]: string | number | boolean | string[] | number[] | boolean[];
-	};
-};
+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>; sessionId: string };
+	  }
+	| {
+			senderId: string;
+			command: 'clear-test-webhooks';
+			payload: { webhookKey: string; workflowEntity: IWorkflowDb; sessionId: string };
+	  };
 
 export type RedisServiceWorkerResponseObject = {
 	workerId: string;
@@ -28,20 +46,7 @@ export type RedisServiceWorkerResponseObject = {
 	| RedisServiceBaseCommand
 	| {
 			command: 'getStatus';
-			payload: {
-				workerId: string;
-				runningJobs: string[];
-				runningJobsSummary: WorkerJobStatusSummary[];
-				freeMem: number;
-				totalMem: number;
-				uptime: number;
-				loadAvg: number[];
-				cpus: string;
-				arch: string;
-				platform: NodeJS.Platform;
-				hostname: string;
-				net: string[];
-			};
+			payload: IPushDataWorkerStatusPayload;
 	  }
 	| {
 			command: 'getId';
@@ -63,6 +68,14 @@ export type RedisServiceWorkerResponseObject = {
 	| {
 			command: 'stopWorker';
 	  }
+	| {
+			command: 'workflowActiveStateChanged';
+			payload: {
+				oldState: boolean;
+				newState: boolean;
+				workflowId: string;
+			};
+	  }
 );
 
 export type RedisServiceCommandObject = {
diff --git a/packages/cli/src/services/redis/RedisServiceHelper.ts b/packages/cli/src/services/redis/RedisServiceHelper.ts
index 4066689fe5..257a826b76 100644
--- a/packages/cli/src/services/redis/RedisServiceHelper.ts
+++ b/packages/cli/src/services/redis/RedisServiceHelper.ts
@@ -143,7 +143,6 @@ export async function getDefaultRedisClient(
 	additionalRedisOptions?: RedisOptions,
 	redisType?: RedisClientType,
 ): Promise<Redis | Cluster> {
-	// eslint-disable-next-line @typescript-eslint/naming-convention
 	const { default: Redis } = await import('ioredis');
 	const clusterNodes = getRedisClusterNodes();
 	const usesRedisCluster = clusterNodes.length > 0;
diff --git a/packages/cli/src/services/redis/RedisServiceListReceiver.ts b/packages/cli/src/services/redis/RedisServiceListReceiver.ts
deleted file mode 100644
index 1de36fee6a..0000000000
--- a/packages/cli/src/services/redis/RedisServiceListReceiver.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-import { Service } from 'typedi';
-import { jsonParse } from 'n8n-workflow';
-import { WORKER_RESPONSE_REDIS_LIST } from './RedisServiceHelper';
-import type { RedisServiceWorkerResponseObject } from './RedisServiceCommands';
-import { RedisServiceBaseReceiver } from './RedisServiceBaseClasses';
-
-@Service()
-export class RedisServiceListReceiver extends RedisServiceBaseReceiver {
-	async init(): Promise<void> {
-		await super.init('list-receiver');
-	}
-
-	async popFromHead(list: string): Promise<string | null | undefined> {
-		if (!this.redisClient) {
-			await this.init();
-		}
-		return this.redisClient?.lpop(list);
-	}
-
-	async popFromTail(list: string): Promise<string | null | undefined> {
-		if (!this.redisClient) {
-			await this.init();
-		}
-		return this.redisClient?.rpop(list);
-	}
-
-	private poppedResultToWorkerResponse(
-		poppedResult: string | null | undefined,
-		list: string = WORKER_RESPONSE_REDIS_LIST,
-	): RedisServiceWorkerResponseObject | null {
-		if (poppedResult) {
-			try {
-				const workerResponse = jsonParse<RedisServiceWorkerResponseObject>(poppedResult);
-				if (workerResponse) {
-					// TODO: Handle worker response
-					console.log('Received worker response', workerResponse);
-				}
-				return workerResponse;
-			} catch (error) {
-				this.logger.warn(
-					`Error parsing worker response on list ${list}: ${(error as Error).message}`,
-				);
-			}
-		}
-		return null;
-	}
-
-	async popOldestWorkerResponse(): Promise<RedisServiceWorkerResponseObject | null> {
-		const poppedResult = await this.popFromTail(WORKER_RESPONSE_REDIS_LIST);
-		return this.poppedResultToWorkerResponse(poppedResult);
-	}
-
-	async popLatestWorkerResponse(): Promise<RedisServiceWorkerResponseObject | null> {
-		const poppedResult = await this.popFromHead(WORKER_RESPONSE_REDIS_LIST);
-		return this.poppedResultToWorkerResponse(poppedResult);
-	}
-}
diff --git a/packages/cli/src/services/redis/RedisServiceListSender.ts b/packages/cli/src/services/redis/RedisServiceListSender.ts
deleted file mode 100644
index 93dcd15992..0000000000
--- a/packages/cli/src/services/redis/RedisServiceListSender.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { Service } from 'typedi';
-import { WORKER_RESPONSE_REDIS_LIST } from './RedisServiceHelper';
-import type { RedisServiceWorkerResponseObject } from './RedisServiceCommands';
-import { RedisServiceBaseSender } from './RedisServiceBaseClasses';
-
-@Service()
-export class RedisServiceListSender extends RedisServiceBaseSender {
-	async init(): Promise<void> {
-		await super.init('list-sender');
-	}
-
-	async prepend(list: string, message: string): Promise<void> {
-		if (!this.redisClient) {
-			await this.init();
-		}
-		await this.redisClient?.lpush(list, message);
-	}
-
-	async append(list: string, message: string): Promise<void> {
-		if (!this.redisClient) {
-			await this.init();
-		}
-		await this.redisClient?.rpush(list, message);
-	}
-
-	async appendWorkerResponse(message: RedisServiceWorkerResponseObject): Promise<void> {
-		await this.prepend(WORKER_RESPONSE_REDIS_LIST, JSON.stringify(message));
-	}
-}
diff --git a/packages/cli/src/services/redis/RedisServicePubSubPublisher.ts b/packages/cli/src/services/redis/RedisServicePubSubPublisher.ts
index 3825cc2cc3..3e23208138 100644
--- a/packages/cli/src/services/redis/RedisServicePubSubPublisher.ts
+++ b/packages/cli/src/services/redis/RedisServicePubSubPublisher.ts
@@ -39,4 +39,30 @@ export class RedisServicePubSubPublisher extends RedisServiceBaseSender {
 	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 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/RedisServiceStreamConsumer.ts b/packages/cli/src/services/redis/RedisServiceStreamConsumer.ts
deleted file mode 100644
index 64bff03634..0000000000
--- a/packages/cli/src/services/redis/RedisServiceStreamConsumer.ts
+++ /dev/null
@@ -1,91 +0,0 @@
-import { Service } from 'typedi';
-import { RedisServiceBaseReceiver } from './RedisServiceBaseClasses';
-
-type LastId = string;
-
-type StreamName = string;
-
-type StreamDetails = {
-	lastId: LastId;
-	pollingInterval: number;
-	waiter: NodeJS.Timer | undefined;
-};
-
-@Service()
-export class RedisServiceStreamConsumer extends RedisServiceBaseReceiver {
-	// while actively listening, the stream name and last id are stored here
-	// removing the entry will stop the listener
-	streams: Map<StreamName, StreamDetails> = new Map();
-
-	async init(): Promise<void> {
-		await super.init('consumer');
-	}
-
-	async listenToStream(stream: StreamName, lastId = '$'): Promise<void> {
-		if (!this.redisClient) {
-			await this.init();
-		}
-		this.logger.debug(`Redis client now listening to stream ${stream} starting with id ${lastId}`);
-		this.setLastId(stream, lastId);
-		const interval = this.streams.get(stream)?.pollingInterval ?? 1000;
-		const waiter = setInterval(async () => {
-			const currentLastId = this.streams.get(stream)?.lastId ?? '$';
-			const results = await this.redisClient?.xread(
-				'BLOCK',
-				interval,
-				'STREAMS',
-				stream,
-				currentLastId,
-			);
-			if (results && results.length > 0) {
-				const [_key, messages] = results[0];
-				if (messages.length > 0) {
-					messages.forEach(([id, message]) => {
-						this.messageHandlers.forEach((handler) => handler(stream, id, message));
-					});
-					// Pass the last id of the results to the next round.
-					const newLastId = messages[messages.length - 1][0];
-					this.setLastId(stream, newLastId);
-				}
-			}
-		}, interval);
-		this.setWaiter(stream, waiter);
-	}
-
-	stopListeningToStream(stream: StreamName): void {
-		this.logger.debug(`Redis client stopped listening to stream ${stream}`);
-		const existing = this.streams.get(stream);
-		if (existing?.waiter) {
-			clearInterval(existing.waiter);
-		}
-		this.streams.delete(stream);
-	}
-
-	private updateStreamDetails(stream: StreamName, details: Partial<StreamDetails>): void {
-		const existing = this.streams.get(stream);
-		this.streams.set(stream, {
-			lastId: details.lastId ?? existing?.lastId ?? '$',
-			waiter: details.waiter ?? existing?.waiter,
-			pollingInterval: details.pollingInterval ?? existing?.pollingInterval ?? 1000,
-		});
-	}
-
-	async setPollingInterval(stream: StreamName, pollingInterval: number): Promise<void> {
-		this.updateStreamDetails(stream, { pollingInterval });
-		if (this.streams.get(stream)?.waiter) {
-			this.stopListeningToStream(stream);
-			await this.listenToStream(stream);
-		}
-	}
-
-	setLastId(stream: StreamName, lastId: string): void {
-		this.updateStreamDetails(stream, { lastId });
-	}
-
-	setWaiter(stream: StreamName, waiter: NodeJS.Timeout): void {
-		// only update the waiter if the stream is still being listened to
-		if (this.streams.get(stream)) {
-			this.updateStreamDetails(stream, { waiter });
-		}
-	}
-}
diff --git a/packages/cli/src/services/redis/RedisServiceStreamProducer.ts b/packages/cli/src/services/redis/RedisServiceStreamProducer.ts
deleted file mode 100644
index 6fe03208e0..0000000000
--- a/packages/cli/src/services/redis/RedisServiceStreamProducer.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import type { RedisValue } from 'ioredis';
-import { Service } from 'typedi';
-import type { AbstractEventMessage } from '@/eventbus/EventMessageClasses/AbstractEventMessage';
-import {
-	COMMAND_REDIS_STREAM,
-	EVENT_BUS_REDIS_STREAM,
-	WORKER_RESPONSE_REDIS_STREAM,
-} from './RedisServiceHelper';
-import type {
-	RedisServiceCommandObject,
-	RedisServiceWorkerResponseObject,
-} from './RedisServiceCommands';
-import { RedisServiceBaseSender } from './RedisServiceBaseClasses';
-
-@Service()
-export class RedisServiceStreamProducer extends RedisServiceBaseSender {
-	async init(): Promise<void> {
-		await super.init('producer');
-	}
-
-	async add(streamName: string, values: RedisValue[]): Promise<void> {
-		await this.redisClient?.xadd(streamName, '*', 'senderId', this.senderId, ...values);
-	}
-
-	async addToEventStream(message: AbstractEventMessage): Promise<void> {
-		await this.add(EVENT_BUS_REDIS_STREAM, [
-			'message',
-			message.eventName,
-			'event',
-			message.toString(),
-		]);
-	}
-
-	async addToCommandChannel(message: RedisServiceCommandObject): Promise<void> {
-		await this.add(COMMAND_REDIS_STREAM, ['command', JSON.stringify(message)]);
-	}
-
-	async addToWorkerChannel(message: RedisServiceWorkerResponseObject): Promise<void> {
-		await this.add(WORKER_RESPONSE_REDIS_STREAM, ['response', JSON.stringify(message)]);
-	}
-}
diff --git a/packages/cli/src/services/role.service.ts b/packages/cli/src/services/role.service.ts
index d30f47c499..ea880bb9eb 100644
--- a/packages/cli/src/services/role.service.ts
+++ b/packages/cli/src/services/role.service.ts
@@ -1,9 +1,10 @@
-import { RoleRepository, SharedWorkflowRepository } from '@/databases/repositories';
 import { Service } from 'typedi';
-import { CacheService } from './cache.service';
-import type { RoleNames, RoleScopes } from '@/databases/entities/Role';
-
-class InvalidRoleError extends Error {}
+import { RoleRepository } from '@db/repositories/role.repository';
+import { SharedWorkflowRepository } from '@db/repositories/sharedWorkflow.repository';
+import { CacheService } from '@/services/cache/cache.service';
+import type { RoleNames, RoleScopes } from '@db/entities/Role';
+import { InvalidRoleError } from '@/errors/invalid-role.error';
+import { isSharingEnabled } from '@/UserManagement/UserManagementHelper';
 
 @Service()
 export class RoleService {
@@ -23,7 +24,7 @@ export class RoleService {
 		void this.cacheService.setMany(allRoles.map((r) => [r.cacheKey, r]));
 	}
 
-	private async findCached(scope: RoleScopes, name: RoleNames) {
+	async findCached(scope: RoleScopes, name: RoleNames) {
 		const cacheKey = `role:${scope}:${name}`;
 
 		const cachedRole = await this.cacheService.get(cacheKey);
@@ -49,12 +50,17 @@ export class RoleService {
 	private roles: Array<{ name: RoleNames; scope: RoleScopes }> = [
 		{ scope: 'global', name: 'owner' },
 		{ scope: 'global', name: 'member' },
+		{ scope: 'global', name: 'admin' },
 		{ scope: 'workflow', name: 'owner' },
 		{ scope: 'credential', name: 'owner' },
 		{ scope: 'credential', name: 'user' },
 		{ scope: 'workflow', name: 'editor' },
 	];
 
+	listRoles() {
+		return this.roles;
+	}
+
 	private isValid(scope: RoleScopes, name: RoleNames) {
 		return this.roles.some((r) => r.scope === scope && r.name === name);
 	}
@@ -67,6 +73,10 @@ export class RoleService {
 		return this.findCached('global', 'member');
 	}
 
+	async findGlobalAdminRole() {
+		return this.findCached('global', 'admin');
+	}
+
 	async findWorkflowOwnerRole() {
 		return this.findCached('workflow', 'owner');
 	}
@@ -91,4 +101,8 @@ export class RoleService {
 			})
 			.then((shared) => shared?.role);
 	}
+
+	async findCredentialOwnerRoleId() {
+		return isSharingEnabled() ? undefined : (await this.findCredentialOwnerRole()).id;
+	}
 }
diff --git a/packages/cli/src/services/tag.service.ts b/packages/cli/src/services/tag.service.ts
index 5bf94da7de..0de35883af 100644
--- a/packages/cli/src/services/tag.service.ts
+++ b/packages/cli/src/services/tag.service.ts
@@ -1,10 +1,8 @@
-import { TagRepository } from '@/databases/repositories';
+import { TagRepository } from '@db/repositories/tag.repository';
 import { Service } from 'typedi';
 import { validateEntity } from '@/GenericHelpers';
-import type { ITagToImport, ITagWithCountDb, IWorkflowToImport } from '@/Interfaces';
-import type { TagEntity } from '@/databases/entities/TagEntity';
-import type { EntityManager, FindManyOptions, FindOneOptions } from 'typeorm';
-import type { UpsertOptions } from 'typeorm/repository/UpsertOptions';
+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[];
@@ -46,18 +44,6 @@ export class TagService {
 		return deleteResult;
 	}
 
-	async findOne(options: FindOneOptions<TagEntity>) {
-		return this.tagRepository.findOne(options);
-	}
-
-	async findMany(options: FindManyOptions<TagEntity>) {
-		return this.tagRepository.find(options);
-	}
-
-	async upsert(tag: TagEntity, options: UpsertOptions<TagEntity>) {
-		return this.tagRepository.upsert(tag, options);
-	}
-
 	async getAll<T extends { withUsageCount: boolean }>(options?: T): Promise<GetAllResult<T>> {
 		if (options?.withUsageCount) {
 			const allTags = await this.tagRepository.find({
@@ -89,69 +75,4 @@ export class TagService {
 
 		return requestOrder.map((tagId) => tagMap[tagId]);
 	}
-
-	/**
-	 * Set tag IDs to use existing tags, creates a new tag if no matching tag could be found
-	 */
-	async setTagsForImport(
-		transactionManager: EntityManager,
-		workflow: IWorkflowToImport,
-		tags: TagEntity[],
-	) {
-		if (!this.hasTags(workflow)) return;
-
-		const workflowTags = workflow.tags;
-		const tagLookupPromises = [];
-		for (let i = 0; i < workflowTags.length; i++) {
-			if (workflowTags[i]?.name) {
-				const lookupPromise = this.findOrCreateTag(transactionManager, workflowTags[i], tags).then(
-					(tag) => {
-						workflowTags[i] = {
-							id: tag.id,
-							name: tag.name,
-						};
-					},
-				);
-				tagLookupPromises.push(lookupPromise);
-			}
-		}
-
-		await Promise.all(tagLookupPromises);
-	}
-
-	private hasTags(workflow: IWorkflowToImport) {
-		return 'tags' in workflow && Array.isArray(workflow.tags) && workflow.tags.length > 0;
-	}
-
-	private async findOrCreateTag(
-		transactionManager: EntityManager,
-		importTag: ITagToImport,
-		tagsEntities: 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 this.txCreateTag(transactionManager, importTag.name);
-		tagsEntities.push(created);
-		return created;
-	}
-
-	private async txCreateTag(transactionManager: EntityManager, name: string) {
-		const tag = this.tagRepository.create({ name: name.trim() });
-		return transactionManager.save<TagEntity>(tag);
-	}
 }
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 0000000000..58a80dd758
--- /dev/null
+++ b/packages/cli/src/services/test-webhook-registrations.service.ts
@@ -0,0 +1,87 @@
+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';
+
+export type TestWebhookRegistration = {
+	sessionId?: string;
+	workflowEntity: IWorkflowDb;
+	destinationNode?: string;
+	webhook: IWebhookData;
+};
+
+@Service()
+export class TestWebhookRegistrationsService {
+	constructor(private readonly cacheService: CacheService) {}
+
+	private readonly cacheKey = 'test-webhooks';
+
+	async register(registration: TestWebhookRegistration) {
+		const hashKey = this.toKey(registration.webhook);
+
+		await this.cacheService.setHash(this.cacheKey, { [hashKey]: registration });
+
+		/**
+		 * 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 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 0000000000..b1ef737c2f
--- /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/user.service.ts b/packages/cli/src/services/user.service.ts
index 6d6c9c15f5..1d3306d4be 100644
--- a/packages/cli/src/services/user.service.ts
+++ b/packages/cli/src/services/user.service.ts
@@ -1,49 +1,36 @@
-import { Service } from 'typedi';
-import type { EntityManager, FindManyOptions, FindOneOptions, FindOptionsWhere } from 'typeorm';
-import { In } from 'typeorm';
+import { Container, Service } from 'typedi';
 import { User } from '@db/entities/User';
 import type { IUserSettings } from 'n8n-workflow';
-import { UserRepository } from '@/databases/repositories';
-import { getInstanceBaseUrl } from '@/UserManagement/UserManagementHelper';
+import { UserRepository } from '@db/repositories/user.repository';
 import type { PublicUser } from '@/Interfaces';
 import type { PostHogClient } from '@/posthog';
+import { type JwtPayload, JwtService } from './jwt.service';
+import { TokenExpiredError } from 'jsonwebtoken';
+import { Logger } from '@/Logger';
+import { createPasswordSha } from '@/auth/jwt';
+import { UserManagementMailer } from '@/UserManagement/email';
+import { InternalHooks } from '@/InternalHooks';
+import { RoleService } from '@/services/role.service';
+import { UrlService } from '@/services/url.service';
+import { ApplicationError, ErrorReporterProxy as ErrorReporter } from 'n8n-workflow';
+import type { UserRequest } from '@/requests';
+import { InternalServerError } from '@/errors/response-errors/internal-server.error';
 
 @Service()
 export class UserService {
-	constructor(private readonly userRepository: UserRepository) {}
-
-	async findOne(options: FindOneOptions<User>) {
-		return this.userRepository.findOne({ relations: ['globalRole'], ...options });
-	}
-
-	async findOneOrFail(options: FindOneOptions<User>) {
-		return this.userRepository.findOneOrFail({ relations: ['globalRole'], ...options });
-	}
-
-	async findMany(options: FindManyOptions<User>) {
-		return this.userRepository.find(options);
-	}
-
-	async findOneBy(options: FindOptionsWhere<User>) {
-		return this.userRepository.findOneBy(options);
-	}
-
-	create(data: Partial<User>) {
-		return this.userRepository.create(data);
-	}
-
-	async save(user: Partial<User>) {
-		return this.userRepository.save(user);
-	}
+	constructor(
+		private readonly logger: Logger,
+		private readonly userRepository: UserRepository,
+		private readonly jwtService: JwtService,
+		private readonly mailer: UserManagementMailer,
+		private readonly roleService: RoleService,
+		private readonly urlService: UrlService,
+	) {}
 
 	async update(userId: string, data: Partial<User>) {
 		return this.userRepository.update(userId, data);
 	}
 
-	async getByIds(transaction: EntityManager, ids: string[]) {
-		return transaction.find(User, { where: { id: In(ids) } });
-	}
-
 	getManager() {
 		return this.userRepository.manager;
 	}
@@ -54,17 +41,68 @@ export class UserService {
 		return this.userRepository.update(userId, { settings: { ...settings, ...newSettings } });
 	}
 
-	generatePasswordResetUrl(instanceBaseUrl: string, token: string, mfaEnabled: boolean) {
+	generatePasswordResetToken(user: User, expiresIn = '20m') {
+		return this.jwtService.sign(
+			{ sub: user.id, passwordSha: createPasswordSha(user) },
+			{ expiresIn },
+		);
+	}
+
+	generatePasswordResetUrl(user: User) {
+		const instanceBaseUrl = this.urlService.getInstanceBaseUrl();
 		const url = new URL(`${instanceBaseUrl}/change-password`);
 
-		url.searchParams.append('token', token);
-		url.searchParams.append('mfaEnabled', mfaEnabled.toString());
+		url.searchParams.append('token', this.generatePasswordResetToken(user));
+		url.searchParams.append('mfaEnabled', user.mfaEnabled.toString());
 
 		return url.toString();
 	}
 
-	async toPublic(user: User, options?: { withInviteUrl?: boolean; posthog?: PostHogClient }) {
-		const { password, updatedAt, apiKey, authIdentities, ...rest } = user;
+	async resolvePasswordResetToken(token: string): Promise<User | undefined> {
+		let decodedToken: JwtPayload & { passwordSha: string };
+		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', 'globalRole'],
+		});
+
+		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 (createPasswordSha(user) !== decodedToken.passwordSha) {
+			this.logger.debug('Password updated since this token was generated');
+			return;
+		}
+
+		return user;
+	}
+
+	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');
 
@@ -74,26 +112,34 @@ export class UserService {
 			hasRecoveryCodesLeft: !!user.mfaRecoveryCodes?.length,
 		};
 
-		if (options?.withInviteUrl && publicUser.isPending) {
-			publicUser = this.addInviteUrl(publicUser, user.id);
+		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(user: PublicUser, inviterId: string) {
-		const url = new URL(getInstanceBaseUrl());
+	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', user.id);
+		url.searchParams.set('inviteeId', invitee.id);
 
-		user.inviteAcceptUrl = url.toString();
+		invitee.inviteAcceptUrl = url.toString();
 
-		return user;
+		return invitee;
 	}
 
 	private async addFeatureFlags(publicUser: PublicUser, posthog: PostHogClient) {
@@ -112,4 +158,121 @@ export class UserService {
 
 		return Promise.race([fetchPromise, timeoutPromise]);
 	}
+
+	private async sendEmails(
+		owner: User,
+		toInviteUsers: { [key: string]: string },
+		role: 'member' | 'admin',
+	) {
+		const domain = this.urlService.getInstanceBaseUrl();
+
+		return 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: 'member' | 'admin' }>) {
+		const memberRole = await this.roleService.findGlobalMemberRole();
+		const adminRole = await this.roleService.findGlobalAdminRole();
+		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) =>
+				Promise.all(
+					toCreateUsers.map(async ({ email, role }) => {
+						const newUser = Object.assign(new User(), {
+							email,
+							globalRole: role === 'member' ? memberRole : adminRole,
+						});
+						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/webhook.service.ts b/packages/cli/src/services/webhook.service.ts
index 91cac46b02..d8bf6fe579 100644
--- a/packages/cli/src/services/webhook.service.ts
+++ b/packages/cli/src/services/webhook.service.ts
@@ -1,9 +1,8 @@
-import { WebhookRepository } from '@/databases/repositories';
+import { WebhookRepository } from '@db/repositories/webhook.repository';
 import { Service } from 'typedi';
-import { CacheService } from './cache.service';
-import type { WebhookEntity } from '@/databases/entities/WebhookEntity';
+import { CacheService } from '@/services/cache/cache.service';
+import type { WebhookEntity } from '@db/entities/WebhookEntity';
 import type { IHttpRequestMethods } from 'n8n-workflow';
-import type { DeepPartial } from 'typeorm';
 
 type Method = NonNullable<IHttpRequestMethods>;
 
@@ -97,7 +96,7 @@ export class WebhookService {
 		return this.webhookRepository.insert(webhook);
 	}
 
-	createWebhook(data: DeepPartial<WebhookEntity>) {
+	createWebhook(data: Partial<WebhookEntity>) {
 		return this.webhookRepository.create(data);
 	}
 
@@ -107,12 +106,6 @@ export class WebhookService {
 		return this.deleteWebhooks(webhooks);
 	}
 
-	async deleteInstanceWebhooks() {
-		const webhooks = await this.webhookRepository.find();
-
-		return this.deleteWebhooks(webhooks);
-	}
-
 	private async deleteWebhooks(webhooks: WebhookEntity[]) {
 		void this.cacheService.deleteMany(webhooks.map((w) => w.cacheKey));
 
diff --git a/packages/cli/src/shutdown/Shutdown.service.ts b/packages/cli/src/shutdown/Shutdown.service.ts
new file mode 100644
index 0000000000..14b3367c4b
--- /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) => 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/routes/saml.controller.ee.ts b/packages/cli/src/sso/saml/routes/saml.controller.ee.ts
index 67d441a37c..0dd3bb8ba2 100644
--- a/packages/cli/src/sso/saml/routes/saml.controller.ee.ts
+++ b/packages/cli/src/sso/saml/routes/saml.controller.ee.ts
@@ -1,7 +1,12 @@
 import express from 'express';
-import { Container, Service } from 'typedi';
-import { getInstanceBaseUrl } from '@/UserManagement/UserManagementHelper';
-import { Authorized, Get, NoAuthRequired, Post, RestController } from '@/decorators';
+import {
+	Authorized,
+	Get,
+	NoAuthRequired,
+	Post,
+	RestController,
+	RequireGlobalScope,
+} from '@/decorators';
 import { SamlUrls } from '../constants';
 import {
 	samlLicensedAndEnabledMiddleware,
@@ -9,7 +14,6 @@ import {
 } 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';
@@ -27,11 +31,18 @@ import { getSamlConnectionTestFailedView } from '../views/samlConnectionTestFail
 import { InternalHooks } from '@/InternalHooks';
 import url from 'url';
 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';
 
-@Service()
+@Authorized()
 @RestController('/sso/saml')
 export class SamlController {
-	constructor(private samlService: SamlService) {}
+	constructor(
+		private readonly samlService: SamlService,
+		private readonly urlService: UrlService,
+		private readonly internalHooks: InternalHooks,
+	) {}
 
 	@NoAuthRequired()
 	@Get(SamlUrls.metadata)
@@ -60,8 +71,8 @@ export class SamlController {
 	 * POST /sso/saml/config
 	 * Set SAML config
 	 */
-	@Authorized(['global', 'owner'])
 	@Post(SamlUrls.config, { middlewares: [samlLicensedMiddleware] })
+	@RequireGlobalScope('saml:manage')
 	async configPost(req: SamlConfiguration.Update) {
 		const validationResult = await validate(req.body);
 		if (validationResult.length === 0) {
@@ -79,8 +90,8 @@ export class SamlController {
 	 * POST /sso/saml/config/toggle
 	 * Set SAML config
 	 */
-	@Authorized(['global', 'owner'])
 	@Post(SamlUrls.configToggleEnabled, { middlewares: [samlLicensedMiddleware] })
+	@RequireGlobalScope('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');
@@ -130,7 +141,7 @@ export class SamlController {
 				}
 			}
 			if (loginResult.authenticatedUser) {
-				void Container.get(InternalHooks).onUserLoginSuccess({
+				void this.internalHooks.onUserLoginSuccess({
 					user: loginResult.authenticatedUser,
 					authenticationMethod: 'saml',
 				});
@@ -138,16 +149,16 @@ export class SamlController {
 				if (isSamlLicensedAndEnabled()) {
 					await issueCookie(res, loginResult.authenticatedUser);
 					if (loginResult.onboardingRequired) {
-						return res.redirect(getInstanceBaseUrl() + SamlUrls.samlOnboarding);
+						return res.redirect(this.urlService.getInstanceBaseUrl() + SamlUrls.samlOnboarding);
 					} else {
 						const redirectUrl = req.body?.RelayState ?? SamlUrls.defaultRedirect;
-						return res.redirect(getInstanceBaseUrl() + redirectUrl);
+						return res.redirect(this.urlService.getInstanceBaseUrl() + redirectUrl);
 					}
 				} else {
 					return res.status(202).send(loginResult.attributes);
 				}
 			}
-			void Container.get(InternalHooks).onUserLoginFailed({
+			void this.internalHooks.onUserLoginFailed({
 				user: loginResult.attributes.email ?? 'unknown',
 				authenticationMethod: 'saml',
 			});
@@ -156,7 +167,7 @@ export class SamlController {
 			if (isConnectionTestRequest(req)) {
 				return res.send(getSamlConnectionTestFailedView((error as Error).message));
 			}
-			void Container.get(InternalHooks).onUserLoginFailed({
+			void this.internalHooks.onUserLoginFailed({
 				user: 'unknown',
 				authenticationMethod: 'saml',
 			});
@@ -195,8 +206,8 @@ export class SamlController {
 	 * 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] })
+	@RequireGlobalScope('saml:manage')
 	async configTestGet(req: AuthenticatedRequest, res: express.Response) {
 		return this.handleInitSSO(res, getServiceProviderConfigTestReturnUrl());
 	}
diff --git a/packages/cli/src/sso/saml/saml.service.ee.ts b/packages/cli/src/sso/saml/saml.service.ee.ts
index f1929cda2d..2a20c25c7d 100644
--- a/packages/cli/src/sso/saml/saml.service.ee.ts
+++ b/packages/cli/src/sso/saml/saml.service.ee.ts
@@ -1,9 +1,7 @@
 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 } 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';
@@ -26,8 +24,12 @@ import axios from 'axios';
 import https from 'https';
 import type { SamlLoginBinding } from './types';
 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 {
@@ -53,7 +55,7 @@ export class SamlService {
 		loginLabel: 'SAML',
 		wantAssertionsSigned: true,
 		wantMessageSigned: true,
-		relayState: getInstanceBaseUrl(),
+		relayState: this.urlService.getInstanceBaseUrl(),
 		signatureConfig: {
 			prefix: 'ds',
 			location: {
@@ -71,7 +73,10 @@ export class SamlService {
 		};
 	}
 
-	constructor(private readonly logger: Logger) {}
+	constructor(
+		private readonly logger: Logger,
+		private readonly urlService: UrlService,
+	) {}
 
 	async init(): Promise<void> {
 		// load preferences first but do not apply so as to not load samlify unnecessarily
@@ -91,7 +96,7 @@ export class SamlService {
 			validate: async (response: string) => {
 				const valid = await validateResponse(response);
 				if (!valid) {
-					throw new Error('Invalid SAML response');
+					throw new ApplicationError('Invalid SAML response');
 				}
 			},
 		});
@@ -99,7 +104,7 @@ export class SamlService {
 
 	getIdentityProviderInstance(forceRecreate = false): IdentityProviderInstance {
 		if (this.samlify === undefined) {
-			throw new Error('Samlify is not initialized');
+			throw new ApplicationError('Samlify is not initialized');
 		}
 		if (this.identityProviderInstance === undefined || forceRecreate) {
 			this.identityProviderInstance = this.samlify.IdentityProvider({
@@ -112,7 +117,7 @@ export class SamlService {
 
 	getServiceProviderInstance(): ServiceProviderInstance {
 		if (this.samlify === undefined) {
-			throw new Error('Samlify is not initialized');
+			throw new ApplicationError('Samlify is not initialized');
 		}
 		return getServiceProviderInstance(this._samlPreferences, this.samlify);
 	}
@@ -141,14 +146,14 @@ 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');
 		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',
@@ -167,7 +172,7 @@ export class SamlService {
 		const attributes = await this.getAttributesFromLoginResponse(req, binding);
 		if (attributes.email) {
 			const lowerCasedEmail = attributes.email.toLowerCase();
-			const user = await Db.collections.User.findOne({
+			const user = await Container.get(UserRepository).findOne({
 				where: { email: lowerCasedEmail },
 				relations: ['globalRole', 'authIdentities'],
 			});
@@ -223,7 +228,7 @@ export class SamlService {
 		} else if (prefs.metadata) {
 			const validationResult = await validateMetadata(prefs.metadata);
 			if (!validationResult) {
-				throw new Error('Invalid SAML metadata');
+				throw new ApplicationError('Invalid SAML metadata');
 			}
 		}
 		this.getIdentityProviderInstance(true);
@@ -257,7 +262,7 @@ export class SamlService {
 	}
 
 	async loadFromDbAndApplySamlPreferences(apply = true): Promise<SamlPreferences | undefined> {
-		const samlPreferences = await Db.collections.Settings.findOne({
+		const samlPreferences = await Container.get(SettingsRepository).findOne({
 			where: { key: SAML_PREFERENCES_DB_KEY },
 		});
 		if (samlPreferences) {
@@ -275,16 +280,16 @@ 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);
+			result = await Container.get(SettingsRepository).save(samlPreferences);
 		} else {
-			result = await Db.collections.Settings.save({
+			result = await Container.get(SettingsRepository).save({
 				key: SAML_PREFERENCES_DB_KEY,
 				value: settingsValue,
 				loadOnStartup: true,
diff --git a/packages/cli/src/sso/saml/samlHelpers.ts b/packages/cli/src/sso/saml/samlHelpers.ts
index 6c9f76648c..87603231a1 100644
--- a/packages/cli/src/sso/saml/samlHelpers.ts
+++ b/packages/cli/src/sso/saml/samlHelpers.ts
@@ -1,11 +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 { License } from '@/License';
-import { AuthError, InternalServerError } from '@/ResponseHelper';
-import { hashPassword } 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 +18,11 @@ import {
 import { getServiceProviderConfigTestReturnUrl } from './serviceProvider.ee';
 import type { SamlConfiguration } from './types/requests';
 import { RoleService } from '@/services/role.service';
+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
  */
@@ -103,14 +106,14 @@ export async function createUserFromSamlAttributes(attributes: SamlUserAttribute
 	user.lastName = attributes.lastName;
 	user.globalRole = await Container.get(RoleService).findGlobalMemberRole();
 	// 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);
 	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);
 	if (!resultUser) throw new AuthError('Could not create User');
 	return resultUser;
 }
@@ -131,10 +134,10 @@ export async function updateUserFromSamlAttributes(
 	} else {
 		samlAuthIdentity.providerId = attributes.userPrincipalName;
 	}
-	await Db.collections.AuthIdentity.save(samlAuthIdentity);
+	await Container.get(AuthIdentityRepository).save(samlAuthIdentity);
 	user.firstName = attributes.firstName;
 	user.lastName = attributes.lastName;
-	const resultUser = await Db.collections.User.save(user);
+	const resultUser = await Container.get(UserRepository).save(user);
 	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 ff35c0f4cb..66be4c98e0 100644
--- a/packages/cli/src/sso/saml/samlValidator.ts
+++ b/packages/cli/src/sso/saml/samlValidator.ts
@@ -88,7 +88,13 @@ export async function validateMetadata(metadata: string): Promise<boolean> {
 			return true;
 		} else {
 			logger.warn('SAML Validate Metadata: Invalid metadata');
-			logger.warn(validationResult ? validationResult.errors.join('\n') : '');
+			logger.warn(
+				validationResult
+					? validationResult.errors
+							.map((error) => `${error.message} - ${error.rawMessage}`)
+							.join('\n')
+					: '',
+			);
 		}
 	} catch (error) {
 		// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
@@ -118,7 +124,13 @@ export async function validateResponse(response: string): Promise<boolean> {
 			return true;
 		} else {
 			logger.warn('SAML Validate Response: Failed');
-			logger.warn(validationResult ? validationResult.errors.join('\n') : '');
+			logger.warn(
+				validationResult
+					? validationResult.errors
+							.map((error) => `${error.message} - ${error.rawMessage}`)
+							.join('\n')
+					: '',
+			);
 		}
 	} catch (error) {
 		// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
diff --git a/packages/cli/src/sso/saml/serviceProvider.ee.ts b/packages/cli/src/sso/saml/serviceProvider.ee.ts
index fa1fde6283..372d277b30 100644
--- a/packages/cli/src/sso/saml/serviceProvider.ee.ts
+++ b/packages/cli/src/sso/saml/serviceProvider.ee.ts
@@ -1,21 +1,22 @@
 /* eslint-disable @typescript-eslint/naming-convention */
-import { getInstanceBaseUrl } from '@/UserManagement/UserManagementHelper';
+import { Container } from 'typedi';
 import type { ServiceProviderInstance } from 'samlify';
+import { UrlService } from '@/services/url.service';
 import { SamlUrls } from './constants';
 import type { SamlPreferences } from './types/samlPreferences';
 
 let serviceProviderInstance: ServiceProviderInstance | undefined;
 
 export function getServiceProviderEntityId(): string {
-	return getInstanceBaseUrl() + SamlUrls.restMetadata;
+	return Container.get(UrlService).getInstanceBaseUrl() + SamlUrls.restMetadata;
 }
 
 export function getServiceProviderReturnUrl(): string {
-	return getInstanceBaseUrl() + SamlUrls.restAcs;
+	return Container.get(UrlService).getInstanceBaseUrl() + SamlUrls.restAcs;
 }
 
 export function getServiceProviderConfigTestReturnUrl(): string {
-	return getInstanceBaseUrl() + SamlUrls.configTestReturn;
+	return Container.get(UrlService).getInstanceBaseUrl() + SamlUrls.configTestReturn;
 }
 
 // TODO:SAML: make these configurable for the end user
diff --git a/packages/cli/src/sso/ssoHelpers.ts b/packages/cli/src/sso/ssoHelpers.ts
index 30636c533d..fa1abf2371 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,7 +13,7 @@ export async function setCurrentAuthenticationMethod(
 	authenticationMethod: AuthProviderType,
 ): Promise<void> {
 	config.set('userManagement.authenticationMethod', authenticationMethod);
-	await Db.collections.Settings.save({
+	await Container.get(SettingsRepository).save({
 		key: 'userManagement.authenticationMethod',
 		value: authenticationMethod,
 		loadOnStartup: true,
diff --git a/packages/cli/src/telemetry/index.ts b/packages/cli/src/telemetry/index.ts
index 5bf92b8d07..6fa2fdac18 100644
--- a/packages/cli/src/telemetry/index.ts
+++ b/packages/cli/src/telemetry/index.ts
@@ -2,14 +2,16 @@ import type RudderStack from '@rudderstack/rudder-sdk-node';
 import { PostHogClient } from '@/posthog';
 import { Container, Service } from 'typedi';
 import type { ITelemetryTrackProperties } from 'n8n-workflow';
+import { InstanceSettings } from 'n8n-core';
+
 import config from '@/config';
 import type { IExecutionTrackProperties } from '@/Interfaces';
 import { Logger } from '@/Logger';
 import { License } from '@/License';
-import { LicenseService } from '@/license/License.service';
 import { N8N_VERSION } from '@/constants';
+import { WorkflowRepository } from '@db/repositories/workflow.repository';
 import { SourceControlPreferencesService } from '../environments/sourceControl/sourceControlPreferences.service.ee';
-import { InstanceSettings } from 'n8n-core';
+import { RoleRepository } from '@/databases/repositories/role.repository';
 
 type ExecutionTrackDataKey = 'manual_error' | 'manual_success' | 'prod_error' | 'prod_success';
 
@@ -41,6 +43,7 @@ export class Telemetry {
 		private postHog: PostHogClient,
 		private license: License,
 		private readonly instanceSettings: InstanceSettings,
+		private readonly workflowRepository: WorkflowRepository,
 	) {}
 
 	async init() {
@@ -56,7 +59,6 @@ export class Telemetry {
 
 			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 });
 
@@ -108,7 +110,8 @@ export class Telemetry {
 		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(RoleRepository).countUsersByRole(),
 			source_control_set_up: Container.get(SourceControlPreferencesService).isSourceControlSetup(),
 			branchName: sourceControlPreferences.branchName,
 			read_only_instance: sourceControlPreferences.branchReadOnly,
diff --git a/packages/cli/src/utils.ts b/packages/cli/src/utils.ts
index 5e4f38d011..72d020e96d 100644
--- a/packages/cli/src/utils.ts
+++ b/packages/cli/src/utils.ts
@@ -60,34 +60,6 @@ export const separate = <T>(array: T[], test: (element: T) => boolean) => {
 	return [pass, fail];
 };
 
-export const webhookNotFoundErrorMessage = (
-	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 const toError = (maybeError: unknown) =>
 	// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
 	maybeError instanceof Error ? maybeError : new Error(`${maybeError}`);
@@ -101,3 +73,27 @@ 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/workflows/workflow.request.ts b/packages/cli/src/workflows/workflow.request.ts
new file mode 100644
index 0000000000..e576f50f36
--- /dev/null
+++ b/packages/cli/src/workflows/workflow.request.ts
@@ -0,0 +1,46 @@
+import type { IWorkflowDb } from '@/Interfaces';
+import type { AuthenticatedRequest } from '@/requests';
+import type { INode, IConnections, IWorkflowSettings, IRunData, IPinData } 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?: string[];
+		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/workflows.services.ee.ts b/packages/cli/src/workflows/workflow.service.ee.ts
similarity index 56%
rename from packages/cli/src/workflows/workflows.services.ee.ts
rename to packages/cli/src/workflows/workflow.service.ee.ts
index 1c13d9f8b6..aba0422491 100644
--- a/packages/cli/src/workflows/workflows.services.ee.ts
+++ b/packages/cli/src/workflows/workflow.service.ee.ts
@@ -1,31 +1,42 @@
-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 { SharedWorkflow } from '@db/entities/SharedWorkflow';
 import type { User } from '@db/entities/User';
-import { WorkflowEntity } from '@db/entities/WorkflowEntity';
-import { UserService } from '@/services/user.service';
-import { WorkflowsService } from './workflows.services';
+import type { WorkflowEntity } from '@db/entities/WorkflowEntity';
 import type {
 	CredentialUsedByWorkflow,
 	WorkflowWithSharingsAndCredentials,
 } from './workflows.types';
 import { CredentialsService } from '@/credentials/credentials.service';
-import { NodeOperationError } from 'n8n-workflow';
+import { ApplicationError, NodeOperationError } from 'n8n-workflow';
+import { Service } from 'typedi';
+import type { CredentialsEntity } from '@db/entities/CredentialsEntity';
+import { SharedWorkflowRepository } from '@db/repositories/sharedWorkflow.repository';
+import { BadRequestError } from '@/errors/response-errors/bad-request.error';
+import { NotFoundError } from '@/errors/response-errors/not-found.error';
+import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
+import { CredentialsRepository } from '@/databases/repositories/credentials.repository';
 import { RoleService } from '@/services/role.service';
-import Container from 'typedi';
-import type { CredentialsEntity } from '@/databases/entities/CredentialsEntity';
+import { UserRepository } from '@/databases/repositories/user.repository';
 
-export class EEWorkflowsService extends WorkflowsService {
-	static async isOwned(
+@Service()
+export class EnterpriseWorkflowService {
+	constructor(
+		private readonly sharedWorkflowRepository: SharedWorkflowRepository,
+		private readonly workflowRepository: WorkflowRepository,
+		private readonly credentialsRepository: CredentialsRepository,
+		private readonly userRepository: UserRepository,
+		private readonly roleService: RoleService,
+	) {}
+
+	async isOwned(
 		user: User,
 		workflowId: string,
 	): Promise<{ ownsWorkflow: boolean; workflow?: WorkflowEntity }> {
-		const sharing = await this.getSharing(user, workflowId, ['workflow', 'role'], {
-			allowGlobalOwner: false,
-		});
+		const sharing = await this.sharedWorkflowRepository.getSharing(
+			user,
+			workflowId,
+			{ allowGlobalScope: false },
+			['workflow', 'role'],
+		);
 
 		if (!sharing || sharing.role.name !== 'owner') return { ownsWorkflow: false };
 
@@ -34,53 +45,7 @@ export class EEWorkflowsService extends WorkflowsService {
 		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 = await Container.get(UserService).getByIds(transaction, shareWithIds);
-		const role = await Container.get(RoleService).findWorkflowEditorRole();
-
-		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 addOwnerAndSharings(workflow: WorkflowWithSharingsAndCredentials): void {
+	addOwnerAndSharings(workflow: WorkflowWithSharingsAndCredentials): void {
 		workflow.ownedBy = null;
 		workflow.sharedWith = [];
 		if (!workflow.usedCredentials) {
@@ -101,7 +66,7 @@ export class EEWorkflowsService extends WorkflowsService {
 		delete workflow.shared;
 	}
 
-	static async addCredentialsToWorkflow(
+	async addCredentialsToWorkflow(
 		workflow: WorkflowWithSharingsAndCredentials,
 		currentUser: User,
 	): Promise<void> {
@@ -120,7 +85,7 @@ export class EEWorkflowsService extends WorkflowsService {
 				credentialIdsUsedByWorkflow.add(credential.id);
 			});
 		});
-		const workflowCredentials = await CredentialsService.getManyByIds(
+		const workflowCredentials = await this.credentialsRepository.getManyByIds(
 			Array.from(credentialIdsUsedByWorkflow),
 			{ withSharings: true },
 		);
@@ -147,7 +112,7 @@ export class EEWorkflowsService extends WorkflowsService {
 		});
 	}
 
-	static validateCredentialPermissionsToUser(
+	validateCredentialPermissionsToUser(
 		workflow: WorkflowEntity,
 		allowedCredentials: CredentialsEntity[],
 	) {
@@ -160,17 +125,19 @@ export class EEWorkflowsService extends WorkflowsService {
 				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');
+					throw new ApplicationError(
+						'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 });
+	async preventTampering(workflow: WorkflowEntity, workflowId: string, user: User) {
+		const previousVersion = await this.workflowRepository.get({ id: workflowId });
 
 		if (!previousVersion) {
-			throw new ResponseHelper.NotFoundError('Workflow not found');
+			throw new NotFoundError('Workflow not found');
 		}
 
 		const allCredentials = await CredentialsService.getMany(user);
@@ -183,9 +150,9 @@ export class EEWorkflowsService extends WorkflowsService {
 			);
 		} catch (error) {
 			if (error instanceof NodeOperationError) {
-				throw new ResponseHelper.BadRequestError(error.message);
+				throw new BadRequestError(error.message);
 			}
-			throw new ResponseHelper.BadRequestError(
+			throw new BadRequestError(
 				'Invalid workflow credentials - make sure you have access to all credentials and try again.',
 			);
 		}
diff --git a/packages/cli/src/workflows/workflow.service.ts b/packages/cli/src/workflows/workflow.service.ts
new file mode 100644
index 0000000000..c6546155b0
--- /dev/null
+++ b/packages/cli/src/workflows/workflow.service.ts
@@ -0,0 +1,394 @@
+import Container, { Service } from 'typedi';
+import type { INode, IPinData } from 'n8n-workflow';
+import { NodeApiError, Workflow } from 'n8n-workflow';
+import pick from 'lodash/pick';
+import omit from 'lodash/omit';
+import { v4 as uuid } from 'uuid';
+import { ActiveWorkflowRunner } from '@/ActiveWorkflowRunner';
+import * as WorkflowHelpers from '@/WorkflowHelpers';
+import config from '@/config';
+import type { User } from '@db/entities/User';
+import type { WorkflowEntity } from '@db/entities/WorkflowEntity';
+import { validateEntity } from '@/GenericHelpers';
+import { ExternalHooks } from '@/ExternalHooks';
+import { hasSharing, type ListQuery } from '@/requests';
+import type { WorkflowRequest } from '@/workflows/workflow.request';
+import { TagService } from '@/services/tag.service';
+import type { IWorkflowDb, IWorkflowExecutionDataProcess } from '@/Interfaces';
+import { NodeTypes } from '@/NodeTypes';
+import { WorkflowRunner } from '@/WorkflowRunner';
+import * as WorkflowExecuteAdditionalData from '@/WorkflowExecuteAdditionalData';
+import { TestWebhooks } from '@/TestWebhooks';
+import { InternalHooks } from '@/InternalHooks';
+import { WorkflowRepository } from '@db/repositories/workflow.repository';
+import { OwnershipService } from '@/services/ownership.service';
+import { WorkflowHistoryService } from './workflowHistory/workflowHistory.service.ee';
+import { BinaryDataService } from 'n8n-core';
+import { Logger } from '@/Logger';
+import { MultiMainSetup } from '@/services/orchestration/main/MultiMainSetup.ee';
+import { SharedWorkflowRepository } from '@db/repositories/sharedWorkflow.repository';
+import { WorkflowTagMappingRepository } from '@db/repositories/workflowTagMapping.repository';
+import { ExecutionRepository } from '@db/repositories/execution.repository';
+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 multiMainSetup: MultiMainSetup,
+		private readonly nodeTypes: NodeTypes,
+		private readonly testWebhooks: TestWebhooks,
+		private readonly externalHooks: ExternalHooks,
+		private readonly activeWorkflowRunner: ActiveWorkflowRunner,
+	) {}
+
+	/**
+	 * 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.
+	 */
+	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: this.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
+	}
+
+	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 };
+	}
+
+	async update(
+		user: User,
+		workflow: WorkflowEntity,
+		workflowId: string,
+		tagIds?: string[],
+		forceSave?: boolean,
+		roles?: string[],
+	): 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.',
+			);
+		}
+
+		const oldState = shared.workflow.active;
+
+		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.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 this.workflowRepository.update(
+			workflowId,
+			pick(workflow, [
+				'name',
+				'active',
+				'nodes',
+				'connections',
+				'meta',
+				'settings',
+				'staticData',
+				'pinData',
+				'versionId',
+			]),
+		);
+
+		if (tagIds && !config.getEnv('workflowTagsDisabled')) {
+			await this.workflowTagMappingRepository.delete({ workflowId });
+			await this.workflowTagMappingRepository.insert(
+				tagIds.map((tagId) => ({ tagId, workflowId })),
+			);
+		}
+
+		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.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 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.multiMainSetup.init();
+
+		const newState = updatedWorkflow.active;
+
+		if (this.multiMainSetup.isEnabled && oldState !== newState) {
+			await this.multiMainSetup.publish('workflowActiveStateChanged', {
+				workflowId,
+				oldState,
+				newState,
+				versionId: shared.workflow.versionId,
+			});
+		}
+
+		return updatedWorkflow;
+	}
+
+	async runManually(
+		{
+			workflowData,
+			runData,
+			pinData,
+			startNodes,
+			destinationNode,
+		}: WorkflowRequest.ManualRunPayload,
+		user: User,
+		sessionId?: string,
+	) {
+		const pinnedTrigger = this.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 additionalData = await WorkflowExecuteAdditionalData.getBase(user.id);
+
+			const needsWebhook = await this.testWebhooks.needsWebhook(
+				user.id,
+				workflowData,
+				additionalData,
+				runData,
+				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: 'manual',
+			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,
+		};
+	}
+
+	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: ['owner'] },
+		);
+
+		if (!sharedWorkflow) {
+			return;
+		}
+
+		if (sharedWorkflow.workflow.active) {
+			// deactivate before deleting
+			await this.activeWorkflowRunner.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/workflowHistory/workflowHistory.controller.ee.ts b/packages/cli/src/workflows/workflowHistory/workflowHistory.controller.ee.ts
index 89e78a4d15..2ac2cf4233 100644
--- a/packages/cli/src/workflows/workflowHistory/workflowHistory.controller.ee.ts
+++ b/packages/cli/src/workflows/workflowHistory/workflowHistory.controller.ee.ts
@@ -1,19 +1,16 @@
 import { Authorized, RestController, Get, Middleware } from '@/decorators';
 import { WorkflowHistoryRequest } from '@/requests';
-import { Service } from 'typedi';
-import {
-	HistoryVersionNotFoundError,
-	SharedWorkflowNotFoundError,
-	WorkflowHistoryService,
-} from './workflowHistory.service.ee';
+import { WorkflowHistoryService } from './workflowHistory.service.ee';
 import { Request, Response, NextFunction } from 'express';
 import { isWorkflowHistoryEnabled, isWorkflowHistoryLicensed } from './workflowHistoryHelper.ee';
-import { NotFoundError } from '@/ResponseHelper';
+
 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;
 
-@Service()
 @Authorized()
 @RestController('/workflow-history')
 export class WorkflowHistoryController {
@@ -67,7 +64,7 @@ export class WorkflowHistoryController {
 		} catch (e) {
 			if (e instanceof SharedWorkflowNotFoundError) {
 				throw new NotFoundError('Could not find workflow');
-			} else if (e instanceof HistoryVersionNotFoundError) {
+			} 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
index d2093ba4c7..853c7260f5 100644
--- a/packages/cli/src/workflows/workflowHistory/workflowHistory.service.ee.ts
+++ b/packages/cli/src/workflows/workflowHistory/workflowHistory.service.ee.ts
@@ -1,15 +1,14 @@
-import type { SharedWorkflow } from '@/databases/entities/SharedWorkflow';
-import type { User } from '@/databases/entities/User';
-import type { WorkflowEntity } from '@/databases/entities/WorkflowEntity';
-import type { WorkflowHistory } from '@/databases/entities/WorkflowHistory';
-import { SharedWorkflowRepository } from '@/databases/repositories';
+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';
-
-export class SharedWorkflowNotFoundError extends Error {}
-export class HistoryVersionNotFoundError extends Error {}
+import { SharedWorkflowNotFoundError } from '@/errors/shared-workflow-not-found.error';
+import { WorkflowHistoryVersionNotFoundError } from '@/errors/workflow-history-version-not-found.error';
 
 @Service()
 export class WorkflowHistoryService {
@@ -22,7 +21,7 @@ export class WorkflowHistoryService {
 	private async getSharedWorkflow(user: User, workflowId: string): Promise<SharedWorkflow | null> {
 		return this.sharedWorkflowRepository.findOne({
 			where: {
-				...(!user.isOwner && { userId: user.id }),
+				...(!user.hasGlobalScope('workflow:read') && { userId: user.id }),
 				workflowId,
 			},
 		});
@@ -36,7 +35,7 @@ export class WorkflowHistoryService {
 	): Promise<Array<Omit<WorkflowHistory, 'nodes' | 'connections'>>> {
 		const sharedWorkflow = await this.getSharedWorkflow(user, workflowId);
 		if (!sharedWorkflow) {
-			throw new SharedWorkflowNotFoundError();
+			throw new SharedWorkflowNotFoundError('');
 		}
 		return this.workflowHistoryRepository.find({
 			where: {
@@ -52,7 +51,7 @@ export class WorkflowHistoryService {
 	async getVersion(user: User, workflowId: string, versionId: string): Promise<WorkflowHistory> {
 		const sharedWorkflow = await this.getSharedWorkflow(user, workflowId);
 		if (!sharedWorkflow) {
-			throw new SharedWorkflowNotFoundError();
+			throw new SharedWorkflowNotFoundError('');
 		}
 		const hist = await this.workflowHistoryRepository.findOne({
 			where: {
@@ -61,13 +60,16 @@ export class WorkflowHistoryService {
 			},
 		});
 		if (!hist) {
-			throw new HistoryVersionNotFoundError();
+			throw new WorkflowHistoryVersionNotFoundError('');
 		}
 		return hist;
 	}
 
 	async saveVersion(user: User, workflow: WorkflowEntity, workflowId: string) {
-		if (isWorkflowHistoryEnabled()) {
+		// 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,
diff --git a/packages/cli/src/workflows/workflowHistory/workflowHistoryManager.ee.ts b/packages/cli/src/workflows/workflowHistory/workflowHistoryManager.ee.ts
index a7af16f5bc..dac682c234 100644
--- a/packages/cli/src/workflows/workflowHistory/workflowHistoryManager.ee.ts
+++ b/packages/cli/src/workflows/workflowHistory/workflowHistoryManager.ee.ts
@@ -1,7 +1,6 @@
 import { Service } from 'typedi';
-import { LessThan } from 'typeorm';
 import { DateTime } from 'luxon';
-import { WorkflowHistoryRepository } from '@/databases/repositories';
+import { WorkflowHistoryRepository } from '@db/repositories/workflowHistory.repository';
 import { WORKFLOW_HISTORY_PRUNE_INTERVAL } from './constants';
 import { getWorkflowHistoryPruneTime, isWorkflowHistoryEnabled } from './workflowHistoryHelper.ee';
 
@@ -38,8 +37,6 @@ export class WorkflowHistoryManager {
 		}
 		const pruneDateTime = DateTime.now().minus({ hours: pruneHours }).toJSDate();
 
-		await this.workflowHistoryRepo.delete({
-			createdAt: LessThan(pruneDateTime),
-		});
+		await this.workflowHistoryRepo.deleteEarlierThan(pruneDateTime);
 	}
 }
diff --git a/packages/cli/src/workflows/workflowStaticData.service.ts b/packages/cli/src/workflows/workflowStaticData.service.ts
new file mode 100644
index 0000000000..b569c69a30
--- /dev/null
+++ b/packages/cli/src/workflows/workflowStaticData.service.ts
@@ -0,0 +1,41 @@
+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,
+	) {}
+
+	/** 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 ceedb9aa90..0000000000
--- a/packages/cli/src/workflows/workflows.controller.ee.ts
+++ /dev/null
@@ -1,273 +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 { ListQuery, 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 { CredentialsService } from '../credentials/credentials.service';
-import type { IExecutionPushResponse } from '@/Interfaces';
-import * as GenericHelpers from '@/GenericHelpers';
-import { In } from 'typeorm';
-import { Container } from 'typedi';
-import { InternalHooks } from '@/InternalHooks';
-import { RoleService } from '@/services/role.service';
-import * as utils from '@/utils';
-import { listQueryMiddleware } from '@/middlewares';
-import { TagService } from '@/services/tag.service';
-import { Logger } from '@/Logger';
-import { WorkflowHistoryService } from './workflowHistory/workflowHistory.service.ee';
-
-// 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(\\w+)',
-	(req, res, next) => (req.params.id === 'new' ? next('router') : next()), // skip ee router and use free one for naming
-	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 Container.get(TagService).findMany({
-				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 CredentialsService.getMany(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(RoleService).findWorkflowOwnerRole();
-
-			const newSharedWorkflow = new SharedWorkflow();
-
-			Object.assign(newSharedWorkflow, {
-				role,
-				user: req.user,
-				workflow: savedWorkflow,
-			});
-
-			await transactionManager.save<SharedWorkflow>(newSharedWorkflow);
-		});
-
-		if (!savedWorkflow) {
-			Container.get(Logger).error('Failed to create workflow', { userId: req.user.id });
-			throw new ResponseHelper.InternalServerError(
-				'An error occurred while saving your workflow. Please try again.',
-			);
-		}
-
-		await Container.get(WorkflowHistoryService).saveVersion(
-			req.user,
-			savedWorkflow,
-			savedWorkflow.id,
-		);
-
-		if (tagIds && !config.getEnv('workflowTagsDisabled') && savedWorkflow.tags) {
-			savedWorkflow.tags = Container.get(TagService).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(
-	'/',
-	listQueryMiddleware,
-	async (req: ListQuery.Request, res: express.Response) => {
-		try {
-			const sharedWorkflowIds = await WorkflowHelpers.getSharedWorkflowIds(req.user);
-
-			const { workflows: data, count } = await EEWorkflows.getMany(
-				sharedWorkflowIds,
-				req.listQueryOptions,
-			);
-
-			res.json({ count, data });
-		} catch (maybeError) {
-			const error = utils.toError(maybeError);
-			ResponseHelper.reportError(error);
-			ResponseHelper.sendErrorResponse(res, error);
-		}
-	},
-);
-
-EEWorkflowController.patch(
-	'/:id(\\w+)',
-	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 (req.body.workflowData.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 9537855f80..c38fa32fb6 100644
--- a/packages/cli/src/workflows/workflows.controller.ts
+++ b/packages/cli/src/workflows/workflows.controller.ts
@@ -6,19 +6,17 @@ 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 { SharedWorkflow } from '@db/entities/SharedWorkflow';
 import { WorkflowEntity } from '@db/entities/WorkflowEntity';
 import { validateEntity } from '@/GenericHelpers';
 import { ExternalHooks } from '@/ExternalHooks';
-import type { ListQuery, WorkflowRequest } from '@/requests';
+import { ListQuery } 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 { WorkflowService } from './workflow.service';
+import { isSharingEnabled } from '@/UserManagement/UserManagementHelper';
+import Container, { Service } from 'typedi';
 import { InternalHooks } from '@/InternalHooks';
 import { RoleService } from '@/services/role.service';
 import * as utils from '@/utils';
@@ -26,16 +24,43 @@ import { listQueryMiddleware } from '@/middlewares';
 import { TagService } from '@/services/tag.service';
 import { WorkflowHistoryService } from './workflowHistory/workflowHistory.service.ee';
 import { Logger } from '@/Logger';
+import { SharedWorkflowRepository } from '@db/repositories/sharedWorkflow.repository';
+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 { NamingService } from '@/services/naming.service';
+import { TagRepository } from '@/databases/repositories/tag.repository';
+import { EnterpriseWorkflowService } from './workflow.service.ee';
+import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
+import type { RoleNames } from '@/databases/entities/Role';
+import { UnauthorizedError } from '@/errors/response-errors/unauthorized.error';
+import { CredentialsService } from '../credentials/credentials.service';
+import { UserRepository } from '@/databases/repositories/user.repository';
+import { Authorized, Delete, Get, Patch, Post, Put, RestController } from '@/decorators';
+import { WorkflowRequest } from './workflow.request';
 
-export const workflowsController = express.Router();
-workflowsController.use('/', EEWorkflowController);
+@Service()
+@Authorized()
+@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 roleService: RoleService,
+		private readonly workflowHistoryService: WorkflowHistoryService,
+		private readonly tagService: TagService,
+		private readonly namingService: NamingService,
+		private readonly workflowRepository: WorkflowRepository,
+		private readonly workflowService: WorkflowService,
+		private readonly sharedWorkflowRepository: SharedWorkflowRepository,
+		private readonly userRepository: UserRepository,
+	) {}
 
-/**
- * POST /workflows
- */
-workflowsController.post(
-	'/',
-	ResponseHelper.send(async (req: WorkflowRequest.Create) => {
+	@Post('/')
+	async create(req: WorkflowRequest.Create) {
 		delete req.body.id; // delete if sent
 
 		const newWorkflow = new WorkflowEntity();
@@ -46,29 +71,42 @@ 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 Container.get(TagService).findMany({
-				select: ['id', 'name'],
-				where: {
-					id: In(tagIds),
-				},
-			});
+			newWorkflow.tags = await this.tagRepository.findMany(tagIds);
 		}
 
 		await WorkflowHelpers.replaceInvalidCredentials(newWorkflow);
 
 		WorkflowHelpers.addNodeIds(newWorkflow);
 
+		if (isSharingEnabled()) {
+			// This is a new workflow, so we simply check if the user has access to
+			// all used workflows
+
+			const allCredentials = await 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(RoleService).findWorkflowOwnerRole();
+			const role = await this.roleService.findWorkflowOwnerRole();
 
 			const newSharedWorkflow = new SharedWorkflow();
 
@@ -82,40 +120,31 @@ workflowsController.post(
 		});
 
 		if (!savedWorkflow) {
-			Container.get(Logger).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 Container.get(WorkflowHistoryService).saveVersion(
-			req.user,
-			savedWorkflow,
-			savedWorkflow.id,
-		);
+		await this.workflowHistoryService.saveVersion(req.user, savedWorkflow, savedWorkflow.id);
 
 		if (tagIds && !config.getEnv('workflowTagsDisabled') && savedWorkflow.tags) {
-			savedWorkflow.tags = Container.get(TagService).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(
-	'/',
-	listQueryMiddleware,
-	async (req: ListQuery.Request, res: express.Response) => {
+	@Get('/', { middlewares: listQueryMiddleware })
+	async getAll(req: ListQuery.Request, res: express.Response) {
 		try {
-			const sharedWorkflowIds = await WorkflowHelpers.getSharedWorkflowIds(req.user, ['owner']);
+			const roles: RoleNames[] = isSharingEnabled() ? [] : ['owner'];
+			const sharedWorkflowIds = await WorkflowHelpers.getSharedWorkflowIds(req.user, roles);
 
-			const { workflows: data, count } = await WorkflowsService.getMany(
+			const { workflows: data, count } = await Container.get(WorkflowService).getMany(
 				sharedWorkflowIds,
 				req.listQueryOptions,
 			);
@@ -126,21 +155,13 @@ workflowsController.get(
 			ResponseHelper.reportError(error);
 			ResponseHelper.sendErrorResponse(res, error);
 		}
-	},
-);
+	}
 
-/**
- * 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');
+	@Get('/new')
+	async getNewName(req: WorkflowRequest.NewName) {
+		const requestedName = req.query.name ?? config.getEnv('workflows.defaultName');
 
-		const name = await GenericHelpers.generateUniqueName(requestedName, 'workflow');
+		const name = await this.namingService.getUniqueWorkflowName(requestedName);
 
 		const onboardingFlowEnabled =
 			!config.getEnv('workflows.onboardingFlowDisabled') &&
@@ -148,30 +169,24 @@ workflowsController.get(
 			(await isBelowOnboardingThreshold(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
@@ -182,109 +197,197 @@ workflowsController.get(
 			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(\\w+)',
-	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 (isSharingEnabled()) {
+			const relations = ['shared', 'shared.user', 'shared.role'];
+			if (!config.getEnv('workflowTagsDisabled')) {
+				relations.push('tags');
+			}
 
-		if (config.getEnv('workflowTagsDisabled')) {
-			relations = relations.filter((relation) => relation !== 'workflow.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',
+				);
+			}
+
+			const enterpriseWorkflowService = this.enterpriseWorkflowService;
+
+			enterpriseWorkflowService.addOwnerAndSharings(workflow);
+			await enterpriseWorkflowService.addCredentialsToWorkflow(workflow, req.user);
+			return workflow;
 		}
 
-		const shared = await Db.collections.SharedWorkflow.findOne({
-			relations,
-			where: whereClause({
-				user: req.user,
-				entityType: 'workflow',
-				entityId: workflowId,
-				roles: ['owner'],
-			}),
-		});
+		// sharing disabled
+
+		const extraRelations = config.getEnv('workflowTagsDisabled') ? [] : ['workflow.tags'];
+
+		const shared = await this.sharedWorkflowRepository.findSharing(
+			workflowId,
+			req.user,
+			'workflow:read',
+			{ extraRelations },
+		);
 
 		if (!shared) {
-			Container.get(Logger).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(\\w+)',
-	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(
+		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 : ['owner'],
 		);
 
 		return updatedWorkflow;
-	}),
-);
+	}
 
-// Deletes a specific workflow
-/**
- * DELETE /workflows/:id
- */
-workflowsController.delete(
-	'/:id(\\w+)',
-	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) {
-			Container.get(Logger).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 (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 this.workflowService.runManually(req.body, req.user, GenericHelpers.getSessionId(req));
+	}
+
+	@Put('/:workflowId/share')
+	async share(req: WorkflowRequest.Share) {
+		if (!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', 'shared.role'],
+			)
+		)
+			.filter((e) => e.role.name === '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);
+				const role = await this.roleService.findWorkflowEditorRole();
+
+				await this.sharedWorkflowRepository.share(trx, workflow!, users, role.id);
+			}
+		});
+
+		void this.internalHooks.onWorkflowSharingUpdate(workflowId, req.user.id, shareWithIds);
+	}
+}
diff --git a/packages/cli/src/workflows/workflows.services.ts b/packages/cli/src/workflows/workflows.services.ts
deleted file mode 100644
index 840e718915..0000000000
--- a/packages/cli/src/workflows/workflows.services.ts
+++ /dev/null
@@ -1,535 +0,0 @@
-import { Container } from 'typedi';
-import type { IDataObject, INode, IPinData } from 'n8n-workflow';
-import { NodeApiError, ErrorReporterProxy as ErrorReporter, Workflow } from 'n8n-workflow';
-import type { FindManyOptions, FindOptionsSelect, FindOptionsWhere, UpdateResult } from 'typeorm';
-import { In, Like } 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 { type WorkflowRequest, type ListQuery, hasSharing } from '@/requests';
-import { TagService } from '@/services/tag.service';
-import type { IWorkflowDb, IWorkflowExecutionDataProcess } from '@/Interfaces';
-import { NodeTypes } from '@/NodeTypes';
-import { WorkflowRunner } from '@/WorkflowRunner';
-import * as WorkflowExecuteAdditionalData from '@/WorkflowExecuteAdditionalData';
-import { TestWebhooks } from '@/TestWebhooks';
-import { whereClause } from '@/UserManagement/UserManagementHelper';
-import { InternalHooks } from '@/InternalHooks';
-import { WorkflowRepository } from '@/databases/repositories';
-import { RoleService } from '@/services/role.service';
-import { OwnershipService } from '@/services/ownership.service';
-import { isStringArray, isWorkflowIdValid } from '@/utils';
-import { WorkflowHistoryService } from './workflowHistory/workflowHistory.service.ee';
-import { BinaryDataService } from 'n8n-core';
-import { Logger } from '@/Logger';
-
-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 });
-	}
-
-	static 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, roleId: 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');
-
-		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 Container.get(WorkflowRepository).findAndCount(
-			findManyOptions,
-		)) as [ListQuery.Workflow.Plain[] | ListQuery.Workflow.WithSharing[], number];
-
-		if (!hasSharing(workflows)) return { workflows, count };
-
-		const workflowOwnerRole = await Container.get(RoleService).findWorkflowOwnerRole();
-
-		return {
-			workflows: workflows.map((w) =>
-				Container.get(OwnershipService).addOwnedBy(w, workflowOwnerRole),
-			),
-			count,
-		};
-	}
-
-	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,
-			}),
-		});
-
-		const logger = Container.get(Logger);
-		if (!shared) {
-			logger.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,
-			);
-		}
-
-		let onlyActiveUpdate = false;
-
-		if (
-			(Object.keys(workflow).length === 3 &&
-				workflow.id !== undefined &&
-				workflow.versionId !== undefined &&
-				workflow.active !== undefined) ||
-			(Object.keys(workflow).length === 2 &&
-				workflow.versionId !== undefined &&
-				workflow.active !== undefined)
-		) {
-			// we're just updating the active status of the workflow, don't update the versionId
-			onlyActiveUpdate = true;
-		} else {
-			// Update the workflow's version
-			workflow.versionId = uuid();
-			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 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 })),
-			);
-		}
-
-		if (!onlyActiveUpdate && workflow.versionId !== shared.workflow.versionId) {
-			await Container.get(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 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 = Container.get(TagService).sortByRequestOrder(updatedWorkflow.tags, {
-				requestOrder: tagIds,
-			});
-		}
-
-		await Container.get(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 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);
-		}
-
-		const idsForDeletion = await Db.collections.Execution.find({
-			select: ['id'],
-			where: { workflowId },
-		}).then((rows) => rows.map(({ id: executionId }) => ({ workflowId, executionId })));
-
-		await Db.collections.Workflow.delete(workflowId);
-		await Container.get(BinaryDataService).deleteMany(idsForDeletion);
-
-		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();
-	}
-
-	/**
-	 * Saves the static data if it changed
-	 */
-	static 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 {
-					// eslint-disable-next-line @typescript-eslint/no-use-before-define
-					await WorkflowsService.saveStaticDataById(workflow.id, workflow.staticData);
-					workflow.staticData.__dataChanged = false;
-				} catch (error) {
-					ErrorReporter.error(error);
-					Container.get(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 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
-	 */
-	static async saveStaticDataById(workflowId: string, newStaticData: IDataObject): Promise<void> {
-		await Db.collections.Workflow.update(workflowId, {
-			staticData: newStaticData,
-		});
-	}
-}
diff --git a/packages/cli/templates/form-trigger.handlebars b/packages/cli/templates/form-trigger.handlebars
index 88eaa7f0c1..f89e3c0a7d 100644
--- a/packages/cli/templates/form-trigger.handlebars
+++ b/packages/cli/templates/form-trigger.handlebars
@@ -283,6 +283,20 @@
 									</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>
@@ -371,6 +385,10 @@
 						</svg>
 					</a>
 				</div>
+				{{#if redirectUrl}}
+					<a id='redirectUrl' href='{{redirectUrl}}' style='display: none;'></a>
+				{{/if}}
+				<input id="useResponseData" style="display: none;" value={{useResponseData}} />
 			</section>
 		</div>
 		<script>
@@ -469,19 +487,42 @@
 					document.querySelector('#submit-btn').disabled = true;
 					document.querySelector('#submit-btn').style.cursor = 'not-allowed';
 					document.querySelector('#submit-btn span').style.display = 'inline-block';
-					fetch('#', {
+					fetch('', {
 						method: 'POST',
 						body: formData,
 					})
 						.then(async function (response) {
-							const data = await response.json();
-							data.status = response.status;
-							return data;
-						})
-						.then(function (data) {
-							if (data.status === 200) {
-								form.style.display = 'none';
-								document.querySelector('#submitted-form').style.display = 'block';
+							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';
@@ -489,6 +530,8 @@
 								document.querySelector('#submitted-content').textContent =
 									'An error occurred in the workflow handling this form';
 							}
+
+							return;
 						})
 						.catch(function (error) {
 							console.error('Error:', error);
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/test/integration/ActiveWorkflowRunner.test.ts b/packages/cli/test/integration/ActiveWorkflowRunner.test.ts
new file mode 100644
index 0000000000..d4f2baa5e2
--- /dev/null
+++ b/packages/cli/test/integration/ActiveWorkflowRunner.test.ts
@@ -0,0 +1,379 @@
+import { Container } from 'typedi';
+
+import { NodeApiError, NodeOperationError, Workflow } from 'n8n-workflow';
+import type { IWebhookData, WorkflowActivateMode } from 'n8n-workflow';
+
+import { ActiveExecutions } from '@/ActiveExecutions';
+import { ActiveWorkflowRunner } from '@/ActiveWorkflowRunner';
+import config from '@/config';
+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 { WorkflowRunner } from '@/WorkflowRunner';
+import type { User } from '@db/entities/User';
+import type { WebhookEntity } from '@db/entities/WebhookEntity';
+import { NodeTypes } from '@/NodeTypes';
+import { chooseRandomly } from './shared/random';
+import { MultiMainSetup } from '@/services/orchestration/main/MultiMainSetup.ee';
+import { mockInstance } from '../shared/mocking';
+import { setSchedulerAsLoadedNode } from './shared/utils';
+import * as testDb from './shared/testDb';
+import { createOwner } from './shared/db/users';
+import { createWorkflow } from './shared/db/workflows';
+import { ExecutionsService } from '@/executions/executions.service';
+import { WorkflowService } from '@/workflows/workflow.service';
+import { ActiveWorkflowsService } from '@/services/activeWorkflows.service';
+
+mockInstance(ActiveExecutions);
+mockInstance(Push);
+mockInstance(SecretsHelper);
+mockInstance(ExecutionsService);
+mockInstance(WorkflowService);
+
+const webhookService = mockInstance(WebhookService);
+const multiMainSetup = mockInstance(MultiMainSetup, {
+	isEnabled: false,
+	isLeader: false,
+	isFollower: false,
+});
+
+setSchedulerAsLoadedNode();
+
+const externalHooks = mockInstance(ExternalHooks);
+
+let activeWorkflowsService: ActiveWorkflowsService;
+let activeWorkflowRunner: ActiveWorkflowRunner;
+let owner: User;
+
+const NON_LEADERSHIP_CHANGE_MODES: WorkflowActivateMode[] = [
+	'init',
+	'create',
+	'update',
+	'activate',
+	'manual',
+];
+
+beforeAll(async () => {
+	await testDb.init();
+
+	activeWorkflowsService = Container.get(ActiveWorkflowsService);
+	activeWorkflowRunner = Container.get(ActiveWorkflowRunner);
+	owner = await createOwner();
+});
+
+afterEach(async () => {
+	await activeWorkflowRunner.removeAll();
+	activeWorkflowRunner.removeAllQueuedWorkflowActivations();
+	await testDb.truncate(['Workflow']);
+	config.load(config.default);
+	jest.restoreAllMocks();
+});
+
+afterAll(async () => {
+	await testDb.terminate();
+});
+
+describe('init()', () => {
+	test('should call `ExternalHooks.run()`', async () => {
+		const runSpy = jest.spyOn(externalHooks, 'run');
+
+		await activeWorkflowRunner.init();
+
+		expect(runSpy).toHaveBeenCalledTimes(1);
+		const [hook, arg] = runSpy.mock.calls[0];
+		expect(hook).toBe('activeWorkflows.initialized');
+		expect(arg).toBeEmptyArray();
+	});
+
+	test('should start with no active workflows', async () => {
+		await activeWorkflowRunner.init();
+
+		const inStorage = await activeWorkflowsService.getAllActiveIdsInStorage();
+		expect(inStorage).toHaveLength(0);
+
+		const inMemory = activeWorkflowRunner.allActiveInMemory();
+		expect(inMemory).toHaveLength(0);
+	});
+
+	test('should start with one active workflow', async () => {
+		await createWorkflow({ active: true }, owner);
+
+		await activeWorkflowRunner.init();
+
+		const inStorage = await activeWorkflowsService.getAllActiveIdsInStorage();
+		expect(inStorage).toHaveLength(1);
+
+		const inMemory = activeWorkflowRunner.allActiveInMemory();
+		expect(inMemory).toHaveLength(1);
+	});
+
+	test('should start with multiple active workflows', async () => {
+		await createWorkflow({ active: true }, owner);
+		await createWorkflow({ active: true }, owner);
+
+		await activeWorkflowRunner.init();
+
+		const inStorage = await activeWorkflowsService.getAllActiveIdsInStorage();
+		expect(inStorage).toHaveLength(2);
+
+		const inMemory = activeWorkflowRunner.allActiveInMemory();
+		expect(inMemory).toHaveLength(2);
+	});
+
+	test('should pre-check that every workflow can be activated', async () => {
+		await createWorkflow({ active: true }, owner);
+		await createWorkflow({ active: true }, owner);
+
+		const precheckSpy = jest
+			.spyOn(Workflow.prototype, 'checkIfWorkflowCanBeActivated')
+			.mockReturnValue(true);
+
+		await activeWorkflowRunner.init();
+
+		expect(precheckSpy).toHaveBeenCalledTimes(2);
+	});
+});
+
+describe('removeAll()', () => {
+	test('should remove all active workflows from memory', async () => {
+		await createWorkflow({ active: true }, owner);
+		await createWorkflow({ active: true }, owner);
+
+		await activeWorkflowRunner.init();
+		await activeWorkflowRunner.removeAll();
+
+		const inMemory = activeWorkflowRunner.allActiveInMemory();
+		expect(inMemory).toHaveLength(0);
+	});
+});
+
+describe('remove()', () => {
+	test('should call `ActiveWorkflowRunner.clearWebhooks()`', async () => {
+		const workflow = await createWorkflow({ active: true }, owner);
+		const clearWebhooksSpy = jest.spyOn(activeWorkflowRunner, 'clearWebhooks');
+
+		await activeWorkflowRunner.init();
+		await activeWorkflowRunner.remove(workflow.id);
+
+		expect(clearWebhooksSpy).toHaveBeenCalledTimes(1);
+	});
+});
+
+describe('isActive()', () => {
+	test('should return `true` for active workflow in storage', async () => {
+		const workflow = await createWorkflow({ active: true }, owner);
+
+		await activeWorkflowRunner.init();
+
+		const isActiveInStorage = activeWorkflowRunner.isActive(workflow.id);
+		await expect(isActiveInStorage).resolves.toBe(true);
+	});
+
+	test('should return `false` for inactive workflow in storage', async () => {
+		const workflow = await createWorkflow({ active: false }, owner);
+
+		await activeWorkflowRunner.init();
+
+		const isActiveInStorage = activeWorkflowRunner.isActive(workflow.id);
+		await expect(isActiveInStorage).resolves.toBe(false);
+	});
+});
+
+describe('runWorkflow()', () => {
+	test('should call `WorkflowRunner.run()`', async () => {
+		const workflow = await createWorkflow({ active: true }, owner);
+
+		await activeWorkflowRunner.init();
+
+		const additionalData = await AdditionalData.getBase('fake-user-id');
+
+		const runSpy = jest
+			.spyOn(WorkflowRunner.prototype, 'run')
+			.mockResolvedValue('fake-execution-id');
+
+		const [node] = workflow.nodes;
+
+		await activeWorkflowRunner.runWorkflow(workflow, node, [[]], additionalData, 'trigger');
+
+		expect(runSpy).toHaveBeenCalledTimes(1);
+	});
+});
+
+describe('executeErrorWorkflow()', () => {
+	test('should call `WorkflowExecuteAdditionalData.executeErrorWorkflow()`', async () => {
+		const workflow = await createWorkflow({ active: true }, owner);
+		const [node] = workflow.nodes;
+		const error = new NodeOperationError(node, 'Fake error message');
+		const executeSpy = jest.spyOn(AdditionalData, 'executeErrorWorkflow');
+
+		await activeWorkflowRunner.init();
+		activeWorkflowRunner.executeErrorWorkflow(error, workflow, 'trigger');
+
+		expect(executeSpy).toHaveBeenCalledTimes(1);
+	});
+
+	test('should be called on failure to activate due to 401', async () => {
+		const storedWorkflow = await createWorkflow({ active: true }, owner);
+		const [node] = storedWorkflow.nodes;
+		const executeSpy = jest.spyOn(activeWorkflowRunner, 'executeErrorWorkflow');
+
+		jest.spyOn(activeWorkflowRunner, 'add').mockImplementation(() => {
+			throw new NodeApiError(node, {
+				httpCode: '401',
+				message: 'Authorization failed - please check your credentials',
+			});
+		});
+
+		await activeWorkflowRunner.init();
+
+		expect(executeSpy).toHaveBeenCalledTimes(1);
+		const [error, workflow] = executeSpy.mock.calls[0];
+		expect(error.message).toContain('Authorization');
+		expect(workflow.id).toBe(storedWorkflow.id);
+	});
+});
+
+describe('add()', () => {
+	describe('in single-main scenario', () => {
+		test('should add webhooks, triggers and pollers', async () => {
+			const mode = chooseRandomly(NON_LEADERSHIP_CHANGE_MODES);
+
+			const workflow = await createWorkflow({ active: true }, owner);
+
+			const addWebhooksSpy = jest.spyOn(activeWorkflowRunner, 'addWebhooks');
+			const addTriggersAndPollersSpy = jest.spyOn(activeWorkflowRunner, 'addTriggersAndPollers');
+
+			await activeWorkflowRunner.init();
+
+			addWebhooksSpy.mockReset();
+			addTriggersAndPollersSpy.mockReset();
+
+			await activeWorkflowRunner.add(workflow.id, mode);
+
+			expect(addWebhooksSpy).toHaveBeenCalledTimes(1);
+			expect(addTriggersAndPollersSpy).toHaveBeenCalledTimes(1);
+		});
+	});
+
+	describe('in multi-main scenario', () => {
+		describe('leader', () => {
+			describe('on non-leadership-change activation mode', () => {
+				test('should add webhooks only', async () => {
+					const mode = chooseRandomly(NON_LEADERSHIP_CHANGE_MODES);
+
+					const workflow = await createWorkflow({ active: true }, owner);
+
+					jest.replaceProperty(multiMainSetup, 'isEnabled', true);
+					jest.replaceProperty(multiMainSetup, 'isLeader', true);
+
+					const addWebhooksSpy = jest.spyOn(activeWorkflowRunner, 'addWebhooks');
+					const addTriggersAndPollersSpy = jest.spyOn(
+						activeWorkflowRunner,
+						'addTriggersAndPollers',
+					);
+
+					await activeWorkflowRunner.init();
+					addWebhooksSpy.mockReset();
+					addTriggersAndPollersSpy.mockReset();
+
+					await activeWorkflowRunner.add(workflow.id, mode);
+
+					expect(addWebhooksSpy).toHaveBeenCalledTimes(1);
+					expect(addTriggersAndPollersSpy).toHaveBeenCalledTimes(1);
+				});
+			});
+
+			describe('on leadership change activation mode', () => {
+				test('should add triggers and pollers only', async () => {
+					const mode = 'leadershipChange';
+
+					jest.replaceProperty(multiMainSetup, 'isEnabled', true);
+					jest.replaceProperty(multiMainSetup, 'isLeader', true);
+
+					const workflow = await createWorkflow({ active: true }, owner);
+
+					const addWebhooksSpy = jest.spyOn(activeWorkflowRunner, 'addWebhooks');
+					const addTriggersAndPollersSpy = jest.spyOn(
+						activeWorkflowRunner,
+						'addTriggersAndPollers',
+					);
+
+					await activeWorkflowRunner.init();
+					addWebhooksSpy.mockReset();
+					addTriggersAndPollersSpy.mockReset();
+
+					await activeWorkflowRunner.add(workflow.id, mode);
+
+					expect(addWebhooksSpy).not.toHaveBeenCalled();
+					expect(addTriggersAndPollersSpy).toHaveBeenCalledTimes(1);
+				});
+			});
+		});
+
+		describe('follower', () => {
+			describe('on any activation mode', () => {
+				test('should not add webhooks, triggers or pollers', async () => {
+					const mode = chooseRandomly(NON_LEADERSHIP_CHANGE_MODES);
+
+					jest.replaceProperty(multiMainSetup, 'isEnabled', true);
+					jest.replaceProperty(multiMainSetup, 'isLeader', false);
+
+					const workflow = await createWorkflow({ active: true }, owner);
+
+					const addWebhooksSpy = jest.spyOn(activeWorkflowRunner, 'addWebhooks');
+					const addTriggersAndPollersSpy = jest.spyOn(
+						activeWorkflowRunner,
+						'addTriggersAndPollers',
+					);
+
+					await activeWorkflowRunner.init();
+					addWebhooksSpy.mockReset();
+					addTriggersAndPollersSpy.mockReset();
+
+					await activeWorkflowRunner.add(workflow.id, mode);
+
+					expect(addWebhooksSpy).not.toHaveBeenCalled();
+					expect(addTriggersAndPollersSpy).not.toHaveBeenCalled();
+				});
+			});
+		});
+	});
+});
+
+describe('addWebhooks()', () => {
+	test('should call `WebhookService.storeWebhook()`', async () => {
+		const mockWebhook = { path: 'fake-path' } as unknown as IWebhookData;
+		const mockWebhookEntity = { webhookPath: 'fake-path' } as unknown as WebhookEntity;
+
+		jest.spyOn(WebhookHelpers, 'getWorkflowWebhooks').mockReturnValue([mockWebhook]);
+		webhookService.createWebhook.mockReturnValue(mockWebhookEntity);
+
+		const additionalData = await AdditionalData.getBase('fake-user-id');
+
+		const dbWorkflow = await createWorkflow({ active: true }, owner);
+
+		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 activeWorkflowRunner.addWebhooks(workflow, additionalData, 'trigger', 'init');
+
+		expect(webhookService.storeWebhook).toHaveBeenCalledTimes(1);
+	});
+});
diff --git a/packages/cli/test/integration/ExternalSecrets/externalSecrets.api.test.ts b/packages/cli/test/integration/ExternalSecrets/externalSecrets.api.test.ts
index ba2b46ba7f..6eeb7e5b3d 100644
--- a/packages/cli/test/integration/ExternalSecrets/externalSecrets.api.test.ts
+++ b/packages/cli/test/integration/ExternalSecrets/externalSecrets.api.test.ts
@@ -1,36 +1,36 @@
 import type { SuperAgentTest } from 'supertest';
 import { License } from '@/License';
-import * as testDb from '../shared/testDb';
-import * as utils from '../shared/utils/';
 import type { ExternalSecretsSettings, SecretsProviderState } from '@/Interfaces';
 import { Cipher } from 'n8n-core';
-import { SettingsRepository } from '@/databases/repositories/settings.repository';
+import { SettingsRepository } from '@db/repositories/settings.repository';
 import { Container } from 'typedi';
 import { ExternalSecretsProviders } from '@/ExternalSecrets/ExternalSecretsProviders.ee';
-import {
-	DummyProvider,
-	FailedProvider,
-	MockProviders,
-	TestFailProvider,
-} from '../../shared/ExternalSecrets/utils';
 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 licenseLike = utils.mockInstance(License, {
-	isExternalSecretsEnabled: jest.fn().mockReturnValue(true),
-	isWithinUsersLimit: jest.fn().mockReturnValue(true),
-});
-
 const mockProvidersInstance = new MockProviders();
-utils.mockInstance(ExternalSecretsProviders, mockProvidersInstance);
+mockInstance(ExternalSecretsProviders, mockProvidersInstance);
 
-const testServer = utils.setupTestServer({ endpointGroups: ['externalSecrets'] });
+const testServer = setupTestServer({
+	endpointGroups: ['externalSecrets'],
+	enabledFeatures: ['feat:externalSecrets'],
+});
 
 const connectedDate = '2023-08-01T12:32:29.000Z';
 
@@ -55,7 +55,7 @@ const resetManager = async () => {
 		new ExternalSecretsManager(
 			mock(),
 			Container.get(SettingsRepository),
-			licenseLike,
+			Container.get(License),
 			mockProvidersInstance,
 			Container.get(Cipher),
 		),
@@ -97,16 +97,14 @@ const getDummyProviderData = ({
 };
 
 beforeAll(async () => {
-	const owner = await testDb.createOwner();
+	const owner = await createOwner();
 	authOwnerAgent = testServer.authAgentFor(owner);
-	const member = await testDb.createUser();
+	const member = await createUser();
 	authMemberAgent = testServer.authAgentFor(member);
 	config.set('userManagement.isInstanceOwnerSetUp', true);
 });
 
 beforeEach(async () => {
-	licenseLike.isExternalSecretsEnabled.mockReturnValue(true);
-
 	mockProvidersInstance.setProviders({
 		dummy: DummyProvider,
 	});
@@ -337,7 +335,7 @@ describe('POST /external-secrets/providers/:provider/update', () => {
 			'update',
 		);
 
-		licenseLike.isExternalSecretsEnabled.mockReturnValue(false);
+		testServer.license.disable('feat:externalSecrets');
 
 		const resp = await authOwnerAgent.post('/external-secrets/providers/dummy/update');
 		expect(resp.status).toBe(400);
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 0000000000..7635660db3
--- /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/auth.api.test.ts b/packages/cli/test/integration/auth.api.test.ts
index 99944887b9..ab3f3a8dd3 100644
--- a/packages/cli/test/integration/auth.api.test.ts
+++ b/packages/cli/test/integration/auth.api.test.ts
@@ -1,9 +1,7 @@
 import type { SuperAgentTest } from 'supertest';
 import { Container } from 'typedi';
-import { License } from '@/License';
 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';
@@ -11,6 +9,10 @@ import { LOGGED_OUT_RESPONSE_BODY } from './shared/constants';
 import { randomValidPassword } from './shared/random';
 import * as testDb from './shared/testDb';
 import * as utils from './shared/utils/';
+import { getGlobalMemberRole, getGlobalOwnerRole } from './shared/db/roles';
+import { createUser, createUserShell } from './shared/db/users';
+import { UserRepository } from '@db/repositories/user.repository';
+import { MfaService } from '@/Mfa/mfa.service';
 
 let globalOwnerRole: Role;
 let globalMemberRole: Role;
@@ -19,10 +21,14 @@ let authOwnerAgent: SuperAgentTest;
 const ownerPassword = randomValidPassword();
 
 const testServer = utils.setupTestServer({ endpointGroups: ['auth'] });
+const license = testServer.license;
+
+let mfaService: MfaService;
 
 beforeAll(async () => {
-	globalOwnerRole = await testDb.getGlobalOwnerRole();
-	globalMemberRole = await testDb.getGlobalMemberRole();
+	globalOwnerRole = await getGlobalOwnerRole();
+	globalMemberRole = await getGlobalMemberRole();
+	mfaService = Container.get(MfaService);
 });
 
 beforeEach(async () => {
@@ -33,7 +39,7 @@ beforeEach(async () => {
 
 describe('POST /login', () => {
 	beforeEach(async () => {
-		owner = await testDb.createUser({
+		owner = await createUser({
 			password: ownerPassword,
 			globalRole: globalOwnerRole,
 		});
@@ -47,8 +53,19 @@ describe('POST /login', () => {
 
 		expect(response.statusCode).toBe(200);
 
-		const { id, email, firstName, lastName, password, personalizationAnswers, globalRole, apiKey } =
-			response.body.data;
+		const {
+			id,
+			email,
+			firstName,
+			lastName,
+			password,
+			personalizationAnswers,
+			globalRole,
+			apiKey,
+			globalScopes,
+			mfaSecret,
+			mfaRecoveryCodes,
+		} = response.body.data;
 
 		expect(validator.isUUID(id)).toBe(true);
 		expect(email).toBe(owner.email);
@@ -61,15 +78,63 @@ describe('POST /login', () => {
 		expect(globalRole.name).toBe('owner');
 		expect(globalRole.scope).toBe('global');
 		expect(apiKey).toBeUndefined();
+		expect(globalScopes).toBeDefined();
+		expect(mfaRecoveryCodes).toBeUndefined();
+		expect(mfaSecret).toBeUndefined();
+
+		const authToken = utils.getAuthToken(response);
+		expect(authToken).toBeDefined();
+	});
+
+	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);
+
+		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,
+			globalRole,
+			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(globalRole).toBeDefined();
+		expect(globalRole.name).toBe('owner');
+		expect(globalRole.scope).toBe('global');
+		expect(apiKey).toBeUndefined();
+		expect(mfaRecoveryCodes).toBeUndefined();
+		expect(mfaSecret).toBeUndefined();
 
 		const authToken = utils.getAuthToken(response);
 		expect(authToken).toBeDefined();
 	});
 
 	test('should throw AuthError for non-owner if not within users limit quota', async () => {
-		jest.spyOn(Container.get(License), 'isWithinUsersLimit').mockReturnValueOnce(false);
+		license.setQuota('quota:users', 0);
 		const password = 'testpassword';
-		const member = await testDb.createUser({
+		const member = await createUser({
 			password,
 		});
 
@@ -81,11 +146,10 @@ describe('POST /login', () => {
 	});
 
 	test('should not throw AuthError for owner if not within users limit quota', async () => {
-		jest.spyOn(Container.get(License), 'isWithinUsersLimit').mockReturnValueOnce(false);
-		const ownerUser = await testDb.createUser({
+		license.setQuota('quota:users', 0);
+		const ownerUser = await createUser({
 			password: randomValidPassword(),
 			globalRole: globalOwnerRole,
-			isOwner: true,
 		});
 
 		const response = await testServer.authAgentFor(ownerUser).get('/login');
@@ -104,7 +168,7 @@ describe('GET /login', () => {
 	});
 
 	test('should return cookie if UM is disabled and no cookie is already set', async () => {
-		await testDb.createUserShell(globalOwnerRole);
+		await createUserShell(globalOwnerRole);
 		await utils.setInstanceOwnerSetUp(false);
 
 		const response = await testServer.authlessAgent.get('/login');
@@ -127,14 +191,23 @@ describe('GET /login', () => {
 	});
 
 	test('should return logged-in owner shell', async () => {
-		const ownerShell = await testDb.createUserShell(globalOwnerRole);
+		const ownerShell = await createUserShell(globalOwnerRole);
 
 		const response = await testServer.authAgentFor(ownerShell).get('/login');
 
 		expect(response.statusCode).toBe(200);
 
-		const { id, email, firstName, lastName, password, personalizationAnswers, globalRole, apiKey } =
-			response.body.data;
+		const {
+			id,
+			email,
+			firstName,
+			lastName,
+			password,
+			personalizationAnswers,
+			globalRole,
+			apiKey,
+			globalScopes,
+		} = response.body.data;
 
 		expect(validator.isUUID(id)).toBe(true);
 		expect(email).toBeDefined();
@@ -147,20 +220,31 @@ describe('GET /login', () => {
 		expect(globalRole.name).toBe('owner');
 		expect(globalRole.scope).toBe('global');
 		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(globalMemberRole);
 
 		const response = await testServer.authAgentFor(memberShell).get('/login');
 
 		expect(response.statusCode).toBe(200);
 
-		const { id, email, firstName, lastName, password, personalizationAnswers, globalRole, apiKey } =
-			response.body.data;
+		const {
+			id,
+			email,
+			firstName,
+			lastName,
+			password,
+			personalizationAnswers,
+			globalRole,
+			apiKey,
+			globalScopes,
+		} = response.body.data;
 
 		expect(validator.isUUID(id)).toBe(true);
 		expect(email).toBeDefined();
@@ -173,20 +257,31 @@ describe('GET /login', () => {
 		expect(globalRole.name).toBe('member');
 		expect(globalRole.scope).toBe('global');
 		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({ globalRole: globalOwnerRole });
 
 		const response = await testServer.authAgentFor(owner).get('/login');
 
 		expect(response.statusCode).toBe(200);
 
-		const { id, email, firstName, lastName, password, personalizationAnswers, globalRole, apiKey } =
-			response.body.data;
+		const {
+			id,
+			email,
+			firstName,
+			lastName,
+			password,
+			personalizationAnswers,
+			globalRole,
+			apiKey,
+			globalScopes,
+		} = response.body.data;
 
 		expect(validator.isUUID(id)).toBe(true);
 		expect(email).toBe(owner.email);
@@ -199,20 +294,31 @@ describe('GET /login', () => {
 		expect(globalRole.name).toBe('owner');
 		expect(globalRole.scope).toBe('global');
 		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({ globalRole: globalMemberRole });
 
 		const response = await testServer.authAgentFor(member).get('/login');
 
 		expect(response.statusCode).toBe(200);
 
-		const { id, email, firstName, lastName, password, personalizationAnswers, globalRole, apiKey } =
-			response.body.data;
+		const {
+			id,
+			email,
+			firstName,
+			lastName,
+			password,
+			personalizationAnswers,
+			globalRole,
+			apiKey,
+			globalScopes,
+		} = response.body.data;
 
 		expect(validator.isUUID(id)).toBe(true);
 		expect(email).toBe(member.email);
@@ -225,6 +331,8 @@ describe('GET /login', () => {
 		expect(globalRole.name).toBe('member');
 		expect(globalRole.scope).toBe('global');
 		expect(apiKey).toBeUndefined();
+		expect(globalScopes).toBeDefined();
+		expect(globalScopes).not.toContain('workflow:read');
 
 		const authToken = utils.getAuthToken(response);
 		expect(authToken).toBeUndefined();
@@ -233,7 +341,7 @@ describe('GET /login', () => {
 
 describe('GET /resolve-signup-token', () => {
 	beforeEach(async () => {
-		owner = await testDb.createUser({
+		owner = await createUser({
 			password: ownerPassword,
 			globalRole: globalOwnerRole,
 		});
@@ -241,7 +349,7 @@ describe('GET /resolve-signup-token', () => {
 	});
 
 	test('should validate invite token', async () => {
-		const memberShell = await testDb.createUserShell(globalMemberRole);
+		const memberShell = await createUserShell(globalMemberRole);
 
 		const response = await authOwnerAgent
 			.get('/resolve-signup-token')
@@ -260,8 +368,8 @@ describe('GET /resolve-signup-token', () => {
 	});
 
 	test('should return 403 if user quota reached', async () => {
-		jest.spyOn(Container.get(License), 'isWithinUsersLimit').mockReturnValueOnce(false);
-		const memberShell = await testDb.createUserShell(globalMemberRole);
+		license.setQuota('quota:users', 0);
+		const memberShell = await createUserShell(globalMemberRole);
 
 		const response = await authOwnerAgent
 			.get('/resolve-signup-token')
@@ -272,7 +380,7 @@ describe('GET /resolve-signup-token', () => {
 	});
 
 	test('should fail with invalid inputs', async () => {
-		const { id: inviteeId } = await testDb.createUser({ globalRole: globalMemberRole });
+		const { id: inviteeId } = await createUser({ globalRole: globalMemberRole });
 
 		const first = await authOwnerAgent.get('/resolve-signup-token').query({ inviterId: owner.id });
 
@@ -290,7 +398,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 })
@@ -304,7 +412,7 @@ 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({ globalRole: globalOwnerRole });
 
 		const response = await testServer.authAgentFor(owner).post('/logout');
 
diff --git a/packages/cli/test/integration/auth.mw.test.ts b/packages/cli/test/integration/auth.mw.test.ts
index c3db14926a..f958a630d8 100644
--- a/packages/cli/test/integration/auth.mw.test.ts
+++ b/packages/cli/test/integration/auth.mw.test.ts
@@ -1,9 +1,16 @@
 import type { SuperAgentTest } from 'supertest';
-import * as testDb from './shared/testDb';
 import * as utils from './shared/utils/';
+import { getGlobalMemberRole } from './shared/db/roles';
+import { createUser } from './shared/db/users';
+import { ActiveWorkflowRunner } from '@/ActiveWorkflowRunner';
+import { mockInstance } from '../shared/mocking';
 
 describe('Auth Middleware', () => {
-	const testServer = utils.setupTestServer({ endpointGroups: ['me', 'auth', 'owner', 'users'] });
+	mockInstance(ActiveWorkflowRunner);
+
+	const testServer = utils.setupTestServer({
+		endpointGroups: ['me', 'auth', 'owner', 'users', 'invitations'],
+	});
 
 	/** Routes requiring a valid `n8n-auth` cookie for a user, either owner or member. */
 	const ROUTES_REQUIRING_AUTHENTICATION: Readonly<Array<[string, string]>> = [
@@ -16,9 +23,8 @@ describe('Auth Middleware', () => {
 
 	/** Routes requiring a valid `n8n-auth` cookie for an owner. */
 	const ROUTES_REQUIRING_AUTHORIZATION: Readonly<Array<[string, string]>> = [
-		['POST', '/users'],
+		['POST', '/invitations'],
 		['DELETE', '/users/123'],
-		['POST', '/users/123/reinvite'],
 		['POST', '/owner/setup'],
 	];
 
@@ -36,8 +42,8 @@ describe('Auth Middleware', () => {
 	describe('Routes requiring Authorization', () => {
 		let authMemberAgent: SuperAgentTest;
 		beforeAll(async () => {
-			const globalMemberRole = await testDb.getGlobalMemberRole();
-			const member = await testDb.createUser({ globalRole: globalMemberRole });
+			const globalMemberRole = await getGlobalMemberRole();
+			const member = await createUser({ globalRole: globalMemberRole });
 			authMemberAgent = testServer.authAgentFor(member);
 		});
 
diff --git a/packages/cli/test/integration/binaryData.api.test.ts b/packages/cli/test/integration/binaryData.api.test.ts
index fbb47f2f12..6a3a314c73 100644
--- a/packages/cli/test/integration/binaryData.api.test.ts
+++ b/packages/cli/test/integration/binaryData.api.test.ts
@@ -1,10 +1,12 @@
 import fsp from 'node:fs/promises';
 import { Readable } from 'node:stream';
 import { BinaryDataService, FileNotFoundError } from 'n8n-core';
-import * as testDb from './shared/testDb';
-import { mockInstance, setupTestServer } from './shared/utils';
 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 = () => {
@@ -16,7 +18,7 @@ let testServer = setupTestServer({ endpointGroups: ['binaryData'] });
 let authOwnerAgent: SuperAgentTest;
 
 beforeAll(async () => {
-	const owner = await testDb.createOwner();
+	const owner = await createOwner();
 	authOwnerAgent = testServer.authAgentFor(owner);
 });
 
@@ -85,6 +87,26 @@ describe('GET /binary-data', () => {
 		});
 	});
 
+	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);
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 0000000000..1104e3c6b9
--- /dev/null
+++ b/packages/cli/test/integration/commands/credentials.cmd.test.ts
@@ -0,0 +1,49 @@
+import * as Config from '@oclif/config';
+
+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 } from '../shared/db/credentials';
+
+beforeAll(async () => {
+	mockInstance(InternalHooks);
+	mockInstance(LoadNodesAndCredentials);
+	await testDb.init();
+});
+
+beforeEach(async () => {
+	await testDb.truncate(['Credentials']);
+});
+
+afterAll(async () => {
+	await testDb.terminate();
+});
+
+test('import:credentials should import a credential', async () => {
+	const config: Config.IConfig = new Config.Config({ root: __dirname });
+	const before = await getAllCredentials();
+	expect(before.length).toBe(0);
+	const importer = new ImportCredentialsCommand(
+		['--input=./test/integration/commands/importCredentials/credentials.json'],
+		config,
+	);
+	const mockExit = jest.spyOn(process, 'exit').mockImplementation(() => {
+		throw new Error('process.exit');
+	});
+
+	await importer.init();
+	try {
+		await importer.run();
+	} catch (error) {
+		expect(error.message).toBe('process.exit');
+	}
+	const after = await getAllCredentials();
+	expect(after.length).toBe(1);
+	expect(after[0].name).toBe('cred-aws-test');
+	expect(after[0].id).toBe('123');
+	expect(after[0].nodesAccess).toStrictEqual([]);
+	mockExit.mockRestore();
+});
diff --git a/packages/cli/test/integration/commands/import.cmd.test.ts b/packages/cli/test/integration/commands/import.cmd.test.ts
index b8ad46a65f..44e92261f6 100644
--- a/packages/cli/test/integration/commands/import.cmd.test.ts
+++ b/packages/cli/test/integration/commands/import.cmd.test.ts
@@ -3,8 +3,10 @@ import * as Config from '@oclif/config';
 import { InternalHooks } from '@/InternalHooks';
 import { ImportWorkflowsCommand } from '@/commands/import/workflow';
 import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
+
+import { mockInstance } from '../../shared/mocking';
 import * as testDb from '../shared/testDb';
-import { mockInstance } from '../shared/utils/';
+import { getAllWorkflows } from '../shared/db/workflows';
 
 beforeAll(async () => {
 	mockInstance(InternalHooks);
@@ -22,7 +24,7 @@ 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();
+	const before = await getAllWorkflows();
 	expect(before.length).toBe(0);
 	const importer = new ImportWorkflowsCommand(
 		['--separate', '--input=./test/integration/commands/importWorkflows/separate'],
@@ -38,7 +40,7 @@ test('import:workflow should import active workflow and deactivate it', async ()
 	} catch (error) {
 		expect(error.message).toBe('process.exit');
 	}
-	const after = await testDb.getAllWorkflows();
+	const after = await getAllWorkflows();
 	expect(after.length).toBe(2);
 	expect(after[0].name).toBe('active-workflow');
 	expect(after[0].active).toBe(false);
@@ -49,7 +51,7 @@ test('import:workflow should import active workflow and deactivate it', async ()
 
 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();
+	const before = await getAllWorkflows();
 	expect(before.length).toBe(0);
 	const importer = new ImportWorkflowsCommand(
 		['--input=./test/integration/commands/importWorkflows/combined/combined.json'],
@@ -65,7 +67,7 @@ test('import:workflow should import active workflow from combined file and deact
 	} catch (error) {
 		expect(error.message).toBe('process.exit');
 	}
-	const after = await testDb.getAllWorkflows();
+	const after = await getAllWorkflows();
 	expect(after.length).toBe(2);
 	expect(after[0].name).toBe('active-workflow');
 	expect(after[0].active).toBe(false);
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 0000000000..136a2205b6
--- /dev/null
+++ b/packages/cli/test/integration/commands/importCredentials/credentials.json
@@ -0,0 +1,15 @@
+[
+	{
+		"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",
+		"nodesAccess": ""
+	}
+]
diff --git a/packages/cli/test/integration/commands/reset.cmd.test.ts b/packages/cli/test/integration/commands/reset.cmd.test.ts
index ee41c1f45c..6ffc229bb7 100644
--- a/packages/cli/test/integration/commands/reset.cmd.test.ts
+++ b/packages/cli/test/integration/commands/reset.cmd.test.ts
@@ -1,11 +1,15 @@
-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';
+
+import { mockInstance } from '../../shared/mocking';
+import * as testDb from '../shared/testDb';
+import { getGlobalOwnerRole } from '../shared/db/roles';
+import { createUser } from '../shared/db/users';
 
 let globalOwnerRole: Role;
 
@@ -15,7 +19,7 @@ beforeAll(async () => {
 	mockInstance(NodeTypes);
 	await testDb.init();
 
-	globalOwnerRole = await testDb.getGlobalOwnerRole();
+	globalOwnerRole = await getGlobalOwnerRole();
 });
 
 beforeEach(async () => {
@@ -28,11 +32,11 @@ afterAll(async () => {
 
 // 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({ globalRole: globalOwnerRole });
 
 	await Reset.run();
 
-	const user = await Db.collections.User.findOneBy({ globalRoleId: globalOwnerRole.id });
+	const user = await Container.get(UserRepository).findOneBy({ globalRoleId: globalOwnerRole.id });
 
 	if (!user) {
 		fail('No owner found after DB reset to default user state');
diff --git a/packages/cli/test/integration/commands/worker.cmd.test.ts b/packages/cli/test/integration/commands/worker.cmd.test.ts
index 939fd6db0e..a7d5c97a71 100644
--- a/packages/cli/test/integration/commands/worker.cmd.test.ts
+++ b/packages/cli/test/integration/commands/worker.cmd.test.ts
@@ -1,11 +1,10 @@
-import { mockInstance } from '../shared/utils/';
 import { Worker } from '@/commands/worker';
 import * as Config from '@oclif/config';
 import config from '@/config';
 import { Telemetry } from '@/telemetry';
 import { ExternalSecretsManager } from '@/ExternalSecrets/ExternalSecretsManager.ee';
 import { BinaryDataService } from 'n8n-core';
-import { CacheService } from '@/services/cache.service';
+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';
@@ -17,6 +16,9 @@ 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 { MultiMainSetup } from '@/services/orchestration/main/MultiMainSetup.ee';
+
+import { mockInstance } from '../../shared/mocking';
 
 const oclifConfig: Config.IConfig = new Config.Config({ root: __dirname });
 
@@ -36,6 +38,7 @@ beforeAll(async () => {
 	mockInstance(RedisService);
 	mockInstance(RedisServicePubSubPublisher);
 	mockInstance(RedisServicePubSubSubscriber);
+	mockInstance(MultiMainSetup);
 });
 
 test('worker initializes all its components', async () => {
@@ -62,15 +65,15 @@ test('worker initializes all its components', async () => {
 	expect(worker.queueModeId).toBeDefined();
 	expect(worker.queueModeId).toContain('worker');
 	expect(worker.queueModeId.length).toBeGreaterThan(15);
-	expect(worker.initLicense).toHaveBeenCalled();
-	expect(worker.initBinaryDataService).toHaveBeenCalled();
-	expect(worker.initExternalHooks).toHaveBeenCalled();
-	expect(worker.initExternalSecrets).toHaveBeenCalled();
-	expect(worker.initEventBus).toHaveBeenCalled();
-	expect(worker.initOrchestration).toHaveBeenCalled();
-	expect(OrchestrationHandlerWorkerService.prototype.initSubscriber).toHaveBeenCalled();
-	expect(OrchestrationWorkerService.prototype.publishToEventLog).toHaveBeenCalled();
-	expect(worker.initQueue).toHaveBeenCalled();
+	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
index 24fb59dfde..1eb184a88c 100644
--- a/packages/cli/test/integration/community-packages.api.test.ts
+++ b/packages/cli/test/integration/community-packages.api.test.ts
@@ -7,15 +7,10 @@ import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
 import { Push } from '@/push';
 import { CommunityPackagesService } from '@/services/communityPackages.service';
 
+import { mockInstance } from '../shared/mocking';
 import { COMMUNITY_PACKAGE_VERSION } from './shared/constants';
-import * as testDb from './shared/testDb';
-import {
-	mockInstance,
-	setupTestServer,
-	mockPackage,
-	mockNode,
-	mockPackageName,
-} from './shared/utils';
+import { setupTestServer, mockPackage, mockNode, mockPackageName } from './shared/utils';
+import { createOwner } from './shared/db/users';
 
 const communityPackagesService = mockInstance(CommunityPackagesService, {
 	hasMissingPackages: false,
@@ -40,7 +35,7 @@ const parsedNpmPackageName = {
 let authAgent: SuperAgentTest;
 
 beforeAll(async () => {
-	const ownerShell = await testDb.createOwner();
+	const ownerShell = await createOwner();
 	authAgent = testServer.authAgentFor(ownerShell);
 });
 
diff --git a/packages/cli/test/integration/credentials.controller.test.ts b/packages/cli/test/integration/credentials.controller.test.ts
index b9caa9f95a..3c122f2b4e 100644
--- a/packages/cli/test/integration/credentials.controller.test.ts
+++ b/packages/cli/test/integration/credentials.controller.test.ts
@@ -1,13 +1,15 @@
-import * as testDb from './shared/testDb';
-import * as utils from './shared/utils/';
-import { randomCredentialPayload as payload } from './shared/random';
-
-import type { Credentials } from '@/requests';
+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';
+import { getCredentialOwnerRole } from './shared/db/roles';
 
 const { any } = expect;
 
-const testServer = utils.setupTestServer({ endpointGroups: ['credentials'] });
+const testServer = setupTestServer({ endpointGroups: ['credentials'] });
 
 let owner: User;
 let member: User;
@@ -15,19 +17,19 @@ let member: User;
 beforeEach(async () => {
 	await testDb.truncate(['SharedCredentials', 'Credentials']);
 
-	owner = await testDb.createOwner();
-	member = await testDb.createMember();
+	owner = await createOwner();
+	member = await createMember();
 });
 
-type GetAllResponse = { body: { data: Credentials.WithOwnedByAndSharedWith[] } };
+type GetAllResponse = { body: { data: ListQuery.Credentials.WithOwnedByAndSharedWith[] } };
 
 describe('GET /credentials', () => {
 	describe('should return', () => {
 		test('all credentials for owner', async () => {
-			const role = await testDb.getCredentialOwnerRole();
+			const role = await getCredentialOwnerRole();
 
-			const { id: id1 } = await testDb.saveCredential(payload(), { user: owner, role });
-			const { id: id2 } = await testDb.saveCredential(payload(), { user: member, role });
+			const { id: id1 } = await saveCredential(payload(), { user: owner, role });
+			const { id: id2 } = await saveCredential(payload(), { user: member, role });
 
 			const response: GetAllResponse = await testServer
 				.authAgentFor(owner)
@@ -45,13 +47,13 @@ describe('GET /credentials', () => {
 		});
 
 		test('only own credentials for member', async () => {
-			const role = await testDb.getCredentialOwnerRole();
+			const role = await getCredentialOwnerRole();
 
 			const firstMember = member;
-			const secondMember = await testDb.createMember();
+			const secondMember = await createMember();
 
-			const c1 = await testDb.saveCredential(payload(), { user: firstMember, role });
-			const c2 = await testDb.saveCredential(payload(), { user: secondMember, role });
+			const c1 = await saveCredential(payload(), { user: firstMember, role });
+			const c2 = await saveCredential(payload(), { user: secondMember, role });
 
 			const response: GetAllResponse = await testServer
 				.authAgentFor(firstMember)
@@ -70,8 +72,8 @@ describe('GET /credentials', () => {
 
 	describe('filter', () => {
 		test('should filter credentials by field: name - full match', async () => {
-			const role = await testDb.getCredentialOwnerRole();
-			const savedCred = await testDb.saveCredential(payload(), { user: owner, role });
+			const role = await getCredentialOwnerRole();
+			const savedCred = await saveCredential(payload(), { user: owner, role });
 
 			const response: GetAllResponse = await testServer
 				.authAgentFor(owner)
@@ -95,8 +97,8 @@ describe('GET /credentials', () => {
 		});
 
 		test('should filter credentials by field: name - partial match', async () => {
-			const role = await testDb.getCredentialOwnerRole();
-			const savedCred = await testDb.saveCredential(payload(), { user: owner, role });
+			const role = await getCredentialOwnerRole();
+			const savedCred = await saveCredential(payload(), { user: owner, role });
 
 			const partialName = savedCred.name.slice(3);
 
@@ -122,9 +124,9 @@ describe('GET /credentials', () => {
 		});
 
 		test('should filter credentials by field: type - full match', async () => {
-			const role = await testDb.getCredentialOwnerRole();
+			const role = await getCredentialOwnerRole();
 
-			const savedCred = await testDb.saveCredential(payload(), { user: owner, role });
+			const savedCred = await saveCredential(payload(), { user: owner, role });
 
 			const response: GetAllResponse = await testServer
 				.authAgentFor(owner)
@@ -148,9 +150,9 @@ describe('GET /credentials', () => {
 		});
 
 		test('should filter credentials by field: type - partial match', async () => {
-			const role = await testDb.getCredentialOwnerRole();
+			const role = await getCredentialOwnerRole();
 
-			const savedCred = await testDb.saveCredential(payload(), { user: owner, role });
+			const savedCred = await saveCredential(payload(), { user: owner, role });
 
 			const partialType = savedCred.type.slice(3);
 
@@ -178,10 +180,10 @@ describe('GET /credentials', () => {
 
 	describe('select', () => {
 		test('should select credential field: id', async () => {
-			const role = await testDb.getCredentialOwnerRole();
+			const role = await getCredentialOwnerRole();
 
-			await testDb.saveCredential(payload(), { user: owner, role });
-			await testDb.saveCredential(payload(), { user: owner, role });
+			await saveCredential(payload(), { user: owner, role });
+			await saveCredential(payload(), { user: owner, role });
 
 			const response: GetAllResponse = await testServer
 				.authAgentFor(owner)
@@ -195,10 +197,10 @@ describe('GET /credentials', () => {
 		});
 
 		test('should select credential field: name', async () => {
-			const role = await testDb.getCredentialOwnerRole();
+			const role = await getCredentialOwnerRole();
 
-			await testDb.saveCredential(payload(), { user: owner, role });
-			await testDb.saveCredential(payload(), { user: owner, role });
+			await saveCredential(payload(), { user: owner, role });
+			await saveCredential(payload(), { user: owner, role });
 
 			const response: GetAllResponse = await testServer
 				.authAgentFor(owner)
@@ -212,10 +214,10 @@ describe('GET /credentials', () => {
 		});
 
 		test('should select credential field: type', async () => {
-			const role = await testDb.getCredentialOwnerRole();
+			const role = await getCredentialOwnerRole();
 
-			await testDb.saveCredential(payload(), { user: owner, role });
-			await testDb.saveCredential(payload(), { user: owner, role });
+			await saveCredential(payload(), { user: owner, role });
+			await saveCredential(payload(), { user: owner, role });
 
 			const response: GetAllResponse = await testServer
 				.authAgentFor(owner)
@@ -231,10 +233,10 @@ describe('GET /credentials', () => {
 
 	describe('take', () => {
 		test('should return n credentials or less, without skip', async () => {
-			const role = await testDb.getCredentialOwnerRole();
+			const role = await getCredentialOwnerRole();
 
-			await testDb.saveCredential(payload(), { user: owner, role });
-			await testDb.saveCredential(payload(), { user: owner, role });
+			await saveCredential(payload(), { user: owner, role });
+			await saveCredential(payload(), { user: owner, role });
 
 			const response = await testServer
 				.authAgentFor(owner)
@@ -258,10 +260,10 @@ describe('GET /credentials', () => {
 		});
 
 		test('should return n credentials or less, with skip', async () => {
-			const role = await testDb.getCredentialOwnerRole();
+			const role = await getCredentialOwnerRole();
 
-			await testDb.saveCredential(payload(), { user: owner, role });
-			await testDb.saveCredential(payload(), { user: owner, role });
+			await saveCredential(payload(), { user: owner, role });
+			await saveCredential(payload(), { user: owner, role });
 
 			const response = await testServer
 				.authAgentFor(owner)
@@ -276,7 +278,7 @@ describe('GET /credentials', () => {
 	});
 });
 
-function validateCredential(credential: Credentials.WithOwnedByAndSharedWith) {
+function validateCredential(credential: ListQuery.Credentials.WithOwnedByAndSharedWith) {
 	const { name, type, nodesAccess, sharedWith, ownedBy } = credential;
 
 	expect(typeof name).toBe('string');
diff --git a/packages/cli/test/integration/credentials.ee.test.ts b/packages/cli/test/integration/credentials.ee.test.ts
index bc7222b850..f0792244aa 100644
--- a/packages/cli/test/integration/credentials.ee.test.ts
+++ b/packages/cli/test/integration/credentials.ee.test.ts
@@ -2,15 +2,20 @@ import type { SuperAgentTest } from 'supertest';
 import { In } from 'typeorm';
 import type { IUser } from 'n8n-workflow';
 
-import * as Db from '@/Db';
-import type { Credentials } from '@/requests';
+import type { ListQuery } from '@/requests';
 import * as UserManagementHelpers from '@/UserManagement/UserManagementHelper';
 import type { Role } from '@db/entities/Role';
 import type { User } from '@db/entities/User';
+
 import { randomCredentialPayload } from './shared/random';
 import * as testDb from './shared/testDb';
 import type { SaveCredentialFunction } from './shared/types';
 import * as utils from './shared/utils/';
+import { affixRoleToSaveCredential, shareCredentialWithUsers } from './shared/db/credentials';
+import { getCredentialOwnerRole, getGlobalMemberRole, getGlobalOwnerRole } from './shared/db/roles';
+import { createManyUsers, createUser, createUserShell } from './shared/db/users';
+import { SharedCredentialsRepository } from '@db/repositories/sharedCredentials.repository';
+import Container from 'typedi';
 
 const sharingSpy = jest.spyOn(UserManagementHelpers, 'isSharingEnabled').mockReturnValue(true);
 const testServer = utils.setupTestServer({ endpointGroups: ['credentials'] });
@@ -18,20 +23,24 @@ const testServer = utils.setupTestServer({ endpointGroups: ['credentials'] });
 let globalMemberRole: Role;
 let owner: User;
 let member: User;
+let anotherMember: User;
 let authOwnerAgent: SuperAgentTest;
+let authAnotherMemberAgent: SuperAgentTest;
 let saveCredential: SaveCredentialFunction;
 
 beforeAll(async () => {
-	const globalOwnerRole = await testDb.getGlobalOwnerRole();
-	globalMemberRole = await testDb.getGlobalMemberRole();
-	const credentialOwnerRole = await testDb.getCredentialOwnerRole();
+	const globalOwnerRole = await getGlobalOwnerRole();
+	globalMemberRole = await getGlobalMemberRole();
+	const credentialOwnerRole = await getCredentialOwnerRole();
 
-	owner = await testDb.createUser({ globalRole: globalOwnerRole });
-	member = await testDb.createUser({ globalRole: globalMemberRole });
+	owner = await createUser({ globalRole: globalOwnerRole });
+	member = await createUser({ globalRole: globalMemberRole });
+	anotherMember = await createUser({ globalRole: globalMemberRole });
 
 	authOwnerAgent = testServer.authAgentFor(owner);
+	authAnotherMemberAgent = testServer.authAgentFor(anotherMember);
 
-	saveCredential = testDb.affixRoleToSaveCredential(credentialOwnerRole);
+	saveCredential = affixRoleToSaveCredential(credentialOwnerRole);
 });
 
 beforeEach(async () => {
@@ -75,7 +84,7 @@ 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, {
+		const [member1, member2, member3] = await createManyUsers(3, {
 			globalRole: globalMemberRole,
 		});
 
@@ -83,17 +92,17 @@ describe('GET /credentials', () => {
 		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 = response.body.data.find(
-			(e: Credentials.WithOwnedByAndSharedWith) => e.ownedBy?.id === owner.id,
+			(e: ListQuery.Credentials.WithOwnedByAndSharedWith) => e.ownedBy?.id === owner.id,
 		);
 		const memberCredential = response.body.data.find(
-			(e: Credentials.WithOwnedByAndSharedWith) => e.ownedBy?.id === member1.id,
+			(e: ListQuery.Credentials.WithOwnedByAndSharedWith) => e.ownedBy?.id === member1.id,
 		);
 
 		validateMainCredentialData(ownerCredential);
@@ -139,7 +148,7 @@ describe('GET /credentials', () => {
 	});
 
 	test('should return only relevant creds for member', async () => {
-		const [member1, member2] = await testDb.createManyUsers(2, {
+		const [member1, member2] = await createManyUsers(2, {
 			globalRole: globalMemberRole,
 		});
 
@@ -148,7 +157,7 @@ describe('GET /credentials', () => {
 			user: member1,
 		});
 
-		await testDb.shareCredentialWithUsers(savedMemberCredential, [member2]);
+		await shareCredentialWithUsers(savedMemberCredential, [member2]);
 
 		const response = await testServer.authAgentFor(member1).get('/credentials');
 
@@ -215,12 +224,12 @@ describe('GET /credentials/:id', () => {
 	});
 
 	test('should retrieve non-owned cred for owner', async () => {
-		const [member1, member2] = await testDb.createManyUsers(2, {
+		const [member1, member2] = await createManyUsers(2, {
 			globalRole: globalMemberRole,
 		});
 
 		const savedCredential = await saveCredential(randomCredentialPayload(), { user: member1 });
-		await testDb.shareCredentialWithUsers(savedCredential, [member2]);
+		await shareCredentialWithUsers(savedCredential, [member2]);
 
 		const response1 = await authOwnerAgent.get(`/credentials/${savedCredential.id}`);
 
@@ -254,12 +263,12 @@ describe('GET /credentials/:id', () => {
 	});
 
 	test('should retrieve owned cred for member', async () => {
-		const [member1, member2, member3] = await testDb.createManyUsers(3, {
+		const [member1, member2, member3] = await createManyUsers(3, {
 			globalRole: globalMemberRole,
 		});
 		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}`);
 
@@ -322,12 +331,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, {
+		const [member1, member2, member3, member4, member5] = await createManyUsers(5, {
 			globalRole: globalMemberRole,
 		});
 		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`)
@@ -336,7 +345,7 @@ describe('PUT /credentials/:id/share', () => {
 		expect(response.statusCode).toBe(200);
 		expect(response.body.data).toBeUndefined();
 
-		const sharedCredentials = await Db.collections.SharedCredentials.find({
+		const sharedCredentials = await Container.get(SharedCredentialsRepository).find({
 			relations: ['role'],
 			where: { credentialsId: savedCredential.id },
 		});
@@ -357,7 +366,7 @@ describe('PUT /credentials/:id/share', () => {
 	});
 
 	test('should share the credential with the provided userIds', async () => {
-		const [member1, member2, member3] = await testDb.createManyUsers(3, {
+		const [member1, member2, member3] = await createManyUsers(3, {
 			globalRole: globalMemberRole,
 		});
 		const memberIds = [member1.id, member2.id, member3.id];
@@ -371,7 +380,7 @@ 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({
+		const sharedCredentials = await Container.get(SharedCredentialsRepository).find({
 			relations: ['role'],
 			where: { credentialsId: savedCredential.id, userId: In([...memberIds]) },
 		});
@@ -384,7 +393,7 @@ describe('PUT /credentials/:id/share', () => {
 		});
 
 		// check that owner still exists
-		const ownerSharedCredential = await Db.collections.SharedCredentials.findOneOrFail({
+		const ownerSharedCredential = await Container.get(SharedCredentialsRepository).findOneOrFail({
 			relations: ['role'],
 			where: { credentialsId: savedCredential.id, userId: owner.id },
 		});
@@ -401,18 +410,69 @@ describe('PUT /credentials/:id/share', () => {
 		expect(response.statusCode).toBe(403);
 	});
 
-	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 });
+
+		await shareCredentialWithUsers(savedCredential, [anotherMember]);
+
+		const response = await authAnotherMemberAgent
+			.put(`/credentials/${savedCredential.id}/share`)
+			.send({ shareWithIds: [owner.id] });
+
+		expect(response.statusCode).toBe(403);
+		const sharedCredentials = await Container.get(SharedCredentialsRepository).find({
+			where: { credentialsId: savedCredential.id },
+		});
+		expect(sharedCredentials).toHaveLength(2);
+	});
+
+	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);
+	});
+
+	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({ globalRole: globalMemberRole });
+
+		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);
+	});
+
+	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: [member.id] });
+			.send({ shareWithIds: [anotherMember.id] });
 
-		expect(response.statusCode).toBe(403);
+		expect(response.statusCode).toBe(200);
+		const sharedCredentials = await Container.get(SharedCredentialsRepository).find({
+			where: { credentialsId: savedCredential.id },
+		});
+		expect(sharedCredentials).toHaveLength(2);
 	});
 
 	test('should ignore pending sharee', async () => {
-		const memberShell = await testDb.createUserShell(globalMemberRole);
+		const memberShell = await createUserShell(globalMemberRole);
 		const savedCredential = await saveCredential(randomCredentialPayload(), { user: owner });
 
 		const response = await authOwnerAgent
@@ -421,7 +481,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 },
 		});
 
@@ -438,7 +498,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 },
 		});
 
@@ -459,11 +519,11 @@ describe('PUT /credentials/:id/share', () => {
 	test('should unshare the credential', async () => {
 		const savedCredential = await saveCredential(randomCredentialPayload(), { user: owner });
 
-		const [member1, member2] = await testDb.createManyUsers(2, {
+		const [member1, member2] = await createManyUsers(2, {
 			globalRole: globalMemberRole,
 		});
 
-		await testDb.shareCredentialWithUsers(savedCredential, [member1, member2]);
+		await shareCredentialWithUsers(savedCredential, [member1, member2]);
 
 		const response = await authOwnerAgent
 			.put(`/credentials/${savedCredential.id}/share`)
@@ -471,7 +531,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 },
 		});
 
@@ -480,7 +540,7 @@ describe('PUT /credentials/:id/share', () => {
 	});
 });
 
-function validateMainCredentialData(credential: Credentials.WithOwnedByAndSharedWith) {
+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');
diff --git a/packages/cli/test/integration/credentials.test.ts b/packages/cli/test/integration/credentials.test.ts
index 3916865fab..09a8c2973f 100644
--- a/packages/cli/test/integration/credentials.test.ts
+++ b/packages/cli/test/integration/credentials.test.ts
@@ -1,15 +1,21 @@
 import type { SuperAgentTest } from 'supertest';
 
-import * as Db from '@/Db';
 import config from '@/config';
 import * as UserManagementHelpers from '@/UserManagement/UserManagementHelper';
-import type { Credentials } from '@/requests';
+import type { ListQuery } from '@/requests';
 import type { Role } from '@db/entities/Role';
 import type { User } from '@db/entities/User';
+
 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 { affixRoleToSaveCredential, shareCredentialWithUsers } from './shared/db/credentials';
+import { getCredentialOwnerRole, getGlobalMemberRole, getGlobalOwnerRole } from './shared/db/roles';
+import { createManyUsers, createUser } from './shared/db/users';
+import { CredentialsRepository } from '@db/repositories/credentials.repository';
+import Container from 'typedi';
+import { SharedCredentialsRepository } from '@db/repositories/sharedCredentials.repository';
 
 // mock that credentialsSharing is not enabled
 jest.spyOn(UserManagementHelpers, 'isSharingEnabled').mockReturnValue(false);
@@ -19,19 +25,21 @@ let globalOwnerRole: Role;
 let globalMemberRole: Role;
 let owner: User;
 let member: User;
+let secondMember: User;
 let authOwnerAgent: SuperAgentTest;
 let authMemberAgent: SuperAgentTest;
 let saveCredential: SaveCredentialFunction;
 
 beforeAll(async () => {
-	globalOwnerRole = await testDb.getGlobalOwnerRole();
-	globalMemberRole = await testDb.getGlobalMemberRole();
-	const credentialOwnerRole = await testDb.getCredentialOwnerRole();
+	globalOwnerRole = await getGlobalOwnerRole();
+	globalMemberRole = await getGlobalMemberRole();
+	const credentialOwnerRole = await getCredentialOwnerRole();
 
-	owner = await testDb.createUser({ globalRole: globalOwnerRole });
-	member = await testDb.createUser({ globalRole: globalMemberRole });
+	owner = await createUser({ globalRole: globalOwnerRole });
+	member = await createUser({ globalRole: globalMemberRole });
+	secondMember = await createUser({ globalRole: globalMemberRole });
 
-	saveCredential = testDb.affixRoleToSaveCredential(credentialOwnerRole);
+	saveCredential = affixRoleToSaveCredential(credentialOwnerRole);
 
 	authOwnerAgent = testServer.authAgentFor(owner);
 	authMemberAgent = testServer.authAgentFor(member);
@@ -57,7 +65,7 @@ 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: Credentials.WithOwnedByAndSharedWith) => {
+		response.body.data.forEach((credential: ListQuery.Credentials.WithOwnedByAndSharedWith) => {
 			validateMainCredentialData(credential);
 			expect('data' in credential).toBe(false);
 			expect(savedCredentialsIds).toContain(credential.id);
@@ -65,7 +73,7 @@ describe('GET /credentials', () => {
 	});
 
 	test('should return only own creds for member', async () => {
-		const [member1, member2] = await testDb.createManyUsers(2, {
+		const [member1, member2] = await createManyUsers(2, {
 			globalRole: globalMemberRole,
 		});
 
@@ -105,14 +113,14 @@ describe('POST /credentials', () => {
 		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 },
 		});
@@ -152,13 +160,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
 	});
@@ -171,13 +179,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
 	});
@@ -190,13 +198,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
 	});
@@ -208,11 +216,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
 	});
@@ -246,14 +276,14 @@ describe('PATCH /credentials/:id', () => {
 
 		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 },
 		});
@@ -261,7 +291,7 @@ describe('PATCH /credentials/:id', () => {
 		expect(sharedCredential.credentials.name).toBe(patchPayload.name); // updated
 	});
 
-	test('should update non-owned cred for owner', async () => {
+	test('should not update non-owned cred for owner', async () => {
 		const savedCredential = await saveCredential(randomCredentialPayload(), { user: member });
 		const patchPayload = randomCredentialPayload();
 
@@ -269,33 +299,22 @@ describe('PATCH /credentials/:id', () => {
 			.patch(`/credentials/${savedCredential.id}`)
 			.send(patchPayload);
 
-		expect(response.statusCode).toBe(200);
+		expect(response.statusCode).toBe(404);
 
-		const { id, name, type, nodesAccess, data: encryptedData } = response.body.data;
+		const credential = await Container.get(CredentialsRepository).findOneByOrFail({
+			id: savedCredential.id,
+		});
 
-		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 });
-
-		expect(credential.name).toBe(patchPayload.name);
-		expect(credential.type).toBe(patchPayload.type);
-		expect(credential.nodesAccess[0].nodeType).toBe(patchPayload.nodesAccess[0].nodeType);
+		expect(credential.name).not.toBe(patchPayload.name);
+		expect(credential.type).not.toBe(patchPayload.type);
 		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 },
 		});
 
-		expect(sharedCredential.credentials.name).toBe(patchPayload.name); // updated
+		expect(sharedCredential.credentials.name).not.toBe(patchPayload.name); // updated
 	});
 
 	test('should update owned cred for member', async () => {
@@ -320,14 +339,14 @@ describe('PATCH /credentials/:id', () => {
 
 		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 },
 		});
@@ -345,7 +364,43 @@ 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 not update non-owned but shared cred for member', async () => {
+		const savedCredential = await saveCredential(randomCredentialPayload(), { user: secondMember });
+		await shareCredentialWithUsers(savedCredential, [member]);
+		const patchPayload = randomCredentialPayload();
+
+		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 not update non-owned but shared cred for instance owner', async () => {
+		const savedCredential = await saveCredential(randomCredentialPayload(), { user: secondMember });
+		await shareCredentialWithUsers(savedCredential, [owner]);
+		const patchPayload = randomCredentialPayload();
+
+		const response = await authOwnerAgent
+			.patch(`/credentials/${savedCredential.id}`)
+			.send(patchPayload);
+
+		expect(response.statusCode).toBe(404);
+
+		const shellCredential = await Container.get(CredentialsRepository).findOneByOrFail({
 			id: savedCredential.id,
 		});
 
@@ -489,7 +544,7 @@ describe('GET /credentials/:id', () => {
 	});
 });
 
-function validateMainCredentialData(credential: Credentials.WithOwnedByAndSharedWith) {
+function validateMainCredentialData(credential: ListQuery.Credentials.WithOwnedByAndSharedWith) {
 	const { name, type, nodesAccess, sharedWith, ownedBy } = credential;
 
 	expect(typeof name).toBe('string');
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 0000000000..cfb897d627
--- /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/debug.controller.test.ts b/packages/cli/test/integration/debug.controller.test.ts
new file mode 100644
index 0000000000..7b5fb31413
--- /dev/null
+++ b/packages/cli/test/integration/debug.controller.test.ts
@@ -0,0 +1,57 @@
+import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
+import { ActiveWorkflowRunner } from '@/ActiveWorkflowRunner';
+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 { MultiMainSetup } from '@/services/orchestration/main/MultiMainSetup.ee';
+
+describe('DebugController', () => {
+	const workflowRepository = mockInstance(WorkflowRepository);
+	const activeWorkflowRunner = mockInstance(ActiveWorkflowRunner);
+
+	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);
+			activeWorkflowRunner.allActiveInMemory.mockReturnValue([workflowId]);
+			activeWorkflowRunner.getAllWorkflowActivationErrors.mockResolvedValue(activationErrors);
+
+			jest.spyOn(MultiMainSetup.prototype, 'instanceId', 'get').mockReturnValue(instanceId);
+			jest.spyOn(MultiMainSetup.prototype, 'fetchLeaderKey').mockResolvedValue(leaderKey);
+			jest.spyOn(MultiMainSetup.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
index 13ee4df1e3..384c02d446 100644
--- a/packages/cli/test/integration/environments/SourceControl.test.ts
+++ b/packages/cli/test/integration/environments/SourceControl.test.ts
@@ -1,22 +1,18 @@
+import { Container } from 'typedi';
 import type { SuperAgentTest } from 'supertest';
-import { SOURCE_CONTROL_API_ROOT } from '@/environments/sourceControl/constants';
-import * as testDb from '../shared/testDb';
-import * as utils from '../shared/utils/';
+
 import type { User } from '@db/entities/User';
-import * as UserManagementHelpers from '@/UserManagement/UserManagementHelper';
-import Container from 'typedi';
 import config from '@/config';
-import { License } from '@/License';
 import { SourceControlPreferencesService } from '@/environments/sourceControl/sourceControlPreferences.service.ee';
 import { SourceControlService } from '@/environments/sourceControl/sourceControl.service.ee';
 import type { SourceControlledFile } from '@/environments/sourceControl/types/sourceControlledFile';
 
-let authOwnerAgent: SuperAgentTest;
-let authMemberAgent: SuperAgentTest;
-let owner: User;
-let member: User;
+import * as utils from '../shared/utils/';
+import { getGlobalOwnerRole } from '../shared/db/roles';
+import { createUser } from '../shared/db/users';
 
-const sharingSpy = jest.spyOn(UserManagementHelpers, 'isSharingEnabled').mockReturnValue(true);
+let authOwnerAgent: SuperAgentTest;
+let owner: User;
 
 const testServer = utils.setupTestServer({
 	endpointGroups: ['sourceControl', 'license', 'auth'],
@@ -24,21 +20,17 @@ const testServer = utils.setupTestServer({
 });
 
 beforeAll(async () => {
-	const globalOwnerRole = await testDb.getGlobalOwnerRole();
-	const globalMemberRole = await testDb.getGlobalMemberRole();
-	owner = await testDb.createUser({ globalRole: globalOwnerRole });
-	member = await testDb.createUser({ globalRole: globalMemberRole });
+	const globalOwnerRole = await getGlobalOwnerRole();
+	owner = await createUser({ globalRole: globalOwnerRole });
 	authOwnerAgent = testServer.authAgentFor(owner);
-	authMemberAgent = testServer.authAgentFor(member);
 
-	Container.get(License).isSourceControlLicensed = () => true;
 	Container.get(SourceControlPreferencesService).isSourceControlConnected = () => true;
 });
 
 describe('GET /sourceControl/preferences', () => {
 	test('should return Source Control preferences', async () => {
 		await authOwnerAgent
-			.get(`/${SOURCE_CONTROL_API_ROOT}/preferences`)
+			.get('/source-control/preferences')
 			.expect(200)
 			.expect((res) => {
 				return 'repositoryUrl' in res.body && 'branchName' in res.body;
@@ -61,7 +53,7 @@ describe('GET /sourceControl/preferences', () => {
 			] as SourceControlledFile[];
 		};
 		await authOwnerAgent
-			.get(`/${SOURCE_CONTROL_API_ROOT}/get-status`)
+			.get('/source-control/get-status')
 			.query({ direction: 'push', preferLocalVersion: 'true', verbose: 'false' })
 			.expect(200)
 			.expect((res) => {
@@ -74,7 +66,7 @@ describe('GET /sourceControl/preferences', () => {
 	test('refreshing key pairsshould return new rsa key', async () => {
 		config.set('sourceControl.defaultKeyPairType', 'rsa');
 		await authOwnerAgent
-			.post(`/${SOURCE_CONTROL_API_ROOT}/generate-key-pair`)
+			.post('/source-control/generate-key-pair')
 			.send()
 			.expect(200)
 			.expect((res) => {
diff --git a/packages/cli/test/integration/eventbus.ee.test.ts b/packages/cli/test/integration/eventbus.ee.test.ts
index c529109299..0e37936ccb 100644
--- a/packages/cli/test/integration/eventbus.ee.test.ts
+++ b/packages/cli/test/integration/eventbus.ee.test.ts
@@ -3,8 +3,6 @@ import axios from 'axios';
 import syslog from 'syslog-client';
 import { v4 as uuid } from 'uuid';
 import type { SuperAgentTest } from 'supertest';
-import * as utils from './shared/utils';
-import * as testDb from './shared/testDb';
 import type { Role } from '@db/entities/Role';
 import type { User } from '@db/entities/User';
 import type {
@@ -27,6 +25,10 @@ import type { EventNamesTypes } from '@/eventbus/EventMessageClasses';
 import { EventMessageWorkflow } from '@/eventbus/EventMessageClasses/EventMessageWorkflow';
 import { EventMessageNode } from '@/eventbus/EventMessageClasses/EventMessageNode';
 
+import * as utils from './shared/utils';
+import { getGlobalOwnerRole } from './shared/db/roles';
+import { createUser } from './shared/db/users';
+
 jest.unmock('@/eventbus/MessageEventBus/MessageEventBus');
 jest.mock('axios');
 const mockedAxios = axios as jest.Mocked<typeof axios>;
@@ -83,8 +85,8 @@ const testServer = utils.setupTestServer({
 });
 
 beforeAll(async () => {
-	globalOwnerRole = await testDb.getGlobalOwnerRole();
-	owner = await testDb.createUser({ globalRole: globalOwnerRole });
+	globalOwnerRole = await getGlobalOwnerRole();
+	owner = await createUser({ globalRole: globalOwnerRole });
 	authOwnerAgent = testServer.authAgentFor(owner);
 
 	mockedSyslog.createClient.mockImplementation(() => new syslog.Client());
@@ -112,7 +114,6 @@ test('should have logwriter log messages', async () => {
 	});
 	await eventBus.send(testMessage);
 	await new Promise((resolve) => {
-		// eslint-disable-next-line @typescript-eslint/no-explicit-any
 		eventBus.logWriter.worker?.once('message', async (msg: { command: string; data: any }) => {
 			expect(msg.command).toBe('appendMessageToLog');
 			expect(msg.data).toBe(true);
diff --git a/packages/cli/test/integration/eventbus.test.ts b/packages/cli/test/integration/eventbus.test.ts
index c651215268..b2c62ba11c 100644
--- a/packages/cli/test/integration/eventbus.test.ts
+++ b/packages/cli/test/integration/eventbus.test.ts
@@ -1,8 +1,9 @@
 import type { SuperAgentTest } from 'supertest';
 import * as utils from './shared/utils/';
-import * as testDb from './shared/testDb';
 import type { Role } from '@db/entities/Role';
 import type { User } from '@db/entities/User';
+import { getGlobalOwnerRole } from './shared/db/roles';
+import { createUser } from './shared/db/users';
 
 /**
  * NOTE: due to issues with mocking the MessageEventBus in multiple tests running in parallel,
@@ -20,8 +21,8 @@ const testServer = utils.setupTestServer({
 });
 
 beforeAll(async () => {
-	globalOwnerRole = await testDb.getGlobalOwnerRole();
-	owner = await testDb.createUser({ globalRole: globalOwnerRole });
+	globalOwnerRole = await getGlobalOwnerRole();
+	owner = await createUser({ globalRole: globalOwnerRole });
 	authOwnerAgent = testServer.authAgentFor(owner);
 });
 
diff --git a/packages/cli/test/integration/executions.controller.test.ts b/packages/cli/test/integration/executions.controller.test.ts
index 2af9ec5b85..16f7e8d780 100644
--- a/packages/cli/test/integration/executions.controller.test.ts
+++ b/packages/cli/test/integration/executions.controller.test.ts
@@ -1,19 +1,22 @@
+import type { User } from '@db/entities/User';
+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 type { User } from '@/databases/entities/User';
 
 let testServer = setupTestServer({ endpointGroups: ['executions'] });
 
 let owner: User;
 
 const saveExecution = async ({ belongingTo }: { belongingTo: User }) => {
-	const workflow = await testDb.createWorkflow({}, belongingTo);
-	return testDb.createSuccessfulExecution(workflow);
+	const workflow = await createWorkflow({}, belongingTo);
+	return createSuccessfulExecution(workflow);
 };
 
 beforeEach(async () => {
 	await testDb.truncate(['Execution', 'Workflow', 'SharedWorkflow']);
-	owner = await testDb.createOwner();
+	owner = await createOwner();
 });
 
 describe('POST /executions/delete', () => {
@@ -32,7 +35,7 @@ describe('POST /executions/delete', () => {
 			.send({ ids: [execution.id] })
 			.expect(200);
 
-		const executions = await testDb.getAllExecutions();
+		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 0000000000..07b7f1a600
--- /dev/null
+++ b/packages/cli/test/integration/import.service.test.ts
@@ -0,0 +1,185 @@
+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 { RoleService } from '@/services/role.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 { createOwner } from './shared/db/users';
+import { createWorkflow, getWorkflowById } 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,
+			Container.get(RoleService),
+		);
+	});
+
+	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 = await createWorkflow();
+
+		await importService.importWorkflows([workflowToImport], owner.id);
+
+		const workflowOwnerRole = await Container.get(RoleService).findWorkflowOwnerRole();
+
+		const dbSharing = await Container.get(SharedWorkflowRepository).findOneOrFail({
+			where: { workflowId: workflowToImport.id, userId: owner.id, roleId: workflowOwnerRole.id },
+		});
+
+		expect(dbSharing.userId).toBe(owner.id);
+	});
+
+	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/invitations.api.test.ts b/packages/cli/test/integration/invitations.api.test.ts
new file mode 100644
index 0000000000..2ac4d4c1d6
--- /dev/null
+++ b/packages/cli/test/integration/invitations.api.test.ts
@@ -0,0 +1,452 @@
+import validator from 'validator';
+import type { SuperAgentTest } from 'supertest';
+
+import type { User } from '@db/entities/User';
+import { PasswordUtility } from '@/services/password.utility';
+import { UserManagementMailer } from '@/UserManagement/email/UserManagementMailer';
+
+import Container from 'typedi';
+import { UserRepository } from '@db/repositories/user.repository';
+
+import { mockInstance } from '../shared/mocking';
+import {
+	randomEmail,
+	randomInvalidPassword,
+	randomName,
+	randomValidPassword,
+} from './shared/random';
+import * as testDb from './shared/testDb';
+import * as utils from './shared/utils/';
+import { getGlobalAdminRole, getGlobalMemberRole } from './shared/db/roles';
+import { createMember, createOwner, createUser, createUserShell } from './shared/db/users';
+import { ExternalHooks } from '@/ExternalHooks';
+import { InternalHooks } from '@/InternalHooks';
+import type { UserInvitationResponse } from './shared/utils/users';
+import {
+	assertInviteUserSuccessResponse,
+	assertInvitedUsersOnDb,
+	assertInviteUserErrorResponse,
+} from './shared/utils/users';
+import { mocked } from 'jest-mock';
+import { License } from '@/License';
+
+mockInstance(InternalHooks);
+
+const license = mockInstance(License, {
+	isAdvancedPermissionsLicensed: jest.fn().mockReturnValue(true),
+	isWithinUsersLimit: jest.fn().mockReturnValue(true),
+});
+
+const externalHooks = mockInstance(ExternalHooks);
+const mailer = mockInstance(UserManagementMailer, { isEmailSetUp: true });
+
+const testServer = utils.setupTestServer({ endpointGroups: ['invitations'] });
+
+describe('POST /invitations/:id/accept', () => {
+	let owner: User;
+
+	let authlessAgent: SuperAgentTest;
+
+	beforeAll(async () => {
+		await testDb.truncate(['User']);
+
+		owner = await createOwner();
+
+		authlessAgent = testServer.authlessAgent;
+	});
+
+	test('should fill out a member shell', async () => {
+		const globalMemberRole = await getGlobalMemberRole();
+		const memberShell = await createUserShell(globalMemberRole);
+
+		const memberData = {
+			inviterId: owner.id,
+			firstName: randomName(),
+			lastName: randomName(),
+			password: randomValidPassword(),
+		};
+
+		const response = await authlessAgent
+			.post(`/invitations/${memberShell.id}/accept`)
+			.send(memberData)
+			.expect(200);
+
+		const {
+			id,
+			email,
+			firstName,
+			lastName,
+			personalizationAnswers,
+			password,
+			globalRole,
+			isPending,
+			apiKey,
+			globalScopes,
+		} = 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(isPending).toBe(false);
+		expect(globalRole.scope).toBe('global');
+		expect(globalRole.name).toBe('member');
+		expect(apiKey).not.toBeDefined();
+		expect(globalScopes).toBeDefined();
+		expect(globalScopes).not.toHaveLength(0);
+
+		const authToken = utils.getAuthToken(response);
+		expect(authToken).toBeDefined();
+
+		const storedMember = await Container.get(UserRepository).findOneByOrFail({
+			id: memberShell.id,
+		});
+
+		expect(storedMember.firstName).toBe(memberData.firstName);
+		expect(storedMember.lastName).toBe(memberData.lastName);
+		expect(storedMember.password).not.toBe(memberData.password);
+	});
+
+	test('should fill out an admin shell', async () => {
+		const globalAdminRole = await getGlobalAdminRole();
+		const adminShell = await createUserShell(globalAdminRole);
+
+		const memberData = {
+			inviterId: owner.id,
+			firstName: randomName(),
+			lastName: randomName(),
+			password: randomValidPassword(),
+		};
+
+		const response = await authlessAgent
+			.post(`/invitations/${adminShell.id}/accept`)
+			.send(memberData)
+			.expect(200);
+
+		const {
+			id,
+			email,
+			firstName,
+			lastName,
+			personalizationAnswers,
+			password,
+			globalRole,
+			isPending,
+			apiKey,
+			globalScopes,
+		} = 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(isPending).toBe(false);
+		expect(globalRole.scope).toBe('global');
+		expect(globalRole.name).toBe('admin');
+		expect(apiKey).not.toBeDefined();
+		expect(globalScopes).toBeDefined();
+		expect(globalScopes).not.toHaveLength(0);
+
+		const authToken = utils.getAuthToken(response);
+		expect(authToken).toBeDefined();
+
+		const storedAdmin = await Container.get(UserRepository).findOneByOrFail({
+			id: adminShell.id,
+		});
+
+		expect(storedAdmin.firstName).toBe(memberData.firstName);
+		expect(storedAdmin.lastName).toBe(memberData.lastName);
+		expect(storedAdmin.password).not.toBe(memberData.password);
+	});
+
+	test('should fail with invalid payloads', async () => {
+		const memberShellEmail = randomEmail();
+
+		const globalMemberRole = await getGlobalMemberRole();
+
+		const memberShell = await Container.get(UserRepository).save({
+			email: memberShellEmail,
+			globalRole: globalMemberRole,
+		});
+
+		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(),
+			},
+		];
+
+		for (const invalidPayload of invalidPayloads) {
+			await authlessAgent
+				.post(`/invitations/${memberShell.id}/accept`)
+				.send(invalidPayload)
+				.expect(400);
+
+			const storedMemberShell = await Container.get(UserRepository).findOneOrFail({
+				where: { email: memberShellEmail },
+			});
+
+			expect(storedMemberShell.firstName).toBeNull();
+			expect(storedMemberShell.lastName).toBeNull();
+			expect(storedMemberShell.password).toBeNull();
+		}
+	});
+
+	test('should fail with already accepted invite', async () => {
+		const globalMemberRole = await getGlobalMemberRole();
+		const member = await createUser({ globalRole: globalMemberRole });
+
+		const memberData = {
+			inviterId: owner.id,
+			firstName: randomName(),
+			lastName: randomName(),
+			password: randomValidPassword(),
+		};
+
+		await authlessAgent.post(`/invitations/${member.id}/accept`).send(memberData).expect(400);
+
+		const storedMember = await Container.get(UserRepository).findOneOrFail({
+			where: { email: member.email },
+		});
+
+		expect(storedMember.firstName).not.toBe(memberData.firstName);
+		expect(storedMember.lastName).not.toBe(memberData.lastName);
+		expect(storedMember.password).not.toBe(memberData.password);
+
+		const comparisonResult = await Container.get(PasswordUtility).compare(
+			member.password,
+			storedMember.password,
+		);
+
+		expect(comparisonResult).toBe(false);
+	});
+});
+
+describe('POST /invitations', () => {
+	let owner: User;
+	let member: User;
+	let ownerAgent: SuperAgentTest;
+
+	beforeAll(async () => {
+		await testDb.truncate(['User']);
+
+		owner = await createOwner();
+		member = await createMember();
+		ownerAgent = testServer.authAgentFor(owner);
+	});
+
+	test('should fail with invalid payloads', async () => {
+		const invalidPayloads = [
+			randomEmail(),
+			[randomEmail()],
+			{},
+			[{ name: randomName() }],
+			[{ email: randomName() }],
+		];
+
+		await Promise.all(
+			invalidPayloads.map(async (invalidPayload) => {
+				await ownerAgent.post('/invitations').send(invalidPayload).expect(400);
+
+				const usersCount = await Container.get(UserRepository).count();
+
+				expect(usersCount).toBe(2); // DB unaffected
+			}),
+		);
+	});
+
+	test('should return 200 on empty payload', async () => {
+		const response = await ownerAgent.post('/invitations').send([]).expect(200);
+
+		expect(response.body.data).toStrictEqual([]);
+
+		const usersCount = await Container.get(UserRepository).count();
+
+		expect(usersCount).toBe(2);
+	});
+
+	test('should return 200 if emailing is not set up', async () => {
+		mailer.invite.mockResolvedValue({ emailSent: false });
+
+		const response = await ownerAgent
+			.post('/invitations')
+			.send([{ email: randomEmail() }])
+			.expect(200);
+
+		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(owner.id);
+		expect(inviteUrl.searchParams.get('inviteeId')).toBe(user.id);
+	});
+
+	test('should create member shell', async () => {
+		mailer.invite.mockResolvedValue({ emailSent: false });
+
+		const response = await ownerAgent
+			.post('/invitations')
+			.send([{ email: randomEmail() }])
+			.expect(200);
+
+		const [result] = response.body.data as UserInvitationResponse[];
+
+		const storedUser = await Container.get(UserRepository).findOneByOrFail({
+			id: result.user.id,
+		});
+
+		assertInvitedUsersOnDb(storedUser);
+	});
+
+	test('should create admin shell if licensed', async () => {
+		mailer.invite.mockResolvedValue({ emailSent: false });
+
+		const response = await ownerAgent
+			.post('/invitations')
+			.send([{ email: randomEmail(), role: 'admin' }])
+			.expect(200);
+
+		const [result] = response.body.data as UserInvitationResponse[];
+
+		const storedUser = await Container.get(UserRepository).findOneByOrFail({
+			id: result.user.id,
+		});
+
+		assertInvitedUsersOnDb(storedUser);
+	});
+
+	test('should reinvite member', async () => {
+		mailer.invite.mockResolvedValue({ emailSent: false });
+
+		await ownerAgent.post('/invitations').send([{ email: randomEmail(), role: 'member' }]);
+
+		await ownerAgent
+			.post('/invitations')
+			.send([{ email: randomEmail(), role: 'member' }])
+			.expect(200);
+	});
+
+	test('should reinvite admin if licensed', async () => {
+		license.isAdvancedPermissionsLicensed.mockReturnValue(true);
+		mailer.invite.mockResolvedValue({ emailSent: false });
+
+		await ownerAgent.post('/invitations').send([{ email: randomEmail(), role: 'admin' }]);
+
+		await ownerAgent
+			.post('/invitations')
+			.send([{ email: randomEmail(), role: 'admin' }])
+			.expect(200);
+	});
+
+	test('should fail to create admin shell if not licensed', async () => {
+		license.isAdvancedPermissionsLicensed.mockReturnValue(false);
+		mailer.invite.mockResolvedValue({ emailSent: false });
+
+		await ownerAgent
+			.post('/invitations')
+			.send([{ email: randomEmail(), role: 'admin' }])
+			.expect(403);
+	});
+
+	test('should email invites and create user shells but ignore existing', async () => {
+		externalHooks.run.mockClear();
+
+		mailer.invite.mockResolvedValue({ emailSent: true });
+
+		const globalMemberRole = await getGlobalMemberRole();
+		const memberShell = await createUserShell(globalMemberRole);
+
+		const newUser = randomEmail();
+
+		const shellUsers = [memberShell.email];
+		const usersToInvite = [newUser, ...shellUsers];
+		const usersToCreate = [newUser];
+		const existingUsers = [member.email];
+
+		const testEmails = [...usersToInvite, ...existingUsers];
+
+		const payload = testEmails.map((email) => ({ email }));
+
+		const response = await ownerAgent.post('/invitations').send(payload).expect(200);
+
+		const internalHooks = Container.get(InternalHooks);
+
+		expect(internalHooks.onUserTransactionalEmail).toHaveBeenCalledTimes(usersToInvite.length);
+
+		expect(externalHooks.run).toHaveBeenCalledTimes(1);
+
+		const [hookName, hookData] = externalHooks.run.mock.calls[0];
+
+		expect(hookName).toBe('user.invited');
+		expect(hookData?.[0]).toStrictEqual(usersToCreate);
+
+		const result = response.body.data as UserInvitationResponse[];
+
+		for (const invitationResponse of result) {
+			assertInviteUserSuccessResponse(invitationResponse);
+
+			const storedUser = await Container.get(UserRepository).findOneByOrFail({
+				id: invitationResponse.user.id,
+			});
+
+			assertInvitedUsersOnDb(storedUser);
+		}
+
+		const calls = mocked(internalHooks).onUserTransactionalEmail.mock.calls;
+
+		for (const [onUserTransactionalEmailParameter] of calls) {
+			expect(onUserTransactionalEmailParameter.user_id).toBeDefined();
+			expect(onUserTransactionalEmailParameter.message_type).toBe('New user invite');
+			expect(onUserTransactionalEmailParameter.public_api).toBe(false);
+		}
+	});
+
+	test('should return 200 when invite method throws error', async () => {
+		mailer.invite.mockImplementation(async () => {
+			throw new Error('failed to send email');
+		});
+
+		const response = await ownerAgent
+			.post('/invitations')
+			.send([{ email: randomEmail() }])
+			.expect(200);
+
+		expect(response.body.data).toBeInstanceOf(Array);
+		expect(response.body.data.length).toBe(1);
+
+		const [invitationResponse] = response.body.data;
+
+		assertInviteUserErrorResponse(invitationResponse);
+	});
+});
diff --git a/packages/cli/test/integration/ldap/ldap.api.test.ts b/packages/cli/test/integration/ldap/ldap.api.test.ts
index 81d8641f42..0a1ce8f437 100644
--- a/packages/cli/test/integration/ldap/ldap.api.test.ts
+++ b/packages/cli/test/integration/ldap/ldap.api.test.ts
@@ -1,15 +1,15 @@
+import Container from 'typedi';
 import type { SuperAgentTest } from 'supertest';
 import type { Entry as LdapUser } from 'ldapts';
 import { Not } from '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 { LdapService } from '@/Ldap/ldap.service';
 import { saveLdapSynchronization } from '@/Ldap/helpers';
 import type { LdapConfig } from '@/Ldap/types';
 import { getCurrentAuthenticationMethod, setCurrentAuthenticationMethod } from '@/sso/ssoHelpers';
@@ -17,8 +17,12 @@ import { getCurrentAuthenticationMethod, setCurrentAuthenticationMethod } from '
 import { randomEmail, randomName, uniqueId } from './../shared/random';
 import * as testDb from './../shared/testDb';
 import * as utils from '../shared/utils/';
-import Container from 'typedi';
-import { Cipher } from 'n8n-core';
+
+import { getGlobalMemberRole, getGlobalOwnerRole } from '../shared/db/roles';
+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');
 
@@ -46,18 +50,19 @@ const testServer = utils.setupTestServer({
 });
 
 beforeAll(async () => {
-	const [globalOwnerRole, fetchedGlobalMemberRole] = await testDb.getAllRoles();
+	const [globalOwnerRole, fetchedGlobalMemberRole] = await Promise.all([
+		getGlobalOwnerRole(),
+		getGlobalMemberRole(),
+	]);
 
 	globalMemberRole = fetchedGlobalMemberRole;
 
-	owner = await testDb.createUser({ globalRole: globalOwnerRole });
+	owner = await createUser({ globalRole: globalOwnerRole, password: 'password' });
 	authOwnerAgent = testServer.authAgentFor(owner);
 
 	defaultLdapConfig.bindingAdminPassword = Container.get(Cipher).encrypt(
 		defaultLdapConfig.bindingAdminPassword,
 	);
-
-	await setCurrentAuthenticationMethod('email');
 });
 
 beforeEach(async () => {
@@ -70,15 +75,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.isInstanceOwnerSetUp', true);
+
+	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,
@@ -90,7 +97,7 @@ const createLdapConfig = async (attributes: Partial<LdapConfig> = {}): Promise<L
 };
 
 test('Member role should not be able to access ldap routes', async () => {
-	const member = await testDb.createUser({ globalRole: globalMemberRole });
+	const member = await createUser({ globalRole: globalMemberRole });
 	const authAgent = testServer.authAgentFor(member);
 	await authAgent.get('/ldap/config').expect(403);
 	await authAgent.put('/ldap/config').expect(403);
@@ -145,19 +152,32 @@ describe('PUT /ldap/config', () => {
 		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({ globalRole: globalMemberRole }, uniqueId());
 
 		const configuration = ldapConfig;
 
 		// disable the login, so the strategy is applied
 		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);
@@ -210,7 +230,7 @@ describe('POST /ldap/sync', () => {
 			lastNameAttribute: 'sn',
 			emailAttribute: 'mail',
 		});
-		LdapManager.updateConfig(ldapConfig);
+		Container.get(LdapService).setConfig(ldapConfig);
 	});
 
 	describe('dry mode', () => {
@@ -219,7 +239,9 @@ describe('POST /ldap/sync', () => {
 
 			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();
@@ -250,7 +272,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);
 		});
@@ -259,7 +281,7 @@ describe('POST /ldap/sync', () => {
 			const ldapUserEmail = randomEmail();
 			const ldapUserId = uniqueId();
 
-			const member = await testDb.createLdapUser(
+			const member = await createLdapUser(
 				{ globalRole: globalMemberRole, email: ldapUserEmail },
 				ldapUserId,
 			);
@@ -277,7 +299,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);
@@ -288,7 +310,7 @@ describe('POST /ldap/sync', () => {
 			const ldapUserEmail = randomEmail();
 			const ldapUserId = uniqueId();
 
-			const member = await testDb.createLdapUser(
+			const member = await createLdapUser(
 				{ globalRole: globalMemberRole, email: ldapUserEmail },
 				ldapUserId,
 			);
@@ -298,7 +320,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);
@@ -312,7 +334,9 @@ describe('POST /ldap/sync', () => {
 
 			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();
@@ -342,7 +366,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)!;
@@ -353,7 +377,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');
@@ -368,7 +392,7 @@ describe('POST /ldap/sync', () => {
 				uid: uniqueId(),
 			};
 
-			await testDb.createLdapUser(
+			await createLdapUser(
 				{
 					globalRole: globalMemberRole,
 					email: ldapUser.mail,
@@ -382,7 +406,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);
@@ -401,7 +425,7 @@ describe('POST /ldap/sync', () => {
 				uid: uniqueId(),
 			};
 
-			await testDb.createLdapUser(
+			await createLdapUser(
 				{
 					globalRole: globalMemberRole,
 					email: ldapUser.mail,
@@ -415,7 +439,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)!;
@@ -427,12 +451,12 @@ 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({ globalRole: globalMemberRole }, uniqueId());
 
 			jest.spyOn(LdapService.prototype, 'searchWithAdminBinding').mockResolvedValue([]);
 
@@ -469,7 +493,9 @@ test('GET /ldap/sync should return paginated synchronizations', async () => {
 describe('POST /login', () => {
 	const runTest = async (ldapUser: LdapUser) => {
 		const ldapConfig = await createLdapConfig();
-		LdapManager.updateConfig(ldapConfig);
+		Container.get(LdapService).setConfig(ldapConfig);
+
+		await setCurrentAuthenticationMethod('ldap');
 
 		jest.spyOn(LdapService.prototype, 'searchWithAdminBinding').mockResolvedValue([ldapUser]);
 
@@ -484,7 +510,7 @@ describe('POST /login', () => {
 		expect(response.headers['set-cookie'][0] as string).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);
@@ -515,7 +541,7 @@ describe('POST /login', () => {
 			uid: uniqueId(),
 		};
 
-		await testDb.createLdapUser(
+		await createLdapUser(
 			{
 				globalRole: globalMemberRole,
 				email: ldapUser.mail,
@@ -528,6 +554,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(),
@@ -537,7 +576,7 @@ describe('POST /login', () => {
 			uid: uniqueId(),
 		};
 
-		await testDb.createUser({
+		await createUser({
 			globalRole: globalMemberRole,
 			email: ldapUser.mail,
 			firstName: ldapUser.givenName,
@@ -551,18 +590,18 @@ 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({ globalRole: globalMemberRole }, uniqueId());
 
 		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({ globalRole: globalMemberRole }, uniqueId());
 
 		// delete the LDAP member and transfer its workflows/credentials to instance owner
 		await authOwnerAgent.post(`/users/${member.id}?transferId=${owner.id}`);
diff --git a/packages/cli/test/integration/license.api.test.ts b/packages/cli/test/integration/license.api.test.ts
index 0688b352d7..1430beb064 100644
--- a/packages/cli/test/integration/license.api.test.ts
+++ b/packages/cli/test/integration/license.api.test.ts
@@ -5,6 +5,8 @@ import type { ILicensePostResponse, ILicenseReadResponse } from '@/Interfaces';
 import { License } from '@/License';
 import * as testDb from './shared/testDb';
 import * as utils from './shared/utils/';
+import { getGlobalMemberRole, getGlobalOwnerRole } from './shared/db/roles';
+import { createUserShell } from './shared/db/users';
 
 const MOCK_SERVER_URL = 'https://server.com/v1';
 const MOCK_RENEW_OFFSET = 259200;
@@ -17,10 +19,10 @@ let authMemberAgent: SuperAgentTest;
 const testServer = utils.setupTestServer({ endpointGroups: ['license'] });
 
 beforeAll(async () => {
-	const globalOwnerRole = await testDb.getGlobalOwnerRole();
-	const globalMemberRole = await testDb.getGlobalMemberRole();
-	owner = await testDb.createUserShell(globalOwnerRole);
-	member = await testDb.createUserShell(globalMemberRole);
+	const globalOwnerRole = await getGlobalOwnerRole();
+	const globalMemberRole = await getGlobalMemberRole();
+	owner = await createUserShell(globalOwnerRole);
+	member = await createUserShell(globalMemberRole);
 
 	authOwnerAgent = testServer.authAgentFor(owner);
 	authMemberAgent = testServer.authAgentFor(member);
@@ -58,7 +60,7 @@ 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 () => {
@@ -80,19 +82,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}` });
 	});
 });
 
@@ -129,6 +129,6 @@ const DEFAULT_POST_RESPONSE: { data: ILicensePostResponse } = {
 	},
 };
 
-const NON_OWNER_ACTIVATE_RENEW_MESSAGE = 'Only an instance owner may activate or renew a license';
+const UNAUTHORIZED_RESPONSE = { status: 'error', message: 'Unauthorized' };
 const ACTIVATION_FAILED_MESSAGE = 'Failed to activate license';
-const RENEW_ERROR_MESSAGE = 'Something went wrong when trying to renew 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 05371ce558..552e0d649c 100644
--- a/packages/cli/test/integration/me.api.test.ts
+++ b/packages/cli/test/integration/me.api.test.ts
@@ -1,7 +1,6 @@
 import type { SuperAgentTest } from 'supertest';
 import { IsNull } from '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';
@@ -14,6 +13,10 @@ import {
 } from './shared/random';
 import * as testDb from './shared/testDb';
 import * as utils from './shared/utils/';
+import { getGlobalMemberRole, getGlobalOwnerRole } from './shared/db/roles';
+import { addApiKey, createUser, createUserShell } from './shared/db/users';
+import Container from 'typedi';
+import { UserRepository } from '@db/repositories/user.repository';
 
 const testServer = utils.setupTestServer({ endpointGroups: ['me'] });
 
@@ -21,8 +24,8 @@ let globalOwnerRole: Role;
 let globalMemberRole: Role;
 
 beforeAll(async () => {
-	globalOwnerRole = await testDb.getGlobalOwnerRole();
-	globalMemberRole = await testDb.getGlobalMemberRole();
+	globalOwnerRole = await getGlobalOwnerRole();
+	globalMemberRole = await getGlobalMemberRole();
 });
 
 beforeEach(async () => {
@@ -34,8 +37,8 @@ describe('Owner shell', () => {
 	let authOwnerShellAgent: SuperAgentTest;
 
 	beforeEach(async () => {
-		ownerShell = await testDb.createUserShell(globalOwnerRole);
-		await testDb.addApiKey(ownerShell);
+		ownerShell = await createUserShell(globalOwnerRole);
+		await addApiKey(ownerShell);
 		authOwnerShellAgent = testServer.authAgentFor(ownerShell);
 	});
 
@@ -68,7 +71,7 @@ describe('Owner shell', () => {
 			expect(globalRole.scope).toBe('global');
 			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);
@@ -81,7 +84,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();
@@ -100,7 +103,7 @@ describe('Owner shell', () => {
 			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);
@@ -111,7 +114,7 @@ describe('Owner shell', () => {
 			}
 		}
 
-		const storedOwnerShell = await Db.collections.User.findOneByOrFail({});
+		const storedOwnerShell = await Container.get(UserRepository).findOneByOrFail({});
 		expect(storedOwnerShell.password).toBeNull();
 	});
 
@@ -124,7 +127,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() },
 			});
 
@@ -139,7 +142,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() },
 		});
 
@@ -158,7 +161,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() },
 		});
 
@@ -172,7 +175,7 @@ describe('Member', () => {
 	let authMemberAgent: SuperAgentTest;
 
 	beforeEach(async () => {
-		member = await testDb.createUser({
+		member = await createUser({
 			password: memberPassword,
 			globalRole: globalMemberRole,
 			apiKey: randomApiKey(),
@@ -211,7 +214,7 @@ describe('Member', () => {
 			expect(globalRole.scope).toBe('global');
 			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);
@@ -224,7 +227,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);
@@ -241,7 +244,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);
 	});
@@ -251,7 +254,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);
@@ -270,9 +273,9 @@ 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);
 		}
@@ -285,7 +288,7 @@ describe('Member', () => {
 		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);
 	});
@@ -302,7 +305,7 @@ describe('Member', () => {
 
 		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();
 	});
@@ -314,7 +317,7 @@ describe('Owner', () => {
 	});
 
 	test('PATCH /me should succeed with valid inputs', async () => {
-		const owner = await testDb.createUser({ globalRole: globalOwnerRole });
+		const owner = await createUser({ globalRole: globalOwnerRole });
 		const authOwnerAgent = testServer.authAgentFor(owner);
 
 		for (const validPayload of VALID_PATCH_ME_PAYLOADS) {
@@ -345,7 +348,7 @@ describe('Owner', () => {
 			expect(globalRole.scope).toBe('global');
 			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);
diff --git a/packages/cli/test/integration/mfa/mfa.api.test.ts b/packages/cli/test/integration/mfa/mfa.api.test.ts
index 3914a42843..1f9a5318ea 100644
--- a/packages/cli/test/integration/mfa/mfa.api.test.ts
+++ b/packages/cli/test/integration/mfa/mfa.api.test.ts
@@ -1,14 +1,15 @@
+import Container from 'typedi';
 import config from '@/config';
-import * as Db from '@/Db';
 import type { Role } from '@db/entities/Role';
 import type { User } from '@db/entities/User';
-import * as testDb from './../shared/testDb';
-import * as utils from '../shared/utils';
 import { randomPassword } from '@/Ldap/helpers';
-import { randomDigit, randomString, randomValidPassword, uniqueId } from '../shared/random';
 import { TOTPService } from '@/Mfa/totp.service';
-import Container from 'typedi';
-import { JwtService } from '@/services/jwt.service';
+import { UserService } from '@/services/user.service';
+import { randomDigit, randomString, randomValidPassword, uniqueId } from '../shared/random';
+import * as testDb from '../shared/testDb';
+import * as utils from '../shared/utils';
+import { createUser, createUserWithMfaEnabled } from '../shared/db/users';
+import { UserRepository } from '@db/repositories/user.repository';
 
 jest.mock('@/telemetry');
 
@@ -22,7 +23,7 @@ const testServer = utils.setupTestServer({
 beforeEach(async () => {
 	await testDb.truncate(['User']);
 
-	owner = await testDb.createUser({ globalRole: globalOwnerRole });
+	owner = await createUser({ globalRole: globalOwnerRole });
 
 	config.set('userManagement.disabled', false);
 });
@@ -160,7 +161,7 @@ describe('Enable MFA setup', () => {
 
 			expect(statusCode).toBe(200);
 
-			const user = await Db.collections.User.findOneOrFail({
+			const user = await Container.get(UserRepository).findOneOrFail({
 				where: {},
 				select: ['mfaEnabled', 'mfaRecoveryCodes', 'mfaSecret'],
 			});
@@ -174,13 +175,13 @@ describe('Enable MFA setup', () => {
 
 describe('Disable MFA setup', () => {
 	test('POST /disable should disable login with MFA', async () => {
-		const { user } = await testDb.createUserWithMfaEnabled();
+		const { user } = await createUserWithMfaEnabled();
 
 		const response = await testServer.authAgentFor(user).delete('/mfa/disable');
 
 		expect(response.statusCode).toBe(200);
 
-		const dbUser = await Db.collections.User.findOneOrFail({
+		const dbUser = await Container.get(UserRepository).findOneOrFail({
 			where: { id: user.id },
 			select: ['mfaEnabled', 'mfaRecoveryCodes', 'mfaSecret'],
 		});
@@ -193,7 +194,7 @@ describe('Disable MFA setup', () => {
 
 describe('Change password with MFA enabled', () => {
 	test('PATCH /me/password should fail due to missing MFA token', async () => {
-		const { user, rawPassword } = await testDb.createUserWithMfaEnabled();
+		const { user, rawPassword } = await createUserWithMfaEnabled();
 
 		const newPassword = randomPassword();
 
@@ -206,7 +207,7 @@ describe('Change password with MFA enabled', () => {
 	});
 
 	test('POST /change-password should fail due to missing MFA token', async () => {
-		const { user } = await testDb.createUserWithMfaEnabled();
+		await createUserWithMfaEnabled();
 
 		const newPassword = randomValidPassword();
 
@@ -216,11 +217,11 @@ describe('Change password with MFA enabled', () => {
 			.post('/change-password')
 			.send({ password: newPassword, token: resetPasswordToken });
 
-		expect(response.statusCode).toBe(400);
+		expect(response.statusCode).toBe(404);
 	});
 
 	test('POST /change-password should fail due to invalid MFA token', async () => {
-		const { user } = await testDb.createUserWithMfaEnabled();
+		await createUserWithMfaEnabled();
 
 		const newPassword = randomValidPassword();
 
@@ -232,19 +233,17 @@ describe('Change password with MFA enabled', () => {
 			mfaToken: randomDigit(),
 		});
 
-		expect(response.statusCode).toBe(400);
+		expect(response.statusCode).toBe(404);
 	});
 
 	test('POST /change-password should update password', async () => {
-		const { user, rawSecret } = await testDb.createUserWithMfaEnabled();
+		const { user, rawSecret } = await createUserWithMfaEnabled();
 
 		const newPassword = randomValidPassword();
 
 		config.set('userManagement.jwtSecret', randomString(5, 10));
 
-		const jwtService = Container.get(JwtService);
-
-		const resetPasswordToken = jwtService.signData({ sub: user.id });
+		const resetPasswordToken = Container.get(UserService).generatePasswordResetToken(user);
 
 		const mfaToken = new TOTPService().generateTOTP(rawSecret);
 
@@ -274,7 +273,7 @@ describe('Login', () => {
 	test('POST /login with email/password should succeed when mfa is disabled', async () => {
 		const password = randomPassword();
 
-		const user = await testDb.createUser({ password });
+		const user = await createUser({ password });
 
 		const response = await testServer.authlessAgent
 			.post('/login')
@@ -305,7 +304,7 @@ describe('Login', () => {
 	});
 
 	test('POST /login with email/password should fail when mfa is enabled', async () => {
-		const { user, rawPassword } = await testDb.createUserWithMfaEnabled();
+		const { user, rawPassword } = await createUserWithMfaEnabled();
 
 		const response = await testServer.authlessAgent
 			.post('/login')
@@ -316,7 +315,7 @@ describe('Login', () => {
 
 	describe('Login with MFA token', () => {
 		test('POST /login should fail due to invalid MFA token', async () => {
-			const { user, rawPassword } = await testDb.createUserWithMfaEnabled();
+			const { user, rawPassword } = await createUserWithMfaEnabled();
 
 			const response = await testServer.authlessAgent
 				.post('/login')
@@ -326,7 +325,7 @@ describe('Login', () => {
 		});
 
 		test('POST /login should fail due two MFA step needed', async () => {
-			const { user, rawPassword } = await testDb.createUserWithMfaEnabled();
+			const { user, rawPassword } = await createUserWithMfaEnabled();
 
 			const response = await testServer.authlessAgent
 				.post('/login')
@@ -337,7 +336,7 @@ describe('Login', () => {
 		});
 
 		test('POST /login should succeed with MFA token', async () => {
-			const { user, rawSecret, rawPassword } = await testDb.createUserWithMfaEnabled();
+			const { user, rawSecret, rawPassword } = await createUserWithMfaEnabled();
 
 			const token = new TOTPService().generateTOTP(rawSecret);
 
@@ -354,7 +353,7 @@ describe('Login', () => {
 
 	describe('Login with recovery code', () => {
 		test('POST /login should fail due to invalid MFA recovery code', async () => {
-			const { user, rawPassword } = await testDb.createUserWithMfaEnabled();
+			const { user, rawPassword } = await createUserWithMfaEnabled();
 
 			const response = await testServer.authlessAgent
 				.post('/login')
@@ -364,7 +363,7 @@ describe('Login', () => {
 		});
 
 		test('POST /login should succeed with MFA recovery code', async () => {
-			const { user, rawPassword, rawRecoveryCodes } = await testDb.createUserWithMfaEnabled();
+			const { user, rawPassword, rawRecoveryCodes } = await createUserWithMfaEnabled();
 
 			const response = await testServer.authlessAgent
 				.post('/login')
@@ -376,7 +375,7 @@ describe('Login', () => {
 			expect(data.mfaEnabled).toBe(true);
 			expect(data.hasRecoveryCodesLeft).toBe(true);
 
-			const dbUser = await Db.collections.User.findOneOrFail({
+			const dbUser = await Container.get(UserRepository).findOneOrFail({
 				where: { id: user.id },
 				select: ['mfaEnabled', 'mfaRecoveryCodes', 'mfaSecret'],
 			});
@@ -387,7 +386,7 @@ describe('Login', () => {
 		});
 
 		test('POST /login with MFA recovery code should update hasRecoveryCodesLeft property', async () => {
-			const { user, rawPassword, rawRecoveryCodes } = await testDb.createUserWithMfaEnabled({
+			const { user, rawPassword, rawRecoveryCodes } = await createUserWithMfaEnabled({
 				numberOfRecoveryCodes: 1,
 			});
 
diff --git a/packages/cli/test/integration/owner.api.test.ts b/packages/cli/test/integration/owner.api.test.ts
index 6332ae39c1..2d044ee43a 100644
--- a/packages/cli/test/integration/owner.api.test.ts
+++ b/packages/cli/test/integration/owner.api.test.ts
@@ -2,7 +2,6 @@ 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 {
@@ -13,6 +12,10 @@ import {
 } from './shared/random';
 import * as testDb from './shared/testDb';
 import * as utils from './shared/utils/';
+import { getGlobalOwnerRole } from './shared/db/roles';
+import { createUserShell } from './shared/db/users';
+import { UserRepository } from '@db/repositories/user.repository';
+import Container from 'typedi';
 
 const testServer = utils.setupTestServer({ endpointGroups: ['owner'] });
 
@@ -21,11 +24,11 @@ let ownerShell: User;
 let authOwnerShellAgent: SuperAgentTest;
 
 beforeAll(async () => {
-	globalOwnerRole = await testDb.getGlobalOwnerRole();
+	globalOwnerRole = await getGlobalOwnerRole();
 });
 
 beforeEach(async () => {
-	ownerShell = await testDb.createUserShell(globalOwnerRole);
+	ownerShell = await createUserShell(globalOwnerRole);
 	authOwnerShellAgent = testServer.authAgentFor(ownerShell);
 	config.set('userManagement.isInstanceOwnerSetUp', false);
 });
@@ -57,6 +60,7 @@ describe('POST /owner/setup', () => {
 			password,
 			isPending,
 			apiKey,
+			globalScopes,
 		} = response.body.data;
 
 		expect(validator.isUUID(id)).toBe(true);
@@ -69,8 +73,9 @@ describe('POST /owner/setup', () => {
 		expect(globalRole.name).toBe('owner');
 		expect(globalRole.scope).toBe('global');
 		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);
@@ -100,7 +105,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());
 	});
 
diff --git a/packages/cli/test/integration/passwordReset.api.test.ts b/packages/cli/test/integration/passwordReset.api.test.ts
index 5c9a01017f..cf263a890d 100644
--- a/packages/cli/test/integration/passwordReset.api.test.ts
+++ b/packages/cli/test/integration/passwordReset.api.test.ts
@@ -1,18 +1,21 @@
 import { v4 as uuid } from 'uuid';
 import { compare } from 'bcryptjs';
 import { Container } from 'typedi';
-import { License } from '@/License';
+import { mock } from 'jest-mock-extended';
 
-import * as Db from '@/Db';
+import { License } from '@/License';
 import config from '@/config';
 import type { Role } from '@db/entities/Role';
 import type { User } from '@db/entities/User';
 import { setCurrentAuthenticationMethod } from '@/sso/ssoHelpers';
 import { ExternalHooks } from '@/ExternalHooks';
 import { JwtService } from '@/services/jwt.service';
+import { UserService } from '@/services/user.service';
 import { UserManagementMailer } from '@/UserManagement/email';
+import { UserRepository } from '@db/repositories/user.repository';
 
-import * as utils from './shared/utils/';
+import { mockInstance } from '../shared/mocking';
+import { getAuthToken, setupTestServer } from './shared/utils/';
 import {
 	randomEmail,
 	randomInvalidPassword,
@@ -21,6 +24,9 @@ import {
 	randomValidPassword,
 } from './shared/random';
 import * as testDb from './shared/testDb';
+import { getGlobalMemberRole, getGlobalOwnerRole } from './shared/db/roles';
+import { createUser } from './shared/db/users';
+import { PasswordUtility } from '@/services/password.utility';
 
 config.set('userManagement.jwtSecret', randomString(5, 10));
 
@@ -29,27 +35,29 @@ let globalMemberRole: Role;
 let owner: User;
 let member: User;
 
-const externalHooks = utils.mockInstance(ExternalHooks);
-const mailer = utils.mockInstance(UserManagementMailer, { isEmailSetUp: true });
-const testServer = utils.setupTestServer({ endpointGroups: ['passwordReset'] });
+const externalHooks = mockInstance(ExternalHooks);
+const mailer = mockInstance(UserManagementMailer, { isEmailSetUp: true });
+const testServer = setupTestServer({ endpointGroups: ['passwordReset'] });
 const jwtService = Container.get(JwtService);
+let userService: UserService;
 
 beforeAll(async () => {
-	globalOwnerRole = await testDb.getGlobalOwnerRole();
-	globalMemberRole = await testDb.getGlobalMemberRole();
+	globalOwnerRole = await getGlobalOwnerRole();
+	globalMemberRole = await getGlobalMemberRole();
 });
 
 beforeEach(async () => {
 	await testDb.truncate(['User']);
-	owner = await testDb.createUser({ globalRole: globalOwnerRole });
-	member = await testDb.createUser({ globalRole: globalMemberRole });
+	owner = await createUser({ globalRole: globalOwnerRole });
+	member = await createUser({ globalRole: globalMemberRole });
 	externalHooks.run.mockReset();
 	jest.replaceProperty(mailer, 'isEmailSetUp', true);
+	userService = Container.get(UserService);
 });
 
 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,
 		});
@@ -75,7 +83,7 @@ describe('POST /forgot-password', () => {
 
 	test('should fail if SAML is authentication method', async () => {
 		await setCurrentAuthenticationMethod('saml');
-		const member = await testDb.createUser({
+		const member = await createUser({
 			email: 'test@test.com',
 			globalRole: globalMemberRole,
 		});
@@ -127,7 +135,7 @@ describe('POST /forgot-password', () => {
 
 describe('GET /resolve-password-token', () => {
 	test('should succeed with valid inputs', async () => {
-		const resetPasswordToken = jwtService.signData({ sub: owner.id });
+		const resetPasswordToken = userService.generatePasswordResetToken(owner);
 
 		const response = await testServer.authlessAgent
 			.get('/resolve-password-token')
@@ -137,21 +145,19 @@ describe('GET /resolve-password-token', () => {
 	});
 
 	test('should fail with invalid inputs', async () => {
-		const first = await testServer.authlessAgent
+		await testServer.authlessAgent
 			.get('/resolve-password-token')
-			.query({ token: uuid() });
+			.query({ token: uuid() })
+			.expect(404);
 
-		const second = await testServer.authlessAgent
+		await testServer.authlessAgent
 			.get('/resolve-password-token')
-			.query({ userId: owner.id });
-
-		for (const response of [first, second]) {
-			expect(response.statusCode).toBe(400);
-		}
+			.query({ userId: owner.id })
+			.expect(400);
 	});
 
 	test('should fail if user is not found', async () => {
-		const token = jwtService.signData({ sub: uuid() });
+		const token = jwtService.sign({ sub: uuid() });
 
 		const response = await testServer.authlessAgent
 			.get('/resolve-password-token')
@@ -161,7 +167,18 @@ describe('GET /resolve-password-token', () => {
 	});
 
 	test('should fail if token is expired', async () => {
-		const resetPasswordToken = jwtService.signData({ sub: owner.id }, { expiresIn: '-1h' });
+		const resetPasswordToken = userService.generatePasswordResetToken(owner, '-1h');
+
+		const response = await testServer.authlessAgent
+			.get('/resolve-password-token')
+			.query({ userId: owner.id, token: resetPasswordToken });
+
+		expect(response.statusCode).toBe(404);
+	});
+
+	test('should fail after password has changed', async () => {
+		const updatedUser = mock<User>({ ...owner, password: 'another-password' });
+		const resetPasswordToken = userService.generatePasswordResetToken(updatedUser);
 
 		const response = await testServer.authlessAgent
 			.get('/resolve-password-token')
@@ -175,7 +192,7 @@ describe('POST /change-password', () => {
 	const passwordToStore = randomValidPassword();
 
 	test('should succeed with valid inputs', async () => {
-		const resetPasswordToken = jwtService.signData({ sub: owner.id });
+		const resetPasswordToken = userService.generatePasswordResetToken(owner);
 		const response = await testServer.authlessAgent.post('/change-password').send({
 			token: resetPasswordToken,
 			userId: owner.id,
@@ -184,14 +201,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);
 
@@ -202,7 +222,7 @@ describe('POST /change-password', () => {
 	});
 
 	test('should fail with invalid inputs', async () => {
-		const resetPasswordToken = jwtService.signData({ sub: owner.id });
+		const resetPasswordToken = userService.generatePasswordResetToken(owner);
 
 		const invalidPayloads = [
 			{ token: uuid() },
@@ -228,7 +248,7 @@ describe('POST /change-password', () => {
 				.post('/change-password')
 				.query(invalidPayload);
 			expect(response.statusCode).toBe(400);
-			const { password: storedPassword } = await Db.collections.User.findOneByOrFail({
+			const { password: storedPassword } = await Container.get(UserRepository).findOneByOrFail({
 				id: owner.id,
 			});
 			expect(owner.password).toBe(storedPassword);
@@ -236,7 +256,7 @@ describe('POST /change-password', () => {
 	});
 
 	test('should fail when token has expired', async () => {
-		const resetPasswordToken = jwtService.signData({ sub: owner.id }, { expiresIn: '-1h' });
+		const resetPasswordToken = userService.generatePasswordResetToken(owner, '-1h');
 
 		const response = await testServer.authlessAgent.post('/change-password').send({
 			token: resetPasswordToken,
@@ -252,7 +272,7 @@ describe('POST /change-password', () => {
 	test('owner should be able to reset its password when quota:users = 1', async () => {
 		jest.spyOn(Container.get(License), 'getUsersLimit').mockReturnValueOnce(1);
 
-		const resetPasswordToken = jwtService.signData({ sub: owner.id });
+		const resetPasswordToken = userService.generatePasswordResetToken(owner);
 		const response = await testServer.authlessAgent.post('/change-password').send({
 			token: resetPasswordToken,
 			userId: owner.id,
@@ -261,10 +281,10 @@ 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,
 		});
 
@@ -281,7 +301,7 @@ describe('POST /change-password', () => {
 	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 = jwtService.signData({ sub: member.id });
+		const resetPasswordToken = userService.generatePasswordResetToken(member);
 		const response = await testServer.authlessAgent.post('/change-password').send({
 			token: resetPasswordToken,
 			userId: member.id,
diff --git a/packages/cli/test/integration/repositories/execution.repository.test.ts b/packages/cli/test/integration/pruning.service.test.ts
similarity index 72%
rename from packages/cli/test/integration/repositories/execution.repository.test.ts
rename to packages/cli/test/integration/pruning.service.test.ts
index 27aec5faa2..14ed6b4874 100644
--- a/packages/cli/test/integration/repositories/execution.repository.test.ts
+++ b/packages/cli/test/integration/pruning.service.test.ts
@@ -1,25 +1,37 @@
 import config from '@/config';
-import * as Db from '@/Db';
-
-import * as testDb from '../shared/testDb';
+import { BinaryDataService } from 'n8n-core';
 import type { ExecutionStatus } from 'n8n-workflow';
-import type { ExecutionRepository } from '@/databases/repositories';
-import type { ExecutionEntity } from '@/databases/entities/ExecutionEntity';
+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 executionRepository: ExecutionRepository;
-	let workflow: Awaited<ReturnType<typeof testDb.createWorkflow>>;
+	let workflow: WorkflowEntity;
 
 	beforeAll(async () => {
 		await testDb.init();
 
-		const { Execution } = Db.collections;
+		pruningService = new PruningService(
+			mockInstance(Logger),
+			Container.get(ExecutionRepository),
+			mockInstance(BinaryDataService),
+		);
 
-		executionRepository = Execution;
-		workflow = await testDb.createWorkflow();
+		workflow = await createWorkflow();
 	});
 
 	beforeEach(async () => {
@@ -35,7 +47,7 @@ describe('softDeleteOnPruningCycle()', () => {
 	});
 
 	async function findAllExecutions() {
-		return Db.collections.Execution.find({
+		return Container.get(ExecutionRepository).find({
 			order: { id: 'asc' },
 			withDeleted: true,
 		});
@@ -49,12 +61,12 @@ describe('softDeleteOnPruningCycle()', () => {
 
 		test('should mark as deleted based on EXECUTIONS_DATA_PRUNE_MAX_COUNT', async () => {
 			const executions = [
-				await testDb.createSuccessfulExecution(workflow),
-				await testDb.createSuccessfulExecution(workflow),
-				await testDb.createSuccessfulExecution(workflow),
+				await createSuccessfulExecution(workflow),
+				await createSuccessfulExecution(workflow),
+				await createSuccessfulExecution(workflow),
 			];
 
-			await executionRepository.softDeleteOnPruningCycle();
+			await pruningService.softDeleteOnPruningCycle();
 
 			const result = await findAllExecutions();
 			expect(result).toEqual([
@@ -66,14 +78,14 @@ describe('softDeleteOnPruningCycle()', () => {
 
 		test('should not re-mark already marked executions', async () => {
 			const executions = [
-				await testDb.createExecution(
+				await createExecution(
 					{ status: 'success', finished: true, startedAt: now, stoppedAt: now, deletedAt: now },
 					workflow,
 				),
-				await testDb.createSuccessfulExecution(workflow),
+				await createSuccessfulExecution(workflow),
 			];
 
-			await executionRepository.softDeleteOnPruningCycle();
+			await pruningService.softDeleteOnPruningCycle();
 
 			const result = await findAllExecutions();
 			expect(result).toEqual([
@@ -91,11 +103,11 @@ describe('softDeleteOnPruningCycle()', () => {
 			['success', { finished: true, startedAt: now, stoppedAt: now }],
 		])('should prune %s executions', async (status, attributes) => {
 			const executions = [
-				await testDb.createExecution({ status, ...attributes }, workflow),
-				await testDb.createSuccessfulExecution(workflow),
+				await createExecution({ status, ...attributes }, workflow),
+				await createSuccessfulExecution(workflow),
 			];
 
-			await executionRepository.softDeleteOnPruningCycle();
+			await pruningService.softDeleteOnPruningCycle();
 
 			const result = await findAllExecutions();
 			expect(result).toEqual([
@@ -110,11 +122,11 @@ describe('softDeleteOnPruningCycle()', () => {
 			['waiting', { startedAt: now, stoppedAt: now, waitTill: now }],
 		])('should not prune %s executions', async (status, attributes) => {
 			const executions = [
-				await testDb.createExecution({ status, ...attributes }, workflow),
-				await testDb.createSuccessfulExecution(workflow),
+				await createExecution({ status, ...attributes }, workflow),
+				await createSuccessfulExecution(workflow),
 			];
 
-			await executionRepository.softDeleteOnPruningCycle();
+			await pruningService.softDeleteOnPruningCycle();
 
 			const result = await findAllExecutions();
 			expect(result).toEqual([
@@ -132,17 +144,17 @@ describe('softDeleteOnPruningCycle()', () => {
 
 		test('should mark as deleted based on EXECUTIONS_DATA_MAX_AGE', async () => {
 			const executions = [
-				await testDb.createExecution(
+				await createExecution(
 					{ finished: true, startedAt: yesterday, stoppedAt: yesterday, status: 'success' },
 					workflow,
 				),
-				await testDb.createExecution(
+				await createExecution(
 					{ finished: true, startedAt: now, stoppedAt: now, status: 'success' },
 					workflow,
 				),
 			];
 
-			await executionRepository.softDeleteOnPruningCycle();
+			await pruningService.softDeleteOnPruningCycle();
 
 			const result = await findAllExecutions();
 			expect(result).toEqual([
@@ -153,7 +165,7 @@ describe('softDeleteOnPruningCycle()', () => {
 
 		test('should not re-mark already marked executions', async () => {
 			const executions = [
-				await testDb.createExecution(
+				await createExecution(
 					{
 						status: 'success',
 						finished: true,
@@ -163,10 +175,10 @@ describe('softDeleteOnPruningCycle()', () => {
 					},
 					workflow,
 				),
-				await testDb.createSuccessfulExecution(workflow),
+				await createSuccessfulExecution(workflow),
 			];
 
-			await executionRepository.softDeleteOnPruningCycle();
+			await pruningService.softDeleteOnPruningCycle();
 
 			const result = await findAllExecutions();
 			expect(result).toEqual([
@@ -183,9 +195,9 @@ describe('softDeleteOnPruningCycle()', () => {
 			['failed', { startedAt: yesterday, stoppedAt: yesterday }],
 			['success', { finished: true, startedAt: yesterday, stoppedAt: yesterday }],
 		])('should prune %s executions', async (status, attributes) => {
-			const execution = await testDb.createExecution({ status, ...attributes }, workflow);
+			const execution = await createExecution({ status, ...attributes }, workflow);
 
-			await executionRepository.softDeleteOnPruningCycle();
+			await pruningService.softDeleteOnPruningCycle();
 
 			const result = await findAllExecutions();
 			expect(result).toEqual([
@@ -199,11 +211,11 @@ describe('softDeleteOnPruningCycle()', () => {
 			['waiting', { startedAt: yesterday, stoppedAt: yesterday, waitTill: yesterday }],
 		])('should not prune %s executions', async (status, attributes) => {
 			const executions = [
-				await testDb.createExecution({ status, ...attributes }, workflow),
-				await testDb.createSuccessfulExecution(workflow),
+				await createExecution({ status, ...attributes }, workflow),
+				await createSuccessfulExecution(workflow),
 			];
 
-			await executionRepository.softDeleteOnPruningCycle();
+			await pruningService.softDeleteOnPruningCycle();
 
 			const result = await findAllExecutions();
 			expect(result).toEqual([
diff --git a/packages/cli/test/integration/publicApi/credentials.test.ts b/packages/cli/test/integration/publicApi/credentials.test.ts
index 2a6e79ea06..b754208dec 100644
--- a/packages/cli/test/integration/publicApi/credentials.test.ts
+++ b/packages/cli/test/integration/publicApi/credentials.test.ts
@@ -1,5 +1,4 @@
 import type { SuperAgentTest } from 'supertest';
-import * as Db from '@/Db';
 import type { Role } from '@db/entities/Role';
 import type { User } from '@db/entities/User';
 
@@ -7,6 +6,12 @@ import { randomApiKey, randomName, randomString } from '../shared/random';
 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 { getAllRoles } from '../shared/db/roles';
+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;
@@ -21,18 +26,18 @@ const testServer = utils.setupTestServer({ endpointGroups: ['publicApi'] });
 
 beforeAll(async () => {
 	const [globalOwnerRole, fetchedGlobalMemberRole, _, fetchedCredentialOwnerRole] =
-		await testDb.getAllRoles();
+		await getAllRoles();
 
 	globalMemberRole = fetchedGlobalMemberRole;
 	credentialOwnerRole = fetchedCredentialOwnerRole;
 
-	owner = await testDb.addApiKey(await testDb.createUserShell(globalOwnerRole));
-	member = await testDb.createUser({ globalRole: globalMemberRole, apiKey: randomApiKey() });
+	owner = await addApiKey(await createUserShell(globalOwnerRole));
+	member = await createUser({ globalRole: globalMemberRole, apiKey: randomApiKey() });
 
 	authOwnerAgent = testServer.publicApiAgentFor(owner);
 	authMemberAgent = testServer.publicApiAgentFor(member);
 
-	saveCredential = testDb.affixRoleToSaveCredential(credentialOwnerRole);
+	saveCredential = affixRoleToSaveCredential(credentialOwnerRole);
 
 	await utils.initCredentialsTypes();
 });
@@ -61,13 +66,13 @@ describe('POST /credentials', () => {
 		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({
+		const sharedCredential = await Container.get(SharedCredentialsRepository).findOneOrFail({
 			relations: ['user', 'credentials', 'role'],
 			where: { credentialsId: credential.id, userId: owner.id },
 		});
@@ -97,13 +102,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
 	});
@@ -115,13 +120,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
 	});
@@ -138,19 +143,19 @@ 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({
+		const anotherMember = await createUser({
 			globalRole: globalMemberRole,
 			apiKey: randomApiKey(),
 		});
@@ -170,13 +175,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,
 			},
@@ -186,13 +191,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,
 					},
@@ -210,13 +215,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
 	});
diff --git a/packages/cli/test/integration/publicApi/executions.test.ts b/packages/cli/test/integration/publicApi/executions.test.ts
index 0eece7838d..32c069bd0f 100644
--- a/packages/cli/test/integration/publicApi/executions.test.ts
+++ b/packages/cli/test/integration/publicApi/executions.test.ts
@@ -5,6 +5,19 @@ import type { ActiveWorkflowRunner } from '@/ActiveWorkflowRunner';
 import { randomApiKey } from '../shared/random';
 import * as utils from '../shared/utils/';
 import * as testDb from '../shared/testDb';
+import { getGlobalMemberRole, getGlobalOwnerRole } from '../shared/db/roles';
+import { createUser } from '../shared/db/users';
+import {
+	createManyWorkflows,
+	createWorkflow,
+	shareWorkflowWithUsers,
+} from '../shared/db/workflows';
+import {
+	createErrorExecution,
+	createManyExecutions,
+	createSuccessfulExecution,
+	createWaitingExecution,
+} from '../shared/db/executions';
 
 let owner: User;
 let user1: User;
@@ -17,11 +30,11 @@ let workflowRunner: ActiveWorkflowRunner;
 const testServer = utils.setupTestServer({ endpointGroups: ['publicApi'] });
 
 beforeAll(async () => {
-	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() });
+	const globalOwnerRole = await getGlobalOwnerRole();
+	const globalUserRole = await getGlobalMemberRole();
+	owner = await createUser({ globalRole: globalOwnerRole, apiKey: randomApiKey() });
+	user1 = await createUser({ globalRole: globalUserRole, apiKey: randomApiKey() });
+	user2 = await createUser({ globalRole: globalUserRole, apiKey: randomApiKey() });
 
 	// TODO: mock BinaryDataService instead
 	await utils.initBinaryDataService();
@@ -62,9 +75,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}`);
 
@@ -94,8 +107,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}`);
 
@@ -103,8 +116,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}`);
 
@@ -112,9 +125,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}`);
 
@@ -122,11 +135,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}`);
 
@@ -140,8 +153,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}`);
 
@@ -179,11 +192,11 @@ 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({
 			status: 'success',
@@ -219,13 +232,13 @@ 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({
 			status: 'success',
@@ -275,11 +288,11 @@ 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({
 			status: 'error',
@@ -313,13 +326,13 @@ 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({
 			status: 'waiting',
@@ -353,14 +366,10 @@ 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({
 			workflowId: workflow.id,
@@ -396,21 +405,13 @@ 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 [firstWorkflowForUser1, secondWorkflowForUser1] = await createManyWorkflows(2, {}, user1);
+		await createManyExecutions(2, firstWorkflowForUser1, createSuccessfulExecution);
+		await createManyExecutions(2, secondWorkflowForUser1, createSuccessfulExecution);
 
-		const [firstWorkflowForUser2, secondWorkflowForUser2] = await testDb.createManyWorkflows(
-			2,
-			{},
-			user2,
-		);
-		await testDb.createManyExecutions(2, firstWorkflowForUser2, testDb.createSuccessfulExecution);
-		await testDb.createManyExecutions(2, secondWorkflowForUser2, testDb.createSuccessfulExecution);
+		const [firstWorkflowForUser2, secondWorkflowForUser2] = await createManyWorkflows(2, {}, user2);
+		await createManyExecutions(2, firstWorkflowForUser2, createSuccessfulExecution);
+		await createManyExecutions(2, secondWorkflowForUser2, createSuccessfulExecution);
 
 		const response = await authOwnerAgent.get('/executions');
 
@@ -420,21 +421,13 @@ 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 [firstWorkflowForUser1, secondWorkflowForUser1] = await createManyWorkflows(2, {}, user1);
+		await createManyExecutions(2, firstWorkflowForUser1, createSuccessfulExecution);
+		await createManyExecutions(2, secondWorkflowForUser1, createSuccessfulExecution);
 
-		const [firstWorkflowForUser2, secondWorkflowForUser2] = await testDb.createManyWorkflows(
-			2,
-			{},
-			user2,
-		);
-		await testDb.createManyExecutions(2, firstWorkflowForUser2, testDb.createSuccessfulExecution);
-		await testDb.createManyExecutions(2, secondWorkflowForUser2, testDb.createSuccessfulExecution);
+		const [firstWorkflowForUser2, secondWorkflowForUser2] = await createManyWorkflows(2, {}, user2);
+		await createManyExecutions(2, firstWorkflowForUser2, createSuccessfulExecution);
+		await createManyExecutions(2, secondWorkflowForUser2, createSuccessfulExecution);
 
 		const response = await authUser1Agent.get('/executions');
 
@@ -444,23 +437,15 @@ 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 [firstWorkflowForUser1, secondWorkflowForUser1] = await createManyWorkflows(2, {}, user1);
+		await createManyExecutions(2, firstWorkflowForUser1, createSuccessfulExecution);
+		await createManyExecutions(2, secondWorkflowForUser1, createSuccessfulExecution);
 
-		const [firstWorkflowForUser2, secondWorkflowForUser2] = await testDb.createManyWorkflows(
-			2,
-			{},
-			user2,
-		);
-		await testDb.createManyExecutions(2, firstWorkflowForUser2, testDb.createSuccessfulExecution);
-		await testDb.createManyExecutions(2, secondWorkflowForUser2, testDb.createSuccessfulExecution);
+		const [firstWorkflowForUser2, secondWorkflowForUser2] = await createManyWorkflows(2, {}, user2);
+		await createManyExecutions(2, firstWorkflowForUser2, createSuccessfulExecution);
+		await createManyExecutions(2, secondWorkflowForUser2, createSuccessfulExecution);
 
-		await testDb.shareWorkflowWithUsers(firstWorkflowForUser2, [user1]);
+		await shareWorkflowWithUsers(firstWorkflowForUser2, [user1]);
 
 		const response = await authUser1Agent.get('/executions');
 
diff --git a/packages/cli/test/integration/publicApi/users.ee.test.ts b/packages/cli/test/integration/publicApi/users.ee.test.ts
index 0bc09448ba..40709e8926 100644
--- a/packages/cli/test/integration/publicApi/users.ee.test.ts
+++ b/packages/cli/test/integration/publicApi/users.ee.test.ts
@@ -5,11 +5,14 @@ import { v4 as uuid } from 'uuid';
 import type { Role } from '@db/entities/Role';
 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 { getGlobalMemberRole, getGlobalOwnerRole } from '../shared/db/roles';
+import { createUser, createUserShell } from '../shared/db/users';
 
-utils.mockInstance(License, {
+mockInstance(License, {
 	getUsersLimit: jest.fn().mockReturnValue(-1),
 });
 
@@ -19,7 +22,10 @@ let globalOwnerRole: Role;
 let globalMemberRole: Role;
 
 beforeAll(async () => {
-	[globalOwnerRole, globalMemberRole] = await testDb.getAllRoles();
+	[globalOwnerRole, globalMemberRole] = await Promise.all([
+		getGlobalOwnerRole(),
+		getGlobalMemberRole(),
+	]);
 });
 
 beforeEach(async () => {
@@ -29,13 +35,13 @@ beforeEach(async () => {
 describe('With license unlimited quota:users', () => {
 	describe('GET /users', () => {
 		test('should fail due to missing API Key', async () => {
-			const owner = await testDb.createUser({ globalRole: globalOwnerRole });
+			const owner = await createUser({ globalRole: globalOwnerRole });
 			const authOwnerAgent = testServer.publicApiAgentFor(owner);
 			await authOwnerAgent.get('/users').expect(401);
 		});
 
 		test('should fail due to invalid API Key', async () => {
-			const owner = await testDb.createUser({
+			const owner = await createUser({
 				globalRole: globalOwnerRole,
 				apiKey: randomApiKey(),
 			});
@@ -45,20 +51,20 @@ describe('With license unlimited quota:users', () => {
 		});
 
 		test('should fail due to member trying to access owner only endpoint', async () => {
-			const member = await testDb.createUser({ apiKey: randomApiKey() });
+			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 testDb.createUser({
+			const owner = await createUser({
 				globalRole: globalOwnerRole,
 				apiKey: randomApiKey(),
 			});
 
 			const authOwnerAgent = testServer.publicApiAgentFor(owner);
 
-			await testDb.createUser();
+			await createUser();
 
 			const response = await authOwnerAgent.get('/users').expect(200);
 			expect(response.body.data.length).toBe(2);
@@ -94,13 +100,13 @@ describe('With license unlimited quota:users', () => {
 
 	describe('GET /users/:id', () => {
 		test('should fail due to missing API Key', async () => {
-			const owner = await testDb.createUser({ globalRole: globalOwnerRole });
+			const owner = await createUser({ globalRole: globalOwnerRole });
 			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 testDb.createUser({
+			const owner = await createUser({
 				globalRole: globalOwnerRole,
 				apiKey: randomApiKey(),
 			});
@@ -110,12 +116,12 @@ describe('With license unlimited quota:users', () => {
 		});
 
 		test('should fail due to member trying to access owner only endpoint', async () => {
-			const member = await testDb.createUser({ apiKey: randomApiKey() });
+			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 testDb.createUser({
+			const owner = await createUser({
 				globalRole: globalOwnerRole,
 				apiKey: randomApiKey(),
 			});
@@ -124,12 +130,12 @@ describe('With license unlimited quota:users', () => {
 		});
 
 		test('should return a pending user', async () => {
-			const owner = await testDb.createUser({
+			const owner = await createUser({
 				globalRole: globalOwnerRole,
 				apiKey: randomApiKey(),
 			});
 
-			const { id: memberId } = await testDb.createUserShell(globalMemberRole);
+			const { id: memberId } = await createUserShell(globalMemberRole);
 
 			const authOwnerAgent = testServer.publicApiAgentFor(owner);
 			const response = await authOwnerAgent.get(`/users/${memberId}`).expect(200);
@@ -163,7 +169,7 @@ describe('With license unlimited quota:users', () => {
 
 	describe('GET /users/:email', () => {
 		test('with non-existing email should return 404', async () => {
-			const owner = await testDb.createUser({
+			const owner = await createUser({
 				globalRole: globalOwnerRole,
 				apiKey: randomApiKey(),
 			});
@@ -172,7 +178,7 @@ describe('With license unlimited quota:users', () => {
 		});
 
 		test('should return a user', async () => {
-			const owner = await testDb.createUser({
+			const owner = await createUser({
 				globalRole: globalOwnerRole,
 				apiKey: randomApiKey(),
 			});
@@ -211,9 +217,9 @@ describe('With license without quota:users', () => {
 	let authOwnerAgent: SuperAgentTest;
 
 	beforeEach(async () => {
-		utils.mockInstance(License, { getUsersLimit: jest.fn().mockReturnValue(null) });
+		mockInstance(License, { getUsersLimit: jest.fn().mockReturnValue(null) });
 
-		const owner = await testDb.createUser({
+		const owner = await createUser({
 			globalRole: globalOwnerRole,
 			apiKey: randomApiKey(),
 		});
diff --git a/packages/cli/test/integration/publicApi/workflows.test.ts b/packages/cli/test/integration/publicApi/workflows.test.ts
index c23c1f3213..47b0c2c15f 100644
--- a/packages/cli/test/integration/publicApi/workflows.test.ts
+++ b/packages/cli/test/integration/publicApi/workflows.test.ts
@@ -1,18 +1,24 @@
 import type { SuperAgentTest } from 'supertest';
-import * as Db from '@/Db';
+import Container from 'typedi';
+import type { INode } from 'n8n-workflow';
+import { STARTING_NODES } from '@/constants';
 import type { Role } from '@db/entities/Role';
 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 { ActiveWorkflowRunner } from '@/ActiveWorkflowRunner';
 
 import { randomApiKey } from '../shared/random';
 import * as utils from '../shared/utils/';
 import * as testDb from '../shared/testDb';
-import type { INode } from 'n8n-workflow';
-import { STARTING_NODES } from '@/constants';
-import { License } from '@/License';
-import { WorkflowHistoryRepository } from '@/databases/repositories';
-import Container from 'typedi';
+import { getAllRoles } from '../shared/db/roles';
+import { createUser } from '../shared/db/users';
+import { createWorkflow, createWorkflowWithTrigger } from '../shared/db/workflows';
+import { createTag } from '../shared/db/tags';
+import { mockInstance } from '../../shared/mocking';
+import { Push } from '@/push';
+import { ExecutionsService } from '@/executions/executions.service';
 
 let workflowOwnerRole: Role;
 let owner: User;
@@ -22,29 +28,31 @@ let authMemberAgent: SuperAgentTest;
 let workflowRunner: ActiveWorkflowRunner;
 
 const testServer = utils.setupTestServer({ endpointGroups: ['publicApi'] });
+const license = testServer.license;
 
-const licenseLike = utils.mockInstance(License, {
-	isWorkflowHistoryLicensed: jest.fn().mockReturnValue(false),
-	isWithinUsersLimit: jest.fn().mockReturnValue(true),
-});
+mockInstance(Push);
+mockInstance(ExecutionsService);
 
 beforeAll(async () => {
-	const [globalOwnerRole, globalMemberRole, fetchedWorkflowOwnerRole] = await testDb.getAllRoles();
+	const [globalOwnerRole, globalMemberRole, fetchedWorkflowOwnerRole] = await getAllRoles();
 
 	workflowOwnerRole = fetchedWorkflowOwnerRole;
 
-	owner = await testDb.createUser({
+	owner = await createUser({
 		globalRole: globalOwnerRole,
 		apiKey: randomApiKey(),
 	});
 
-	member = await testDb.createUser({
+	member = await createUser({
 		globalRole: globalMemberRole,
 		apiKey: randomApiKey(),
 	});
 
 	await utils.initNodeTypes();
-	workflowRunner = await utils.initActiveWorkflowRunner();
+
+	workflowRunner = Container.get(ActiveWorkflowRunner);
+
+	await workflowRunner.init();
 });
 
 beforeEach(async () => {
@@ -54,12 +62,11 @@ beforeEach(async () => {
 		'Tag',
 		'Workflow',
 		'Credentials',
-		WorkflowHistoryRepository,
+		'WorkflowHistory',
 	]);
 
 	authOwnerAgent = testServer.publicApiAgentFor(owner);
 	authMemberAgent = testServer.publicApiAgentFor(member);
-	licenseLike.isWorkflowHistoryLicensed.mockReturnValue(false);
 });
 
 afterEach(async () => {
@@ -80,9 +87,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');
@@ -120,9 +127,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');
@@ -173,11 +180,11 @@ describe('GET /workflows', () => {
 	});
 
 	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}`);
@@ -213,15 +220,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}`);
@@ -254,11 +261,11 @@ describe('GET /workflows', () => {
 
 	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');
@@ -307,7 +314,7 @@ describe('GET /workflows/:id', () => {
 
 	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}`);
 
@@ -340,7 +347,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}`);
 
@@ -373,7 +380,7 @@ describe('DELETE /workflows/:id', () => {
 
 	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}`);
 
@@ -393,7 +400,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,
 		});
 
@@ -402,7 +409,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}`);
 
@@ -422,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,
 		});
 
@@ -444,13 +451,13 @@ describe('POST /workflows/:id/activate', () => {
 	});
 
 	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`);
 
@@ -470,7 +477,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,
@@ -485,7 +492,7 @@ describe('POST /workflows/:id/activate', () => {
 	});
 
 	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`);
 
@@ -505,7 +512,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,
@@ -514,7 +521,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,
@@ -546,7 +553,7 @@ describe('POST /workflows/:id/deactivate', () => {
 	});
 
 	test('should deactivate workflow', async () => {
-		const workflow = await testDb.createWorkflowWithTrigger({}, member);
+		const workflow = await createWorkflowWithTrigger({}, member);
 
 		await authMemberAgent.post(`/workflows/${workflow.id}/activate`);
 
@@ -568,7 +575,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,
@@ -583,7 +590,7 @@ describe('POST /workflows/:id/deactivate', () => {
 	});
 
 	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`);
 
@@ -605,7 +612,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,
@@ -614,7 +621,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,
@@ -681,7 +688,7 @@ 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,
@@ -695,7 +702,7 @@ describe('POST /workflows', () => {
 	});
 
 	test('should create workflow history version when licensed', async () => {
-		licenseLike.isWorkflowHistoryLicensed.mockReturnValue(true);
+		license.enable('feat:workflowHistory');
 		const payload = {
 			name: 'testing',
 			nodes: [
@@ -741,7 +748,7 @@ describe('POST /workflows', () => {
 	});
 
 	test('should not create workflow history version when not licensed', async () => {
-		licenseLike.isWorkflowHistoryLicensed.mockReturnValue(false);
+		license.disable('feat:workflowHistory');
 		const payload = {
 			name: 'testing',
 			nodes: [
@@ -869,7 +876,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: [
@@ -920,7 +927,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,
@@ -935,8 +942,8 @@ describe('PUT /workflows/:id', () => {
 	});
 
 	test('should create workflow history version when licensed', async () => {
-		licenseLike.isWorkflowHistoryLicensed.mockReturnValue(true);
-		const workflow = await testDb.createWorkflow({}, member);
+		license.enable('feat:workflowHistory');
+		const workflow = await createWorkflow({}, member);
 		const payload = {
 			name: 'name updated',
 			nodes: [
@@ -990,8 +997,8 @@ describe('PUT /workflows/:id', () => {
 	});
 
 	test('should not create workflow history when not licensed', async () => {
-		licenseLike.isWorkflowHistoryLicensed.mockReturnValue(false);
-		const workflow = await testDb.createWorkflow({}, member);
+		license.disable('feat:workflowHistory');
+		const workflow = await createWorkflow({}, member);
 		const payload = {
 			name: 'name updated',
 			nodes: [
@@ -1037,7 +1044,7 @@ describe('PUT /workflows/:id', () => {
 	});
 
 	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',
@@ -1089,7 +1096,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,
@@ -1098,7 +1105,7 @@ 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,
diff --git a/packages/cli/test/integration/role.api.test.ts b/packages/cli/test/integration/role.api.test.ts
new file mode 100644
index 0000000000..024f0d6950
--- /dev/null
+++ b/packages/cli/test/integration/role.api.test.ts
@@ -0,0 +1,79 @@
+import * as utils from './shared/utils/';
+import * as testDb from './shared/testDb';
+import { createAdmin, createMember, createOwner } from './shared/db/users';
+
+import type { SuperAgentTest } from 'supertest';
+import type { User } from '@db/entities/User';
+
+const testServer = utils.setupTestServer({
+	endpointGroups: ['role'],
+	enabledFeatures: ['feat:advancedPermissions'],
+});
+
+const license = testServer.license;
+
+describe('GET /roles', () => {
+	let owner: User;
+	let admin: User;
+	let member: User;
+
+	let ownerAgent: SuperAgentTest;
+	let adminAgent: SuperAgentTest;
+	let memberAgent: SuperAgentTest;
+
+	let toAgent: Record<string, SuperAgentTest> = {};
+
+	beforeAll(async () => {
+		await testDb.truncate(['User']);
+
+		owner = await createOwner();
+		admin = await createAdmin();
+		member = await createMember();
+
+		ownerAgent = testServer.authAgentFor(owner);
+		adminAgent = testServer.authAgentFor(admin);
+		memberAgent = testServer.authAgentFor(member);
+
+		toAgent = {
+			owner: ownerAgent,
+			admin: adminAgent,
+			member: memberAgent,
+		};
+	});
+
+	describe('with advanced permissions licensed', () => {
+		test.each(['owner', 'admin', 'member'])('should return all roles to %s', async (user) => {
+			license.enable('feat:advancedPermissions');
+
+			const response = await toAgent[user].get('/roles').expect(200);
+
+			expect(response.body.data).toEqual([
+				{ scope: 'global', name: 'owner', isAvailable: true },
+				{ scope: 'global', name: 'member', isAvailable: true },
+				{ scope: 'global', name: 'admin', isAvailable: true },
+				{ scope: 'workflow', name: 'owner', isAvailable: true },
+				{ scope: 'credential', name: 'owner', isAvailable: true },
+				{ scope: 'credential', name: 'user', isAvailable: true },
+				{ scope: 'workflow', name: 'editor', isAvailable: true },
+			]);
+		});
+	});
+
+	describe('with advanced permissions not licensed', () => {
+		test.each(['owner', 'admin', 'member'])('should return all roles to %s', async (user) => {
+			license.disable('feat:advancedPermissions');
+
+			const response = await toAgent[user].get('/roles').expect(200);
+
+			expect(response.body.data).toEqual([
+				{ scope: 'global', name: 'owner', isAvailable: true },
+				{ scope: 'global', name: 'member', isAvailable: true },
+				{ scope: 'global', name: 'admin', isAvailable: false },
+				{ scope: 'workflow', name: 'owner', isAvailable: true },
+				{ scope: 'credential', name: 'owner', isAvailable: true },
+				{ scope: 'credential', name: 'user', isAvailable: true },
+				{ scope: 'workflow', name: 'editor', isAvailable: true },
+			]);
+		});
+	});
+});
diff --git a/packages/cli/test/integration/role.repository.test.ts b/packages/cli/test/integration/role.repository.test.ts
new file mode 100644
index 0000000000..04e645928d
--- /dev/null
+++ b/packages/cli/test/integration/role.repository.test.ts
@@ -0,0 +1,37 @@
+import { createAdmin, createMember, createOwner } from './shared/db/users';
+import * as testDb from './shared/testDb';
+import { RoleRepository } from '@/databases/repositories/role.repository';
+import Container from 'typedi';
+
+describe('RoleRepository', () => {
+	let roleRepository: RoleRepository;
+
+	beforeAll(async () => {
+		await testDb.init();
+
+		roleRepository = Container.get(RoleRepository);
+
+		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 roleRepository.countUsersByRole();
+
+			expect(usersByRole).toStrictEqual({ admin: 2, member: 3, owner: 1 });
+		});
+	});
+});
diff --git a/packages/cli/test/integration/saml/saml.api.test.ts b/packages/cli/test/integration/saml/saml.api.test.ts
index 302070df16..768c03fb24 100644
--- a/packages/cli/test/integration/saml/saml.api.test.ts
+++ b/packages/cli/test/integration/saml/saml.api.test.ts
@@ -10,9 +10,9 @@ 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 { sampleConfig } from './sampleMetadata';
+import { createOwner, createUser } from '../shared/db/users';
 
 let someUser: User;
 let owner: User;
@@ -29,8 +29,8 @@ const testServer = utils.setupTestServer({
 });
 
 beforeAll(async () => {
-	owner = await testDb.createOwner();
-	someUser = await testDb.createUser();
+	owner = await createOwner();
+	someUser = await createUser();
 	authOwnerAgent = testServer.authAgentFor(owner);
 	authMemberAgent = testServer.authAgentFor(someUser);
 });
diff --git a/packages/cli/test/integration/audit/credentials.risk.test.ts b/packages/cli/test/integration/security-audit/CredentialsRiskReporter.test.ts
similarity index 72%
rename from packages/cli/test/integration/audit/credentials.risk.test.ts
rename to packages/cli/test/integration/security-audit/CredentialsRiskReporter.test.ts
index 10d1d9ecbd..9a10e6e70c 100644
--- a/packages/cli/test/integration/audit/credentials.risk.test.ts
+++ b/packages/cli/test/integration/security-audit/CredentialsRiskReporter.test.ts
@@ -1,14 +1,22 @@
 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 { 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 () => {
@@ -46,11 +54,11 @@ test('should report credentials not in any use', async () => {
 	};
 
 	await Promise.all([
-		Db.collections.Credentials.save(credentialDetails),
-		Db.collections.Workflow.save(workflowDetails),
+		Container.get(CredentialsRepository).save(credentialDetails),
+		Container.get(WorkflowRepository).save(workflowDetails),
 	]);
 
-	const testAudit = await audit(['credentials']);
+	const testAudit = await securityAuditService.run(['credentials']);
 
 	const section = getRiskSection(
 		testAudit,
@@ -74,7 +82,7 @@ test('should report credentials not in active use', async () => {
 		nodesAccess: [{ nodeType: 'n8n-nodes-base.slack', date: '2022-12-21T11:23:00.561Z' }],
 	};
 
-	const credential = await Db.collections.Credentials.save(credentialDetails);
+	const credential = await Container.get(CredentialsRepository).save(credentialDetails);
 
 	const workflowDetails = {
 		id: generateNanoId(),
@@ -93,9 +101,9 @@ test('should report credentials not in active use', async () => {
 		],
 	};
 
-	await Db.collections.Workflow.save(workflowDetails);
+	await Container.get(WorkflowRepository).save(workflowDetails);
 
-	const testAudit = await audit(['credentials']);
+	const testAudit = await securityAuditService.run(['credentials']);
 
 	const section = getRiskSection(
 		testAudit,
@@ -119,7 +127,7 @@ test('should report credential in not recently executed workflow', async () => {
 		nodesAccess: [{ nodeType: 'n8n-nodes-base.slack', date: '2022-12-21T11:23:00.561Z' }],
 	};
 
-	const credential = await Db.collections.Credentials.save(credentialDetails);
+	const credential = await Container.get(CredentialsRepository).save(credentialDetails);
 
 	const workflowDetails = {
 		id: generateNanoId(),
@@ -144,12 +152,12 @@ test('should report credential in not recently executed workflow', async () => {
 		],
 	};
 
-	const workflow = await Db.collections.Workflow.save(workflowDetails);
+	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 Db.collections.Execution.save({
+	const savedExecution = await Container.get(ExecutionRepository).save({
 		finished: true,
 		mode: 'manual',
 		startedAt: date,
@@ -157,13 +165,13 @@ test('should report credential in not recently executed workflow', async () => {
 		workflowId: workflow.id,
 		waitTill: null,
 	});
-	await Db.collections.ExecutionData.save({
+	await Container.get(ExecutionDataRepository).save({
 		execution: savedExecution,
 		data: '[]',
 		workflowData: workflow,
 	});
 
-	const testAudit = await audit(['credentials']);
+	const testAudit = await securityAuditService.run(['credentials']);
 
 	const section = getRiskSection(
 		testAudit,
@@ -187,7 +195,7 @@ test('should not report credentials in recently executed workflow', async () =>
 		nodesAccess: [{ nodeType: 'n8n-nodes-base.slack', date: '2022-12-21T11:23:00.561Z' }],
 	};
 
-	const credential = await Db.collections.Credentials.save(credentialDetails);
+	const credential = await Container.get(CredentialsRepository).save(credentialDetails);
 
 	const workflowDetails = {
 		id: generateNanoId(),
@@ -212,12 +220,12 @@ test('should not report credentials in recently executed workflow', async () =>
 		],
 	};
 
-	const workflow = await Db.collections.Workflow.save(workflowDetails);
+	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 Db.collections.Execution.save({
+	const savedExecution = await Container.get(ExecutionRepository).save({
 		finished: true,
 		mode: 'manual',
 		startedAt: date,
@@ -226,13 +234,13 @@ test('should not report credentials in recently executed workflow', async () =>
 		waitTill: null,
 	});
 
-	await Db.collections.ExecutionData.save({
+	await Container.get(ExecutionDataRepository).save({
 		execution: savedExecution,
 		data: '[]',
 		workflowData: workflow,
 	});
 
-	const testAudit = await audit(['credentials']);
+	const testAudit = await securityAuditService.run(['credentials']);
 
 	expect(testAudit).toBeEmptyArray();
 });
diff --git a/packages/cli/test/integration/audit/database.risk.test.ts b/packages/cli/test/integration/security-audit/DatabaseRiskReporter.test.ts
similarity index 82%
rename from packages/cli/test/integration/audit/database.risk.test.ts
rename to packages/cli/test/integration/security-audit/DatabaseRiskReporter.test.ts
index a4068f5d77..63c50caad9 100644
--- a/packages/cli/test/integration/audit/database.risk.test.ts
+++ b/packages/cli/test/integration/security-audit/DatabaseRiskReporter.test.ts
@@ -1,17 +1,22 @@
 import { v4 as uuid } from 'uuid';
-import * as Db from '@/Db';
-import { audit } from '@/audit';
+import { SecurityAuditService } from '@/security-audit/SecurityAudit.service';
 import {
 	DATABASE_REPORT,
 	SQL_NODE_TYPES,
 	SQL_NODE_TYPES_WITH_QUERY_PARAMS,
-} from '@/audit/constants';
+} 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 () => {
@@ -50,12 +55,12 @@ test('should report expressions in queries', async () => {
 			],
 		};
 
-		return Db.collections.Workflow.save(details);
+		return Container.get(WorkflowRepository).save(details);
 	});
 
 	await Promise.all(promises);
 
-	const testAudit = await audit(['database']);
+	const testAudit = await securityAuditService.run(['database']);
 
 	const section = getRiskSection(
 		testAudit,
@@ -105,12 +110,12 @@ test('should report expressions in query params', async () => {
 			],
 		};
 
-		return Db.collections.Workflow.save(details);
+		return Container.get(WorkflowRepository).save(details);
 	});
 
 	await Promise.all(promises);
 
-	const testAudit = await audit(['database']);
+	const testAudit = await securityAuditService.run(['database']);
 
 	const section = getRiskSection(
 		testAudit,
@@ -157,12 +162,12 @@ test('should report unused query params', async () => {
 			],
 		};
 
-		return Db.collections.Workflow.save(details);
+		return Container.get(WorkflowRepository).save(details);
 	});
 
 	await Promise.all(promises);
 
-	const testAudit = await audit(['database']);
+	const testAudit = await securityAuditService.run(['database']);
 
 	const section = getRiskSection(
 		testAudit,
@@ -182,7 +187,7 @@ test('should report unused query params', async () => {
 test('should not report non-database node', async () => {
 	await saveManualTriggerWorkflow();
 
-	const testAudit = await audit(['database']);
+	const testAudit = await securityAuditService.run(['database']);
 
 	expect(testAudit).toBeEmptyArray();
 });
diff --git a/packages/cli/test/integration/audit/filesystem.risk.test.ts b/packages/cli/test/integration/security-audit/FilesystemRiskReporter.test.ts
similarity index 70%
rename from packages/cli/test/integration/audit/filesystem.risk.test.ts
rename to packages/cli/test/integration/security-audit/FilesystemRiskReporter.test.ts
index d8f3e711e7..a3e3f69cc9 100644
--- a/packages/cli/test/integration/audit/filesystem.risk.test.ts
+++ b/packages/cli/test/integration/security-audit/FilesystemRiskReporter.test.ts
@@ -1,12 +1,17 @@
 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 { 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 () => {
@@ -26,7 +31,7 @@ test('should report filesystem interaction nodes', async () => {
 	);
 
 	const promises = Object.entries(map).map(async ([nodeType, nodeId]) => {
-		const details = Db.collections.Workflow.create({
+		const details = Container.get(WorkflowRepository).create({
 			name: 'My Test Workflow',
 			active: false,
 			connections: {},
@@ -42,12 +47,12 @@ test('should report filesystem interaction nodes', async () => {
 			],
 		});
 
-		return Db.collections.Workflow.save(details);
+		return Container.get(WorkflowRepository).save(details);
 	});
 
 	await Promise.all(promises);
 
-	const testAudit = await audit(['filesystem']);
+	const testAudit = await securityAuditService.run(['filesystem']);
 
 	const section = getRiskSection(
 		testAudit,
@@ -67,7 +72,7 @@ test('should report filesystem interaction nodes', async () => {
 test('should not report non-filesystem-interaction node', async () => {
 	await saveManualTriggerWorkflow();
 
-	const testAudit = await audit(['filesystem']);
+	const testAudit = await securityAuditService.run(['filesystem']);
 
 	expect(testAudit).toBeEmptyArray();
 });
diff --git a/packages/cli/test/integration/audit/instance.risk.test.ts b/packages/cli/test/integration/security-audit/InstanceRiskReporter.test.ts
similarity index 82%
rename from packages/cli/test/integration/audit/instance.risk.test.ts
rename to packages/cli/test/integration/security-audit/InstanceRiskReporter.test.ts
index aa186c4d7c..102ff1c6d6 100644
--- a/packages/cli/test/integration/audit/instance.risk.test.ts
+++ b/packages/cli/test/integration/security-audit/InstanceRiskReporter.test.ts
@@ -1,7 +1,6 @@
 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 { SecurityAuditService } from '@/security-audit/SecurityAudit.service';
+import { INSTANCE_REPORT, WEBHOOK_VALIDATOR_NODE_TYPES } from '@/security-audit/constants';
 import {
 	getRiskSection,
 	saveManualTriggerWorkflow,
@@ -10,13 +9,19 @@ import {
 	simulateUpToDateInstance,
 } from './utils';
 import * as testDb from '../shared/testDb';
-import { toReportTitle } from '@/audit/utils';
+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();
 });
 
@@ -53,9 +58,9 @@ test('should report webhook lacking authentication', async () => {
 		],
 	};
 
-	await Db.collections.Workflow.save(details);
+	await Container.get(WorkflowRepository).save(details);
 
-	const testAudit = await audit(['instance']);
+	const testAudit = await securityAuditService.run(['instance']);
 
 	const section = getRiskSection(
 		testAudit,
@@ -97,15 +102,17 @@ test('should not report webhooks having basic or header auth', async () => {
 			],
 		};
 
-		return Db.collections.Workflow.save(details);
+		return Container.get(WorkflowRepository).save(details);
 	});
 
 	await Promise.all(promises);
 
-	const testAudit = await audit(['instance']);
-	if (Array.isArray(testAudit)) fail('audit is empty');
+	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');
 	}
@@ -158,12 +165,12 @@ test('should not report webhooks validated by direct children', async () => {
 			},
 		};
 
-		return Db.collections.Workflow.save(details);
+		return Container.get(WorkflowRepository).save(details);
 	});
 
 	await Promise.all(promises);
 
-	const testAudit = await audit(['instance']);
+	const testAudit = await securityAuditService.run(['instance']);
 	if (Array.isArray(testAudit)) fail('audit is empty');
 
 	const report = testAudit[toReportTitle('instance')];
@@ -179,7 +186,7 @@ test('should not report webhooks validated by direct children', async () => {
 test('should not report non-webhook node', async () => {
 	await saveManualTriggerWorkflow();
 
-	const testAudit = await audit(['instance']);
+	const testAudit = await securityAuditService.run(['instance']);
 	if (Array.isArray(testAudit)) fail('audit is empty');
 
 	const report = testAudit[toReportTitle('instance')];
@@ -196,7 +203,7 @@ test('should not report non-webhook node', async () => {
 test('should report outdated instance when outdated', async () => {
 	simulateOutdatedInstanceOnce();
 
-	const testAudit = await audit(['instance']);
+	const testAudit = await securityAuditService.run(['instance']);
 
 	const section = getRiskSection(
 		testAudit,
@@ -214,7 +221,7 @@ test('should report outdated instance when outdated', async () => {
 });
 
 test('should not report outdated instance when up to date', async () => {
-	const testAudit = await audit(['instance']);
+	const testAudit = await securityAuditService.run(['instance']);
 	if (Array.isArray(testAudit)) fail('audit is empty');
 
 	const report = testAudit[toReportTitle('instance')];
@@ -230,7 +237,7 @@ test('should not report outdated instance when up to date', async () => {
 test('should report security settings', async () => {
 	config.set('diagnostics.enabled', true);
 
-	const testAudit = await audit(['instance']);
+	const testAudit = await securityAuditService.run(['instance']);
 
 	const section = getRiskSection(
 		testAudit,
diff --git a/packages/cli/test/integration/audit/nodes.risk.test.ts b/packages/cli/test/integration/security-audit/NodesRiskReporter.test.ts
similarity index 77%
rename from packages/cli/test/integration/audit/nodes.risk.test.ts
rename to packages/cli/test/integration/security-audit/NodesRiskReporter.test.ts
index 7a4940dfc1..f10dbee30e 100644
--- a/packages/cli/test/integration/audit/nodes.risk.test.ts
+++ b/packages/cli/test/integration/security-audit/NodesRiskReporter.test.ts
@@ -1,15 +1,16 @@
 import { v4 as uuid } from 'uuid';
 import { Container } from 'typedi';
-import * as Db from '@/Db';
-import { audit } from '@/audit';
-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 { 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([]);
@@ -17,8 +18,12 @@ 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 () => {
@@ -37,7 +42,7 @@ test('should report risky official nodes', async () => {
 	}, {});
 
 	const promises = Object.entries(map).map(async ([nodeType, nodeId]) => {
-		const details = Db.collections.Workflow.create({
+		const details = Container.get(WorkflowRepository).create({
 			name: 'My Test Workflow',
 			active: false,
 			connections: {},
@@ -53,12 +58,12 @@ test('should report risky official nodes', async () => {
 			],
 		});
 
-		return Db.collections.Workflow.save(details);
+		return Container.get(WorkflowRepository).save(details);
 	});
 
 	await Promise.all(promises);
 
-	const testAudit = await audit(['nodes']);
+	const testAudit = await securityAuditService.run(['nodes']);
 
 	const section = getRiskSection(
 		testAudit,
@@ -79,10 +84,12 @@ test('should not report non-risky official nodes', async () => {
 	communityPackagesService.getAllInstalledPackages.mockResolvedValue(MOCK_PACKAGE);
 	await saveManualTriggerWorkflow();
 
-	const testAudit = await audit(['nodes']);
+	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) {
@@ -93,7 +100,7 @@ test('should not report non-risky official nodes', async () => {
 test('should report community nodes', async () => {
 	communityPackagesService.getAllInstalledPackages.mockResolvedValue(MOCK_PACKAGE);
 
-	const testAudit = await audit(['nodes']);
+	const testAudit = await securityAuditService.run(['nodes']);
 
 	const section = getRiskSection(
 		testAudit,
diff --git a/packages/cli/test/integration/audit/utils.ts b/packages/cli/test/integration/security-audit/utils.ts
similarity index 92%
rename from packages/cli/test/integration/audit/utils.ts
rename to packages/cli/test/integration/security-audit/utils.ts
index 9a023fa5dd..1ad445e950 100644
--- a/packages/cli/test/integration/audit/utils.ts
+++ b/packages/cli/test/integration/security-audit/utils.ts
@@ -1,12 +1,13 @@
 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 { toReportTitle } from '@/security-audit/utils';
 import * as constants from '@/constants';
-import type { Risk } from '@/audit/types';
+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
@@ -52,7 +53,7 @@ export async function saveManualTriggerWorkflow() {
 		],
 	};
 
-	return Db.collections.Workflow.save(details);
+	return Container.get(WorkflowRepository).save(details);
 }
 
 export const MOCK_09990_N8N_VERSION = {
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 0000000000..67704e21ca
--- /dev/null
+++ b/packages/cli/test/integration/shared/db/credentials.ts
@@ -0,0 +1,71 @@
+import { CredentialsEntity } from '@db/entities/CredentialsEntity';
+import type { User } from '@db/entities/User';
+import type { Role } from '@db/entities/Role';
+import type { ICredentialsDb } from '@/Interfaces';
+import { RoleService } from '@/services/role.service';
+import type { CredentialPayload } from '../types';
+import Container from 'typedi';
+import { CredentialsRepository } from '@db/repositories/credentials.repository';
+import { SharedCredentialsRepository } from '@db/repositories/sharedCredentials.repository';
+
+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;
+}
+
+/**
+ * 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 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 role = await Container.get(RoleService).findCredentialUserRole();
+	const newSharedCredentials = users.map((user) =>
+		Container.get(SharedCredentialsRepository).create({
+			userId: user.id,
+			credentialsId: credential.id,
+			roleId: role?.id,
+		}),
+	);
+	return Container.get(SharedCredentialsRepository).save(newSharedCredentials);
+}
+
+export function affixRoleToSaveCredential(role: Role) {
+	return async (credentialPayload: CredentialPayload, { user }: { user: User }) =>
+		saveCredential(credentialPayload, { user, role });
+}
+
+export async function getAllCredentials() {
+	return Container.get(CredentialsRepository).find();
+}
+
+export const getCredentialById = async (id: string) =>
+	Container.get(CredentialsRepository).findOneBy({ id });
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 0000000000..f68e5edf36
--- /dev/null
+++ b/packages/cli/test/integration/shared/db/executions.ts
@@ -0,0 +1,69 @@
+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 (_) => callback(workflow));
+	return 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 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 createExecution({ finished: false, stoppedAt: new Date(), status: 'failed' }, 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(), status: 'waiting' }, workflow);
+}
+
+export async function getAllExecutions() {
+	return Container.get(ExecutionRepository).find();
+}
diff --git a/packages/cli/test/integration/shared/db/roles.ts b/packages/cli/test/integration/shared/db/roles.ts
new file mode 100644
index 0000000000..9be0c43193
--- /dev/null
+++ b/packages/cli/test/integration/shared/db/roles.ts
@@ -0,0 +1,35 @@
+import Container from 'typedi';
+import { RoleService } from '@/services/role.service';
+
+export async function getGlobalOwnerRole() {
+	return Container.get(RoleService).findGlobalOwnerRole();
+}
+
+export async function getGlobalMemberRole() {
+	return Container.get(RoleService).findGlobalMemberRole();
+}
+
+export async function getGlobalAdminRole() {
+	return Container.get(RoleService).findGlobalAdminRole();
+}
+
+export async function getWorkflowOwnerRole() {
+	return Container.get(RoleService).findWorkflowOwnerRole();
+}
+
+export async function getWorkflowEditorRole() {
+	return Container.get(RoleService).findWorkflowEditorRole();
+}
+
+export async function getCredentialOwnerRole() {
+	return Container.get(RoleService).findCredentialOwnerRole();
+}
+
+export async function getAllRoles() {
+	return Promise.all([
+		getGlobalOwnerRole(),
+		getGlobalMemberRole(),
+		getWorkflowOwnerRole(),
+		getCredentialOwnerRole(),
+	]);
+}
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 0000000000..53bfb2ef5c
--- /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 0000000000..ce7515b4b7
--- /dev/null
+++ b/packages/cli/test/integration/shared/db/users.ts
@@ -0,0 +1,146 @@
+import Container from 'typedi';
+import { hash } from 'bcryptjs';
+import { AuthIdentity } from '@db/entities/AuthIdentity';
+import type { Role } from '@db/entities/Role';
+import type { 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';
+import { getGlobalAdminRole, getGlobalMemberRole, getGlobalOwnerRole } from './roles';
+
+/**
+ * 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 = Container.get(UserRepository).create({
+		email: email ?? randomEmail(),
+		password: await hash(password ?? randomValidPassword(), 10),
+		firstName: firstName ?? randomName(),
+		lastName: lastName ?? randomName(),
+		globalRoleId: (globalRole ?? (await getGlobalMemberRole())).id,
+		globalRole,
+		...rest,
+	});
+	user.computeIsOwner();
+
+	return 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 createUser({ globalRole: await getGlobalOwnerRole() });
+}
+
+export async function createMember() {
+	return createUser({ globalRole: await getGlobalMemberRole() });
+}
+
+export async function createAdmin() {
+	return createUser({ globalRole: await getGlobalAdminRole() });
+}
+
+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 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[]> {
+	let { email, password, firstName, lastName, globalRole, ...rest } = attributes;
+	if (!globalRole) {
+		globalRole = await getGlobalMemberRole();
+	}
+
+	const users = await Promise.all(
+		[...Array(amount)].map(async () =>
+			Container.get(UserRepository).create({
+				email: email ?? randomEmail(),
+				password: await hash(password ?? randomValidPassword(), 10),
+				firstName: firstName ?? randomName(),
+				lastName: lastName ?? randomName(),
+				globalRole,
+				...rest,
+			}),
+		),
+	);
+
+	return Container.get(UserRepository).save(users);
+}
+
+export async function addApiKey(user: User): Promise<User> {
+	user.apiKey = randomApiKey();
+	return Container.get(UserRepository).save(user);
+}
+
+export const getAllUsers = async () =>
+	Container.get(UserRepository).find({
+		relations: ['globalRole', 'authIdentities'],
+	});
+
+export const getUserById = async (id: string) =>
+	Container.get(UserRepository).findOneOrFail({
+		where: { id },
+		relations: ['globalRole', 'authIdentities'],
+	});
+
+export const getLdapIdentities = async () =>
+	Container.get(AuthIdentityRepository).find({
+		where: { providerType: 'ldap' },
+		relations: ['user'],
+	});
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 0000000000..8233d80077
--- /dev/null
+++ b/packages/cli/test/integration/shared/db/workflowHistory.ts
@@ -0,0 +1,43 @@
+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 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 Promise.all(
+		[...Array(count)].map(async (_, i) =>
+			createWorkflowHistoryItem(workflowId, {
+				createdAt: new Date(baseTime + i),
+				updatedAt: new Date(baseTime + i),
+			}),
+		),
+	);
+}
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 0000000000..981b126cbd
--- /dev/null
+++ b/packages/cli/test/integration/shared/db/workflows.ts
@@ -0,0 +1,122 @@
+import Container from 'typedi';
+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 { getWorkflowEditorRole, getWorkflowOwnerRole } from './roles';
+
+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, 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,
+	});
+
+	const workflow = await Container.get(WorkflowRepository).save(workflowEntity);
+
+	if (user) {
+		await Container.get(SharedWorkflowRepository).save({
+			user,
+			workflow,
+			role: await getWorkflowOwnerRole(),
+		});
+	}
+	return workflow;
+}
+
+export async function shareWorkflowWithUsers(workflow: WorkflowEntity, users: User[]) {
+	const role = await getWorkflowEditorRole();
+	const sharedWorkflows = users.map((user) => ({
+		user,
+		workflow,
+		role,
+	}));
+	return Container.get(SharedWorkflowRepository).save(sharedWorkflows);
+}
+
+export async function getWorkflowSharing(workflow: WorkflowEntity) {
+	return 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 Container.get(WorkflowRepository).find();
+}
+
+export const getWorkflowById = async (id: string) =>
+	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 0000000000..3f9e736153
--- /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 0972ba5c18..98befbaa75 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';
 
@@ -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
diff --git a/packages/cli/test/integration/shared/testDb.ts b/packages/cli/test/integration/shared/testDb.ts
index 7187a67fb1..1ed5938895 100644
--- a/packages/cli/test/integration/shared/testDb.ts
+++ b/packages/cli/test/integration/shared/testDb.ts
@@ -1,42 +1,18 @@
 import type { DataSourceOptions as ConnectionOptions, Repository } from 'typeorm';
 import { DataSource as Connection } from 'typeorm';
 import { Container } from 'typedi';
-import { v4 as uuid } from 'uuid';
+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 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 type { ICredentialsDb } from '@/Interfaces';
-import { DB_INITIALIZATION_TIMEOUT } from './constants';
-import { randomApiKey, randomEmail, randomName, randomString, randomValidPassword } from './random';
-import type { CollectionName, CredentialPayload, PostgresSchemaSection } from './types';
-import type { ExecutionData } from '@db/entities/ExecutionData';
-import { generateNanoId } from '@db/utils/generators';
-import { RoleService } from '@/services/role.service';
-import { VariablesService } from '@/environments/variables/variables.service';
-import {
-	TagRepository,
-	WorkflowHistoryRepository,
-	WorkflowTagMappingRepository,
-} from '@/databases/repositories';
-import { separate } from '@/utils';
 
-import { randomPassword } from '@/Ldap/helpers';
-import { TOTPService } from '@/Mfa/totp.service';
-import { MfaService } from '@/Mfa/mfa.service';
-import type { WorkflowHistory } from '@/databases/entities/WorkflowHistory';
+import { DB_INITIALIZATION_TIMEOUT } from './constants';
+import { randomString } from './random';
+import type { PostgresSchemaSection } from './types';
 
 export type TestDBType = 'postgres' | 'mysql';
 
@@ -111,518 +87,41 @@ export async function terminate() {
 	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[]) {
-	const [tag, rest] = separate(collections, (c) => c === 'Tag');
-
-	if (tag.length) {
-		await Container.get(TagRepository).delete({});
-		await Container.get(WorkflowTagMappingRepository).delete({});
+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({});
 	}
-
-	for (const collection of rest) {
-		if (typeof collection === 'string') {
-			await Db.collections[collection].delete({});
-		} else {
-			// eslint-disable-next-line @typescript-eslint/no-explicit-any
-			await Container.get(collection as { new (): 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(RoleService).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,
-		globalRole,
-		...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 createUserWithMfaEnabled(
-	data: { numberOfRecoveryCodes: number } = { numberOfRecoveryCodes: 10 },
-) {
-	const email = randomEmail();
-	const password = randomPassword();
-
-	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 createUser({ globalRole: await getGlobalOwnerRole() });
-}
-
-export async function createMember() {
-	return createUser({ globalRole: await getGlobalMemberRole() });
-}
-
-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);
-}
-
-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(RoleService).findGlobalOwnerRole();
-}
-
-export async function getGlobalMemberRole() {
-	return Container.get(RoleService).findGlobalMemberRole();
-}
-
-export async function getWorkflowOwnerRole() {
-	return Container.get(RoleService).findWorkflowOwnerRole();
-}
-
-export async function getWorkflowEditorRole() {
-	return Container.get(RoleService).findWorkflowEditorRole();
-}
-
-export async function getCredentialOwnerRole() {
-	return Container.get(RoleService).findCredentialOwnerRole();
-}
-
-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.
- */
-export async function createExecution(
-	attributes: Partial<ExecutionEntity & ExecutionData>,
-	workflow: WorkflowEntity,
-) {
-	const { data, finished, mode, startedAt, stoppedAt, waitTill, status, deletedAt } = attributes;
-
-	const execution = await Db.collections.Execution.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 Db.collections.ExecutionData.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 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 createExecution({ finished: false, stoppedAt: new Date(), status: 'failed' }, 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(), status: 'waiting' }, workflow);
-}
-
-// ----------------------------------
-//          Tags
-// ----------------------------------
-
-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;
-}
-
-// ----------------------------------
-//          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, versionId } = attributes;
-
-	const workflowEntity = Db.collections.Workflow.create({
-		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 ?? {},
-		versionId: versionId ?? uuid(),
-		...attributes,
-	});
-
-	const workflow = await Db.collections.Workflow.save(workflowEntity);
-
-	if (user) {
-		await Db.collections.SharedWorkflow.save({
-			user,
-			workflow,
-			role: await getWorkflowOwnerRole(),
-		});
-	}
-	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();
-}
-
-export async function getAllExecutions() {
-	return Db.collections.Execution.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) {
-	const result = await Db.collections.Variables.save({
-		id: generateNanoId(),
-		key,
-		value,
-	});
-	await Container.get(VariablesService).updateCache();
-	return result;
-}
-
-export async function getVariableByKey(key: string) {
-	return Db.collections.Variables.findOne({
-		where: {
-			key,
-		},
-	});
-}
-
-export async function getVariableById(id: string) {
-	return Db.collections.Variables.findOne({
-		where: {
-			id,
-		},
-	});
-}
-
-// ----------------------------------
-//          workflow history
-// ----------------------------------
-
-export async function createWorkflowHistoryItem(
-	workflowId: string,
-	data?: Partial<WorkflowHistory>,
-) {
-	return 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 Promise.all(
-		[...Array(count)].map(async (_, i) =>
-			createWorkflowHistoryItem(workflowId, {
-				createdAt: new Date(baseTime + i),
-				updatedAt: new Date(baseTime + i),
-			}),
-		),
-	);
 }
 
 // ----------------------------------
@@ -679,16 +178,3 @@ const getDBOptions = (type: TestDBType, name: string) => ({
 	synchronize: false,
 	logging: false,
 });
-
-// ----------------------------------
-//            encryption
-// ----------------------------------
-
-async function encryptCredentialData(credential: CredentialsEntity) {
-	const coreCredential = createCredentialsFromCredentialsEntity(credential, true);
-
-	// @ts-ignore
-	coreCredential.setData(credential.data);
-
-	return coreCredential.getDataToSave() as ICredentialsDb;
-}
diff --git a/packages/cli/test/integration/shared/types.ts b/packages/cli/test/integration/shared/types.ts
index 10b39e52f7..6670fc1ff9 100644
--- a/packages/cli/test/integration/shared/types.ts
+++ b/packages/cli/test/integration/shared/types.ts
@@ -5,15 +5,10 @@ import type { Server } from 'http';
 
 import type { CredentialsEntity } from '@db/entities/CredentialsEntity';
 import type { User } from '@db/entities/User';
-import type { BooleanLicenseFeature, ICredentialsDb, IDatabaseCollections } from '@/Interfaces';
-import type { DataSource, Repository } from 'typeorm';
+import type { BooleanLicenseFeature, ICredentialsDb, NumericLicenseFeature } from '@/Interfaces';
+import type { LicenseMocker } from './license';
 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export type CollectionName =
-	| keyof IDatabaseCollections
-	| { new (dataSource: DataSource): Repository<any> };
-
-export type EndpointGroup =
+type EndpointGroup =
 	| 'me'
 	| 'users'
 	| 'auth'
@@ -35,12 +30,16 @@ export type EndpointGroup =
 	| 'metrics'
 	| 'executions'
 	| 'workflowHistory'
-	| 'binaryData';
+	| 'binaryData'
+	| 'role'
+	| 'invitations'
+	| 'debug';
 
 export interface SetupProps {
 	applyAuth?: boolean;
 	endpointGroups?: EndpointGroup[];
 	enabledFeatures?: BooleanLicenseFeature[];
+	quotas?: Partial<{ [K in NumericLicenseFeature]: number }>;
 }
 
 export interface TestServer {
@@ -49,6 +48,7 @@ export interface TestServer {
 	authAgentFor: (user: User) => SuperAgentTest;
 	publicApiAgentFor: (user: User) => SuperAgentTest;
 	authlessAgent: SuperAgentTest;
+	license: LicenseMocker;
 }
 
 export type CredentialPayload = {
diff --git a/packages/cli/test/integration/shared/utils/communityNodes.ts b/packages/cli/test/integration/shared/utils/communityNodes.ts
index c5cf10591f..1587313c51 100644
--- a/packages/cli/test/integration/shared/utils/communityNodes.ts
+++ b/packages/cli/test/integration/shared/utils/communityNodes.ts
@@ -3,7 +3,8 @@ import { InstalledPackages } from '@db/entities/InstalledPackages';
 
 import { randomName } from '../random';
 import { COMMUNITY_NODE_VERSION, COMMUNITY_PACKAGE_VERSION } from '../constants';
-import { InstalledNodesRepository, InstalledPackagesRepository } from '@/databases/repositories';
+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();
diff --git a/packages/cli/test/integration/shared/utils/index.ts b/packages/cli/test/integration/shared/utils/index.ts
index f4265e59e9..63fcd48621 100644
--- a/packages/cli/test/integration/shared/utils/index.ts
+++ b/packages/cli/test/integration/shared/utils/index.ts
@@ -1,6 +1,6 @@
 import { Container } from 'typedi';
 import { BinaryDataService } from 'n8n-core';
-import type { INode } from 'n8n-workflow';
+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';
@@ -10,14 +10,16 @@ import type request from 'supertest';
 import { v4 as uuid } from 'uuid';
 
 import config from '@/config';
-import * as Db from '@/Db';
 import { WorkflowEntity } from '@db/entities/WorkflowEntity';
-import { ActiveWorkflowRunner } from '@/ActiveWorkflowRunner';
 import { AUTH_COOKIE_NAME } from '@/constants';
 
 import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
+import { SettingsRepository } from '@db/repositories/settings.repository';
+import { mockNodeTypesData } from '../../../unit/Helpers';
+import { MultiMainSetup } from '@/services/orchestration/main/MultiMainSetup.ee';
+import { mockInstance } from '../../../shared/mocking';
+import { ExecutionsService } from '@/executions/executions.service';
 
-export { mockInstance } from './mocking';
 export { setupTestServer } from './testServer';
 
 // ----------------------------------
@@ -27,7 +29,11 @@ export { setupTestServer } from './testServer';
 /**
  * Initialize node types.
  */
-export async function initActiveWorkflowRunner(): Promise<ActiveWorkflowRunner> {
+export async function initActiveWorkflowRunner() {
+	mockInstance(MultiMainSetup);
+
+	mockInstance(ExecutionsService);
+	const { ActiveWorkflowRunner } = await import('@/ActiveWorkflowRunner');
 	const workflowRunner = Container.get(ActiveWorkflowRunner);
 	await workflowRunner.init();
 	return workflowRunner;
@@ -106,7 +112,7 @@ export function getAuthToken(response: request.Response, authCookieName = AUTH_C
 // ----------------------------------
 
 export async function isInstanceOwnerSetUp() {
-	const { value } = await Db.collections.Settings.findOneByOrFail({
+	const { value } = await Container.get(SettingsRepository).findOneByOrFail({
 		key: 'userManagement.isInstanceOwnerSetUp',
 	});
 
@@ -116,7 +122,7 @@ export async function isInstanceOwnerSetUp() {
 export const setInstanceOwnerSetUp = async (value: boolean) => {
 	config.set('userManagement.isInstanceOwnerSetUp', value);
 
-	await Db.collections.Settings.update(
+	await Container.get(SettingsRepository).update(
 		{ key: 'userManagement.isInstanceOwnerSetUp' },
 		{ value: JSON.stringify(value) },
 	);
@@ -166,3 +172,15 @@ export function makeWorkflow(options?: {
 }
 
 export const MOCK_PINDATA = { Spotify: [{ json: { myKey: 'myValue' } }] };
+
+export function setSchedulerAsLoadedNode() {
+	const nodesAndCredentials = mockInstance(LoadNodesAndCredentials);
+
+	Object.assign(nodesAndCredentials, {
+		loadedNodes: mockNodeTypesData(['scheduleTrigger'], {
+			addTrigger: true,
+		}),
+		known: { nodes: {}, credentials: {} },
+		types: { nodes: [], credentials: [] },
+	});
+}
diff --git a/packages/cli/test/integration/shared/utils/testServer.ts b/packages/cli/test/integration/shared/utils/testServer.ts
index d22f496d53..cb6dc1355f 100644
--- a/packages/cli/test/integration/shared/utils/testServer.ts
+++ b/packages/cli/test/integration/shared/utils/testServer.ts
@@ -6,60 +6,21 @@ import request from 'supertest';
 import { URL } from 'url';
 
 import config from '@/config';
-import { ExternalHooks } from '@/ExternalHooks';
-import { ActiveWorkflowRunner } from '@/ActiveWorkflowRunner';
-import { workflowsController } from '@/workflows/workflows.controller';
 import { AUTH_COOKIE_NAME } from '@/constants';
-import { credentialsController } from '@/credentials/credentials.controller';
 import type { User } from '@db/entities/User';
-import { loadPublicApiVersions } from '@/PublicApi/';
 import { issueJWT } from '@/auth/jwt';
-import { UserManagementMailer } from '@/UserManagement/email/UserManagementMailer';
-import { licenseController } from '@/license/license.controller';
 import { registerController } from '@/decorators';
-import {
-	AuthController,
-	LdapController,
-	MFAController,
-	MeController,
-	OwnerController,
-	PasswordResetController,
-	TagsController,
-	UsersController,
-} from '@/controllers';
 import { rawBodyReader, bodyParser, setupAuthMiddlewares } from '@/middlewares';
-
-import { InternalHooks } from '@/InternalHooks';
 import { PostHogClient } from '@/posthog';
-import { variablesController } from '@/environments/variables/variables.controller';
-import { LdapManager } from '@/Ldap/LdapManager.ee';
-import { handleLdapInit } from '@/Ldap/helpers';
-import { setSamlLoginEnabled } from '@/sso/saml/samlHelpers';
-import { SamlController } from '@/sso/saml/routes/saml.controller.ee';
-import { EventBusController } from '@/eventbus/eventBus.controller';
-import { EventBusControllerEE } from '@/eventbus/eventBus.controller.ee';
 import { License } from '@/License';
-import { SourceControlController } from '@/environments/sourceControl/sourceControl.controller.ee';
+import { Logger } from '@/Logger';
+import { InternalHooks } from '@/InternalHooks';
 
+import { mockInstance } from '../../../shared/mocking';
 import * as testDb from '../../shared/testDb';
 import { AUTHLESS_ENDPOINTS, PUBLIC_API_REST_PATH_SEGMENT, REST_PATH_SEGMENT } from '../constants';
-import type { EndpointGroup, SetupProps, TestServer } from '../types';
-import { mockInstance } from './mocking';
-import { ExternalSecretsController } from '@/ExternalSecrets/ExternalSecrets.controller.ee';
-import { MfaService } from '@/Mfa/mfa.service';
-import { MetricsService } from '@/services/metrics.service';
-import {
-	SettingsRepository,
-	SharedCredentialsRepository,
-	SharedWorkflowRepository,
-} from '@/databases/repositories';
-import { JwtService } from '@/services/jwt.service';
-import { RoleService } from '@/services/role.service';
-import { UserService } from '@/services/user.service';
-import { executionsController } from '@/executions/executions.controller';
-import { WorkflowHistoryController } from '@/workflows/workflowHistory/workflowHistory.controller.ee';
-import { BinaryDataController } from '@/controllers/binaryData.controller';
-import { Logger } from '@/Logger';
+import type { SetupProps, TestServer } from '../types';
+import { LicenseMocker } from '../license';
 
 /**
  * Plugin to prefix a path segment into a request URL pathname.
@@ -81,30 +42,6 @@ function prefix(pathSegment: string) {
 	};
 }
 
-/**
- * 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',
-		'executions',
-	];
-
-	endpointGroups.forEach((group) =>
-		(ROUTER_GROUP.includes(group) ? routerEndpoints : functionEndpoints).push(group),
-	);
-
-	return [routerEndpoints, functionEndpoints];
-};
-
 function createAgent(app: express.Application, options?: { auth: boolean; user: User }) {
 	const agent = request.agent(app);
 	void agent.use(prefix(REST_PATH_SEGMENT));
@@ -131,13 +68,14 @@ export const setupTestServer = ({
 	endpointGroups,
 	applyAuth = true,
 	enabledFeatures,
+	quotas,
 }: SetupProps): TestServer => {
 	const app = express();
 	app.use(rawBodyReader);
 	app.use(cookieParser());
 
 	// Mock all telemetry and logging
-	const logger = mockInstance(Logger);
+	mockInstance(Logger);
 	mockInstance(InternalHooks);
 	mockInstance(PostHogClient);
 
@@ -147,6 +85,7 @@ export const setupTestServer = ({
 		authAgentFor: (user: User) => createAgent(app, { auth: true, user }),
 		authlessAgent: createAgent(app),
 		publicApiAgentFor: (user) => publicApiAgent(app, { user }),
+		license: new LicenseMocker(),
 	};
 
 	beforeAll(async () => {
@@ -155,8 +94,12 @@ export const setupTestServer = ({
 		config.set('userManagement.jwtSecret', 'My JWT secret');
 		config.set('userManagement.isInstanceOwnerSetUp', true);
 
+		testServer.license.mock(Container.get(License));
 		if (enabledFeatures) {
-			Container.get(License).isFeatureEnabled = (feature) => enabledFeatures.includes(feature);
+			testServer.license.setDefaults({
+				features: enabledFeatures,
+				quotas,
+			});
 		}
 
 		const enablePublicAPI = endpointGroups?.includes('publicApi');
@@ -168,131 +111,152 @@ export const setupTestServer = ({
 
 		app.use(bodyParser);
 
-		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' },
-				executions: { controller: executionsController, path: 'executions' },
-			};
-
-			if (enablePublicAPI) {
-				const { apiRouters } = await loadPublicApiVersions(PUBLIC_API_REST_PATH_SEGMENT);
-				map.publicApi = apiRouters;
-			}
-
-			for (const group of routerEndpoints) {
-				if (group === 'publicApi') {
-					app.use(...(map[group] as express.Router[]));
-				} else {
-					app.use(`/${REST_PATH_SEGMENT}/${map[group].path}`, map[group].controller);
-				}
-			}
+		if (enablePublicAPI) {
+			const { loadPublicApiVersions } = await import('@/PublicApi');
+			const { apiRouters } = await loadPublicApiVersions(PUBLIC_API_REST_PATH_SEGMENT);
+			app.use(...apiRouters);
 		}
 
-		if (functionEndpoints.length) {
-			const externalHooks = Container.get(ExternalHooks);
-			const internalHooks = Container.get(InternalHooks);
-			const mailer = Container.get(UserManagementMailer);
-			const mfaService = Container.get(MfaService);
-			const userService = Container.get(UserService);
-
-			for (const group of functionEndpoints) {
+		if (endpointGroups.length) {
+			for (const group of endpointGroups) {
 				switch (group) {
+					case 'credentials':
+						const { credentialsController } = await import('@/credentials/credentials.controller');
+						app.use(`/${REST_PATH_SEGMENT}/credentials`, credentialsController);
+						break;
+
+					case 'workflows':
+						const { WorkflowsController } = await import('@/workflows/workflows.controller');
+						registerController(app, WorkflowsController);
+						break;
+
+					case 'executions':
+						const { executionsController } = await import('@/executions/executions.controller');
+						app.use(`/${REST_PATH_SEGMENT}/executions`, 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':
-						registerController(app, config, new EventBusController());
-						registerController(app, config, new EventBusControllerEE());
+						const { EventBusController } = await import('@/eventbus/eventBus.controller');
+						const { EventBusControllerEE } = await import('@/eventbus/eventBus.controller.ee');
+						registerController(app, EventBusController);
+						registerController(app, EventBusControllerEE);
 						break;
+
 					case 'auth':
-						registerController(app, config, Container.get(AuthController));
+						const { AuthController } = await import('@/controllers/auth.controller');
+						registerController(app, AuthController);
 						break;
+
 					case 'mfa':
-						registerController(app, config, new MFAController(mfaService));
+						const { MFAController } = await import('@/controllers/mfa.controller');
+						registerController(app, MFAController);
+						break;
+
 					case 'ldap':
-						Container.get(License).isLdapEnabled = () => true;
-						await handleLdapInit();
-						const { service, sync } = LdapManager.getInstance();
-						registerController(app, config, new LdapController(service, sync, internalHooks));
+						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, config, Container.get(SamlController));
+						registerController(app, SamlController);
 						break;
+
 					case 'sourceControl':
-						registerController(app, config, Container.get(SourceControlController));
+						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, config, Container.get(CommunityPackagesController));
+						registerController(app, CommunityPackagesController);
+						break;
+
 					case 'me':
-						registerController(app, config, Container.get(MeController));
+						const { MeController } = await import('@/controllers/me.controller');
+						registerController(app, MeController);
 						break;
+
 					case 'passwordReset':
-						registerController(
-							app,
-							config,
-							new PasswordResetController(
-								logger,
-								externalHooks,
-								internalHooks,
-								mailer,
-								userService,
-								Container.get(JwtService),
-								mfaService,
-							),
+						const { PasswordResetController } = await import(
+							'@/controllers/passwordReset.controller'
 						);
+						registerController(app, PasswordResetController);
 						break;
+
 					case 'owner':
-						registerController(
-							app,
-							config,
-							new OwnerController(
-								config,
-								logger,
-								internalHooks,
-								Container.get(SettingsRepository),
-								userService,
-							),
-						);
+						const { OwnerController } = await import('@/controllers/owner.controller');
+						registerController(app, OwnerController);
 						break;
+
 					case 'users':
-						registerController(
-							app,
-							config,
-							new UsersController(
-								config,
-								logger,
-								externalHooks,
-								internalHooks,
-								Container.get(SharedCredentialsRepository),
-								Container.get(SharedWorkflowRepository),
-								Container.get(ActiveWorkflowRunner),
-								mailer,
-								Container.get(JwtService),
-								Container.get(RoleService),
-								userService,
-							),
-						);
+						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':
-						registerController(app, config, Container.get(TagsController));
+						const { TagsController } = await import('@/controllers/tags.controller');
+						registerController(app, TagsController);
 						break;
+
 					case 'externalSecrets':
-						registerController(app, config, Container.get(ExternalSecretsController));
+						const { ExternalSecretsController } = await import(
+							'@/ExternalSecrets/ExternalSecrets.controller.ee'
+						);
+						registerController(app, ExternalSecretsController);
 						break;
+
 					case 'workflowHistory':
-						registerController(app, config, Container.get(WorkflowHistoryController));
+						const { WorkflowHistoryController } = await import(
+							'@/workflows/workflowHistory/workflowHistory.controller.ee'
+						);
+						registerController(app, WorkflowHistoryController);
 						break;
+
 					case 'binaryData':
-						registerController(app, config, Container.get(BinaryDataController));
+						const { BinaryDataController } = await import('@/controllers/binaryData.controller');
+						registerController(app, BinaryDataController);
+						break;
+
+					case 'role':
+						const { RoleController } = await import('@/controllers/role.controller');
+						registerController(app, RoleController);
+						break;
+
+					case 'debug':
+						const { DebugController } = await import('@/controllers/debug.controller');
+						registerController(app, DebugController);
 						break;
 				}
 			}
@@ -304,5 +268,9 @@ export const setupTestServer = ({
 		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 0000000000..c2b4d6be9b
--- /dev/null
+++ b/packages/cli/test/integration/shared/utils/users.ts
@@ -0,0 +1,45 @@
+import validator from 'validator';
+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.globalRole).toBeDefined();
+};
+
+export const assertInviteUserSuccessResponse = (data: UserInvitationResponse) => {
+	expect(validator.isUUID(data.user.id)).toBe(true);
+	expect(data.user.inviteAcceptUrl).toBeUndefined();
+	expect(data.user.email).toBeDefined();
+	expect(data.user.emailSent).toBe(true);
+};
+
+export const assertInviteUserErrorResponse = (data: UserInvitationResponse) => {
+	expect(validator.isUUID(data.user.id)).toBe(true);
+	expect(data.user.inviteAcceptUrl).toBeDefined();
+	expect(data.user.email).toBeDefined();
+	expect(data.user.emailSent).toBe(false);
+	expect(data.error).toBeDefined();
+};
+
+export const assertInvitedUsersOnDb = (user: User) => {
+	expect(user.firstName).toBeNull();
+	expect(user.lastName).toBeNull();
+	expect(user.personalizationAnswers).toBeNull();
+	expect(user.password).toBeNull();
+	expect(user.isPending).toBe(true);
+};
+
+export type UserInvitationResponse = {
+	user: Pick<User, 'id' | 'email'> & { inviteAcceptUrl: string; emailSent: boolean };
+	error?: string;
+};
diff --git a/packages/cli/test/integration/tags.api.test.ts b/packages/cli/test/integration/tags.api.test.ts
index eabe0d931f..bc44fdf00d 100644
--- a/packages/cli/test/integration/tags.api.test.ts
+++ b/packages/cli/test/integration/tags.api.test.ts
@@ -1,15 +1,17 @@
 import * as utils from './shared/utils/';
 import * as testDb from './shared/testDb';
 import type { SuperAgentTest } from 'supertest';
-import { TagRepository } from '@/databases/repositories';
+import { TagRepository } from '@db/repositories/tag.repository';
 import Container from 'typedi';
+import { getGlobalOwnerRole } from './shared/db/roles';
+import { createUserShell } from './shared/db/users';
 
 let authOwnerAgent: SuperAgentTest;
 const testServer = utils.setupTestServer({ endpointGroups: ['tags'] });
 
 beforeAll(async () => {
-	const globalOwnerRole = await testDb.getGlobalOwnerRole();
-	const ownerShell = await testDb.createUserShell(globalOwnerRole);
+	const globalOwnerRole = await getGlobalOwnerRole();
+	const ownerShell = await createUserShell(globalOwnerRole);
 	authOwnerAgent = testServer.authAgentFor(ownerShell);
 });
 
diff --git a/packages/cli/test/integration/users.api.test.ts b/packages/cli/test/integration/users.api.test.ts
index 1373e3a0c5..94818e034e 100644
--- a/packages/cli/test/integration/users.api.test.ts
+++ b/packages/cli/test/integration/users.api.test.ts
@@ -1,415 +1,642 @@
-import validator from 'validator';
-import { Not } from 'typeorm';
-import type { SuperAgentTest } from 'supertest';
+import Container from 'typedi';
+import { UserRepository } from '@db/repositories/user.repository';
 
-import * as Db from '@/Db';
-import { CredentialsEntity } from '@db/entities/CredentialsEntity';
+import { UsersController } from '@/controllers/users.controller';
+import { SharedCredentialsRepository } from '@db/repositories/sharedCredentials.repository';
+import { SharedWorkflowRepository } from '@db/repositories/sharedWorkflow.repository';
+
+import { getCredentialById, saveCredential } from './shared/db/credentials';
+import { getCredentialOwnerRole, getWorkflowOwnerRole } from './shared/db/roles';
+import { createAdmin, createMember, createOwner, getUserById } from './shared/db/users';
+import { createWorkflow, getWorkflowById } from './shared/db/workflows';
+import { SUCCESS_RESPONSE_BODY } from './shared/constants';
+import { validateUser } from './shared/utils/users';
+import { randomName } from './shared/random';
+import * as utils from './shared/utils/';
+import * as testDb from './shared/testDb';
+
+import type { SuperAgentTest } from 'supertest';
 import type { Role } from '@db/entities/Role';
 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 { ExecutionsService } from '@/executions/executions.service';
+import { mockInstance } from '../shared/mocking';
 
-import { SUCCESS_RESPONSE_BODY } from './shared/constants';
-import {
-	randomCredentialPayload,
-	randomEmail,
-	randomInvalidPassword,
-	randomName,
-	randomValidPassword,
-} from './shared/random';
-import * as testDb from './shared/testDb';
-import * as utils from './shared/utils/';
+mockInstance(ExecutionsService);
 
-let globalMemberRole: Role;
-let workflowOwnerRole: Role;
-let credentialOwnerRole: Role;
-let owner: User;
-let authOwnerAgent: SuperAgentTest;
-
-const mailer = utils.mockInstance(UserManagementMailer, { isEmailSetUp: true });
-
-const testServer = utils.setupTestServer({ endpointGroups: ['users'] });
-
-beforeAll(async () => {
-	const [
-		globalOwnerRole,
-		fetchedGlobalMemberRole,
-		fetchedWorkflowOwnerRole,
-		fetchedCredentialOwnerRole,
-	] = await testDb.getAllRoles();
-
-	globalMemberRole = fetchedGlobalMemberRole;
-	workflowOwnerRole = fetchedWorkflowOwnerRole;
-	credentialOwnerRole = fetchedCredentialOwnerRole;
-
-	owner = await testDb.createUser({ globalRole: globalOwnerRole });
-
-	authOwnerAgent = testServer.authAgentFor(owner);
+const testServer = utils.setupTestServer({
+	endpointGroups: ['users'],
+	enabledFeatures: ['feat:advancedPermissions'],
 });
 
-beforeEach(async () => {
-	await testDb.truncate(['SharedCredentials', 'SharedWorkflow', 'Workflow', 'Credentials']);
-	await Db.collections.User.delete({ id: Not(owner.id) });
+describe('GET /users', () => {
+	let owner: User;
+	let member: User;
+	let ownerAgent: SuperAgentTest;
 
-	mailer.invite.mockResolvedValue({ emailSent: true });
+	beforeAll(async () => {
+		await testDb.truncate(['User']);
+
+		owner = await createOwner();
+		member = await createMember();
+		await createMember();
+
+		ownerAgent = testServer.authAgentFor(owner);
+	});
+
+	test('should return all users', async () => {
+		const response = await ownerAgent.get('/users').expect(200);
+
+		expect(response.body.data).toHaveLength(3);
+
+		response.body.data.forEach(validateUser);
+	});
+
+	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);
+
+				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={ "email": "non@existing.com" }')
+					.expect(200);
+
+				expect(_response.body.data).toHaveLength(0);
+			});
+
+			test('should filter users by field: firstName', async () => {
+				const response = await ownerAgent
+					.get('/users')
+					.query(`filter={ "firstName": "${member.firstName}" }`)
+					.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={ "firstName": "Non-Existing" }')
+					.expect(200);
+
+				expect(_response.body.data).toHaveLength(0);
+			});
+
+			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);
+			});
+		});
+
+		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) },
+					],
+				});
+			});
+
+			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) },
+					],
+				});
+			});
+		});
+
+		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);
+
+				_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:
+			 *
+			 * - `isOwner` requires `globalRole`
+			 * - `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', () => {
-	test('should delete the user', async () => {
-		const userToDelete = await testDb.createUser({ globalRole: globalMemberRole });
+	let owner: User;
+	let member: User;
+	let ownerAgent: SuperAgentTest;
+	let workflowOwnerRole: Role;
+	let credentialOwnerRole: Role;
 
-		const newWorkflow = new WorkflowEntity();
+	beforeAll(async () => {
+		await testDb.truncate(['User']);
 
-		Object.assign(newWorkflow, {
-			name: randomName(),
-			active: false,
-			connections: {},
-			nodes: [],
-		});
+		owner = await createOwner();
+		member = await createMember();
+		ownerAgent = testServer.authAgentFor(owner);
 
-		const savedWorkflow = await Db.collections.Workflow.save(newWorkflow);
+		workflowOwnerRole = await getWorkflowOwnerRole();
+		credentialOwnerRole = await getCredentialOwnerRole();
+	});
 
-		await Db.collections.SharedWorkflow.save({
-			role: workflowOwnerRole,
-			user: userToDelete,
-			workflow: savedWorkflow,
-		});
+	test('should delete user and their resources', async () => {
+		const savedWorkflow = await createWorkflow({ name: randomName() }, member);
 
-		const newCredential = new CredentialsEntity();
+		const savedCredential = await saveCredential(
+			{ name: randomName(), type: '', data: {}, nodesAccess: [] },
+			{ user: member, role: credentialOwnerRole },
+		);
 
-		Object.assign(newCredential, {
-			name: randomName(),
-			data: '',
-			type: '',
-			nodesAccess: [],
-		});
-
-		const savedCredential = await Db.collections.Credentials.save(newCredential);
-
-		await Db.collections.SharedCredentials.save({
-			role: credentialOwnerRole,
-			user: userToDelete,
-			credentials: savedCredential,
-		});
-
-		const response = await authOwnerAgent.delete(`/users/${userToDelete.id}`);
+		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, roleId: workflowOwnerRole.id },
 		});
-		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 },
-		});
-		expect(sharedCredential).toBeNull(); // deleted
-
-		const workflow = await Db.collections.Workflow.findOneBy({ id: savedWorkflow.id });
-		expect(workflow).toBeNull(); // deleted
-
-		// TODO: Include active workflow and check whether webhook has been removed
-
-		const credential = await Db.collections.Credentials.findOneBy({ id: savedCredential.id });
-		expect(credential).toBeNull(); // deleted
-	});
-
-	test('should fail to delete self', async () => {
-		const response = await authOwnerAgent.delete(`/users/${owner.id}`);
-
-		expect(response.statusCode).toBe(400);
-
-		const user = await Db.collections.User.findOneBy({ id: 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,
+			where: { userId: member.id, roleId: credentialOwnerRole.id },
 		});
 
-		expect(response.statusCode).toBe(400);
+		const workflow = await getWorkflowById(savedWorkflow.id);
 
-		const user = await Db.collections.User.findOneBy({ id: idToDelete });
-		expect(user).toBeDefined();
+		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();
+
+		// restore
+
+		member = await createMember();
 	});
 
-	test('with transferId should perform transfer', async () => {
-		const userToDelete = await testDb.createUser({ globalRole: globalMemberRole });
+	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: {}, nodesAccess: [] },
+				{
+					user: member,
+					role: credentialOwnerRole,
+				},
+			),
+		]);
 
-		const savedWorkflow = await testDb.createWorkflow(undefined, userToDelete);
-
-		const savedCredential = await testDb.saveCredential(randomCredentialPayload(), {
-			user: userToDelete,
-			role: credentialOwnerRole,
-		});
-
-		const response = await authOwnerAgent.delete(`/users/${userToDelete.id}`).query({
+		const response = await ownerAgent.delete(`/users/${member.id}`).query({
 			transferId: owner.id,
 		});
 
 		expect(response.statusCode).toBe(200);
 
-		const sharedWorkflow = await Db.collections.SharedWorkflow.findOneOrFail({
-			relations: ['workflow'],
-			where: { userId: owner.id },
-		});
+		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(sharedWorkflow.workflow).toBeDefined();
+		expect(user).toBeNull();
 		expect(sharedWorkflow.workflow.id).toBe(savedWorkflow.id);
-
-		const sharedCredential = await Db.collections.SharedCredentials.findOneOrFail({
-			relations: ['credentials'],
-			where: { userId: owner.id },
-		});
-
-		expect(sharedCredential.credentials).toBeDefined();
 		expect(sharedCredential.credentials.id).toBe(savedCredential.id);
-
-		const deletedUser = await Db.collections.User.findOneBy({ id: userToDelete.id });
-
-		expect(deletedUser).toBeNull();
-	});
-});
-
-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 testServer.authlessAgent
-			.post(`/users/${memberShell.id}`)
-			.send(memberData);
-
-		const {
-			id,
-			email,
-			firstName,
-			lastName,
-			personalizationAnswers,
-			password,
-			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(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);
 	});
 
-	test('should fail with invalid inputs', async () => {
-		const memberShellEmail = randomEmail();
-
-		const memberShell = await Db.collections.User.save({
-			email: memberShellEmail,
-			globalRole: globalMemberRole,
-		});
-
-		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(),
-			},
-		];
-
-		for (const invalidPayload of invalidPayloads) {
-			const response = await testServer.authlessAgent
-				.post(`/users/${memberShell.id}`)
-				.send(invalidPayload);
-			expect(response.statusCode).toBe(400);
-
-			const storedUser = await Db.collections.User.findOneOrFail({
-				where: { email: memberShellEmail },
-			});
-
-			expect(storedUser.firstName).toBeNull();
-			expect(storedUser.lastName).toBeNull();
-			expect(storedUser.password).toBeNull();
-		}
-	});
-
-	test('should fail with already accepted invite', async () => {
-		const member = await testDb.createUser({ globalRole: globalMemberRole });
-
-		const newMemberData = {
-			inviterId: owner.id,
-			firstName: randomName(),
-			lastName: randomName(),
-			password: randomValidPassword(),
-		};
-
-		const response = await testServer.authlessAgent.post(`/users/${member.id}`).send(newMemberData);
+	test('should fail to delete self', async () => {
+		const response = await ownerAgent.delete(`/users/${owner.id}`);
 
 		expect(response.statusCode).toBe(400);
 
-		const storedMember = await Db.collections.User.findOneOrFail({
-			where: { email: member.email },
+		const user = await getUserById(owner.id);
+
+		expect(user).toBeDefined();
+	});
+
+	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(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);
+		expect(response.statusCode).toBe(400);
+
+		const user = await Container.get(UserRepository).findOneBy({ id: member.id });
+
+		expect(user).toBeDefined();
 	});
 });
 
-describe('POST /users', () => {
-	test('should succeed if emailing is not set up', async () => {
-		mailer.invite.mockResolvedValueOnce({ emailSent: false });
-		const response = await authOwnerAgent.post('/users').send([{ email: randomEmail() }]);
+describe('PATCH /users/:id/role', () => {
+	let owner: User;
+	let admin: User;
+	let otherAdmin: User;
+	let member: User;
+	let otherMember: User;
 
-		expect(response.statusCode).toBe(200);
-		expect(response.body.data[0].user.inviteAcceptUrl).toBeDefined();
+	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;
 	});
 
-	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);
+	describe('unauthenticated user', () => {
+		test('should receive 401', async () => {
+			const response = await authlessAgent.patch(`/users/${member.id}/role`).send({
+				newRoleName: 'admin',
+			});
 
-		const testEmails = [
-			randomEmail(),
-			randomEmail().toUpperCase(),
-			memberShell.email,
-			member.email,
-		];
-
-		const payload = testEmails.map((e) => ({ email: e }));
-
-		const response = await authOwnerAgent.post('/users').send(payload);
-
-		expect(response.statusCode).toBe(200);
-
-		for (const {
-			user: { id, email: receivedEmail, inviteAcceptUrl },
-			error,
-		} of response.body.data) {
-			expect(validator.isUUID(id)).toBe(true);
-			expect(id).not.toBe(member.id);
-			expect(inviteAcceptUrl).toBeUndefined();
-
-			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 } = storedUser;
-
-			expect(firstName).toBeNull();
-			expect(lastName).toBeNull();
-			expect(personalizationAnswers).toBeNull();
-			expect(password).toBeNull();
-		}
+			expect(response.statusCode).toBe(401);
+		});
 	});
 
-	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
-			}),
-		);
+	describe('Invalid payload should return 400 when newRoleName', () => {
+		test.each([
+			['is missing', {}],
+			['is `owner`', { newRoleName: 'owner' }],
+			['is an array', { newRoleName: ['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: member, admin',
+			);
+		});
 	});
 
-	test('should ignore an empty payload', async () => {
-		const response = await authOwnerAgent.post('/users').send([]);
+	describe('member', () => {
+		test('should fail to demote owner to member', async () => {
+			const response = await memberAgent.patch(`/users/${owner.id}/role`).send({
+				newRoleName: 'member',
+			});
 
-		const { data } = response.body;
+			expect(response.statusCode).toBe(403);
+			expect(response.body.message).toBe(UNAUTHORIZED);
+		});
 
-		expect(response.statusCode).toBe(200);
-		expect(Array.isArray(data)).toBe(true);
-		expect(data.length).toBe(0);
+		test('should fail to demote owner to admin', async () => {
+			const response = await memberAgent.patch(`/users/${owner.id}/role`).send({
+				newRoleName: 'admin',
+			});
 
-		const users = await Db.collections.User.find();
-		expect(users.length).toBe(1);
-	});
-});
-
-describe('POST /users/:id/reinvite', () => {
-	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);
-
-		expect(response.statusCode).toBe(200);
-
-		const { data } = response.body;
-		const invitedUserId = data[0].user.id;
-		const reinviteResponse = await authOwnerAgent.post(`/users/${invitedUserId}/reinvite`);
-
-		expect(reinviteResponse.statusCode).toBe(200);
-
-		const member = await testDb.createUser({ globalRole: globalMemberRole });
-		const reinviteMemberResponse = await authOwnerAgent.post(`/users/${member.id}/reinvite`);
-
-		expect(reinviteMemberResponse.statusCode).toBe(400);
+			expect(response.statusCode).toBe(403);
+			expect(response.body.message).toBe(UNAUTHORIZED);
+		});
+
+		test('should fail to demote admin to member', async () => {
+			const response = await memberAgent.patch(`/users/${admin.id}/role`).send({
+				newRoleName: 'member',
+			});
+
+			expect(response.statusCode).toBe(403);
+			expect(response.body.message).toBe(UNAUTHORIZED);
+		});
+
+		test('should fail to promote other member to owner', async () => {
+			const response = await memberAgent.patch(`/users/${otherMember.id}/role`).send({
+				newRoleName: 'owner',
+			});
+
+			expect(response.statusCode).toBe(403);
+			expect(response.body.message).toBe(UNAUTHORIZED);
+		});
+
+		test('should fail to promote other member to admin', async () => {
+			const response = await memberAgent.patch(`/users/${otherMember.id}/role`).send({
+				newRoleName: 'admin',
+			});
+
+			expect(response.statusCode).toBe(403);
+			expect(response.body.message).toBe(UNAUTHORIZED);
+		});
+
+		test('should fail to promote self to admin', async () => {
+			const response = await memberAgent.patch(`/users/${member.id}/role`).send({
+				newRoleName: 'admin',
+			});
+
+			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: 'owner',
+			});
+
+			expect(response.statusCode).toBe(403);
+			expect(response.body.message).toBe(UNAUTHORIZED);
+		});
+	});
+
+	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: 'member',
+				});
+
+			expect(response.statusCode).toBe(404);
+			expect(response.body.message).toBe(NO_USER);
+		});
+
+		test('should fail to demote owner to admin', async () => {
+			const response = await adminAgent.patch(`/users/${owner.id}/role`).send({
+				newRoleName: 'admin',
+			});
+
+			expect(response.statusCode).toBe(403);
+			expect(response.body.message).toBe(NO_ADMIN_ON_OWNER);
+		});
+
+		test('should fail to demote owner to member', async () => {
+			const response = await adminAgent.patch(`/users/${owner.id}/role`).send({
+				newRoleName: 'member',
+			});
+
+			expect(response.statusCode).toBe(403);
+			expect(response.body.message).toBe(NO_ADMIN_ON_OWNER);
+		});
+
+		test('should fail to promote member to admin if not licensed', async () => {
+			testServer.license.disable('feat:advancedPermissions');
+
+			const response = await adminAgent.patch(`/users/${member.id}/role`).send({
+				newRoleName: 'admin',
+			});
+
+			expect(response.statusCode).toBe(403);
+			expect(response.body.message).toBe('Plan lacks license for this feature');
+		});
+
+		test('should be able to demote admin to member', async () => {
+			const response = await adminAgent.patch(`/users/${otherAdmin.id}/role`).send({
+				newRoleName: 'member',
+			});
+
+			expect(response.statusCode).toBe(200);
+			expect(response.body.data).toStrictEqual({ success: true });
+
+			const user = await getUserById(otherAdmin.id);
+
+			expect(user.globalRole.scope).toBe('global');
+			expect(user.globalRole.name).toBe('member');
+
+			// restore other admin
+
+			otherAdmin = await createAdmin();
+			adminAgent = testServer.authAgentFor(otherAdmin);
+		});
+
+		test('should be able to demote self to member', async () => {
+			const response = await adminAgent.patch(`/users/${admin.id}/role`).send({
+				newRoleName: 'member',
+			});
+
+			expect(response.statusCode).toBe(200);
+			expect(response.body.data).toStrictEqual({ success: true });
+
+			const user = await getUserById(admin.id);
+
+			expect(user.globalRole.scope).toBe('global');
+			expect(user.globalRole.name).toBe('member');
+
+			// restore admin
+
+			admin = await createAdmin();
+			adminAgent = testServer.authAgentFor(admin);
+		});
+
+		test('should be able to promote member to admin if licensed', async () => {
+			const response = await adminAgent.patch(`/users/${member.id}/role`).send({
+				newRoleName: 'admin',
+			});
+
+			expect(response.statusCode).toBe(200);
+			expect(response.body.data).toStrictEqual({ success: true });
+
+			const user = await getUserById(admin.id);
+
+			expect(user.globalRole.scope).toBe('global');
+			expect(user.globalRole.name).toBe('admin');
+
+			// restore member
+
+			member = await createMember();
+			memberAgent = testServer.authAgentFor(member);
+		});
+	});
+
+	describe('owner', () => {
+		test('should fail to demote self to admin', async () => {
+			const response = await ownerAgent.patch(`/users/${owner.id}/role`).send({
+				newRoleName: 'admin',
+			});
+
+			expect(response.statusCode).toBe(403);
+			expect(response.body.message).toBe(NO_OWNER_ON_OWNER);
+		});
+
+		test('should fail to demote self to member', async () => {
+			const response = await ownerAgent.patch(`/users/${owner.id}/role`).send({
+				newRoleName: 'member',
+			});
+
+			expect(response.statusCode).toBe(403);
+			expect(response.body.message).toBe(NO_OWNER_ON_OWNER);
+		});
+
+		test('should fail to promote member to admin if not licensed', async () => {
+			testServer.license.disable('feat:advancedPermissions');
+
+			const response = await ownerAgent.patch(`/users/${member.id}/role`).send({
+				newRoleName: 'admin',
+			});
+
+			expect(response.statusCode).toBe(403);
+			expect(response.body.message).toBe('Plan lacks license for this feature');
+		});
+
+		test('should be able to promote member to admin if licensed', async () => {
+			const response = await ownerAgent.patch(`/users/${member.id}/role`).send({
+				newRoleName: 'admin',
+			});
+
+			expect(response.statusCode).toBe(200);
+			expect(response.body.data).toStrictEqual({ success: true });
+
+			const user = await getUserById(admin.id);
+
+			expect(user.globalRole.scope).toBe('global');
+			expect(user.globalRole.name).toBe('admin');
+
+			// restore member
+
+			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: 'member',
+			});
+
+			expect(response.statusCode).toBe(200);
+			expect(response.body.data).toStrictEqual({ success: true });
+
+			const user = await getUserById(admin.id);
+
+			expect(user.globalRole.scope).toBe('global');
+			expect(user.globalRole.name).toBe('member');
+
+			// restore admin
+
+			admin = await createAdmin();
+			adminAgent = testServer.authAgentFor(admin);
+		});
 	});
 });
diff --git a/packages/cli/test/integration/users.controller.test.ts b/packages/cli/test/integration/users.controller.test.ts
deleted file mode 100644
index 0dc5d41a28..0000000000
--- a/packages/cli/test/integration/users.controller.test.ts
+++ /dev/null
@@ -1,248 +0,0 @@
-import * as testDb from './shared/testDb';
-import { setupTestServer } from './shared/utils/';
-import type { User } from '@/databases/entities/User';
-import type { PublicUser } from '@/Interfaces';
-
-const { any } = expect;
-
-const testServer = setupTestServer({ endpointGroups: ['users'] });
-
-let owner: User;
-let member: User;
-
-beforeEach(async () => {
-	await testDb.truncate(['User']);
-	owner = await testDb.createOwner();
-	member = await testDb.createMember();
-});
-
-const validatePublicUser = (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.globalRole).toBeDefined();
-};
-
-describe('GET /users', () => {
-	test('should return all users', async () => {
-		const response = await testServer.authAgentFor(owner).get('/users').expect(200);
-
-		expect(response.body.data).toHaveLength(2);
-
-		response.body.data.forEach(validatePublicUser);
-
-		const _response = await testServer.authAgentFor(member).get('/users').expect(200);
-
-		expect(_response.body.data).toHaveLength(2);
-
-		_response.body.data.forEach(validatePublicUser);
-	});
-
-	describe('filter', () => {
-		test('should filter users by field: email', async () => {
-			const secondMember = await testDb.createMember();
-
-			const response = await testServer
-				.authAgentFor(owner)
-				.get('/users')
-				.query(`filter={ "email": "${secondMember.email}" }`)
-				.expect(200);
-
-			expect(response.body.data).toHaveLength(1);
-
-			const [user] = response.body.data;
-
-			expect(user.email).toBe(secondMember.email);
-
-			const _response = await testServer
-				.authAgentFor(owner)
-				.get('/users')
-				.query('filter={ "email": "non@existing.com" }')
-				.expect(200);
-
-			expect(_response.body.data).toHaveLength(0);
-		});
-
-		test('should filter users by field: firstName', async () => {
-			const secondMember = await testDb.createMember();
-
-			const response = await testServer
-				.authAgentFor(owner)
-				.get('/users')
-				.query(`filter={ "firstName": "${secondMember.firstName}" }`)
-				.expect(200);
-
-			expect(response.body.data).toHaveLength(1);
-
-			const [user] = response.body.data;
-
-			expect(user.email).toBe(secondMember.email);
-
-			const _response = await testServer
-				.authAgentFor(owner)
-				.get('/users')
-				.query('filter={ "firstName": "Non-Existing" }')
-				.expect(200);
-
-			expect(_response.body.data).toHaveLength(0);
-		});
-
-		test('should filter users by field: lastName', async () => {
-			const secondMember = await testDb.createMember();
-
-			const response = await testServer
-				.authAgentFor(owner)
-				.get('/users')
-				.query(`filter={ "lastName": "${secondMember.lastName}" }`)
-				.expect(200);
-
-			expect(response.body.data).toHaveLength(1);
-
-			const [user] = response.body.data;
-
-			expect(user.email).toBe(secondMember.email);
-
-			const _response = await testServer
-				.authAgentFor(owner)
-				.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 testServer
-				.authAgentFor(owner)
-				.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 testServer
-				.authAgentFor(owner)
-				.get('/users')
-				.query('filter={ "isOwner": false }')
-				.expect(200);
-
-			expect(_response.body.data).toHaveLength(1);
-
-			const [_user] = _response.body.data;
-
-			expect(_user.isOwner).toBe(false);
-		});
-	});
-
-	describe('select', () => {
-		test('should select user field: id', async () => {
-			const response = await testServer
-				.authAgentFor(owner)
-				.get('/users')
-				.query('select=["id"]')
-				.expect(200);
-
-			expect(response.body).toEqual({
-				data: [{ id: any(String) }, { id: any(String) }],
-			});
-		});
-
-		test('should select user field: email', async () => {
-			const response = await testServer
-				.authAgentFor(owner)
-				.get('/users')
-				.query('select=["email"]')
-				.expect(200);
-
-			expect(response.body).toEqual({
-				data: [{ email: any(String) }, { email: any(String) }],
-			});
-		});
-
-		test('should select user field: firstName', async () => {
-			const response = await testServer
-				.authAgentFor(owner)
-				.get('/users')
-				.query('select=["firstName"]')
-				.expect(200);
-
-			expect(response.body).toEqual({
-				data: [{ firstName: any(String) }, { firstName: any(String) }],
-			});
-		});
-
-		test('should select user field: lastName', async () => {
-			const response = await testServer
-				.authAgentFor(owner)
-				.get('/users')
-				.query('select=["lastName"]')
-				.expect(200);
-
-			expect(response.body).toEqual({
-				data: [{ lastName: any(String) }, { lastName: any(String) }],
-			});
-		});
-	});
-
-	describe('take', () => {
-		test('should return n users or less, without skip', async () => {
-			const response = await testServer
-				.authAgentFor(owner)
-				.get('/users')
-				.query('take=2')
-				.expect(200);
-
-			expect(response.body.data).toHaveLength(2);
-
-			response.body.data.forEach(validatePublicUser);
-
-			const _response = await testServer
-				.authAgentFor(owner)
-				.get('/users')
-				.query('take=1')
-				.expect(200);
-
-			expect(_response.body.data).toHaveLength(1);
-
-			_response.body.data.forEach(validatePublicUser);
-		});
-
-		test('should return n users or less, with skip', async () => {
-			const response = await testServer
-				.authAgentFor(owner)
-				.get('/users')
-				.query('take=1&skip=1')
-				.expect(200);
-
-			expect(response.body.data).toHaveLength(1);
-
-			response.body.data.forEach(validatePublicUser);
-		});
-	});
-
-	describe('combinations', () => {
-		test('should support options that require auxiliary fields', async () => {
-			// isOwner requires globalRole
-			// id-less select with take requires id
-
-			const response = await testServer
-				.authAgentFor(owner)
-				.get('/users')
-				.query('filter={ "isOwner": true }&select=["firstName"]&take=10')
-				.expect(200);
-
-			expect(response.body).toEqual({ data: [{ firstName: any(String) }] });
-		});
-	});
-});
diff --git a/packages/cli/test/integration/variables.test.ts b/packages/cli/test/integration/variables.test.ts
index 701e6c4b08..ae8f03fe91 100644
--- a/packages/cli/test/integration/variables.test.ts
+++ b/packages/cli/test/integration/variables.test.ts
@@ -1,33 +1,62 @@
+import Container from 'typedi';
 import type { SuperAgentTest } from 'supertest';
 import type { Variables } from '@db/entities/Variables';
-import { License } from '@/License';
+import { VariablesRepository } from '@db/repositories/variables.repository';
+import { generateNanoId } from '@db/utils/generators';
+import { VariablesService } from '@/environments/variables/variables.service.ee';
+
 import * as testDb from './shared/testDb';
 import * as utils from './shared/utils/';
+import { createOwner, createUser } from './shared/db/users';
 
 let authOwnerAgent: SuperAgentTest;
 let authMemberAgent: SuperAgentTest;
 
-const licenseLike = {
-	isVariablesEnabled: jest.fn().mockReturnValue(true),
-	getVariablesLimit: jest.fn().mockReturnValue(-1),
-	isWithinUsersLimit: jest.fn().mockReturnValue(true),
-};
-
 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 Container.get(VariablesRepository).findOne({
+		where: {
+			key,
+		},
+	});
+}
+
+async function getVariableById(id: string) {
+	return Container.get(VariablesRepository).findOne({
+		where: {
+			id,
+		},
+	});
+}
 
 beforeAll(async () => {
-	utils.mockInstance(License, licenseLike);
-
-	const owner = await testDb.createOwner();
+	const owner = await createOwner();
 	authOwnerAgent = testServer.authAgentFor(owner);
-	const member = await testDb.createUser();
+	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);
 });
 
 // ----------------------------------------
@@ -35,10 +64,7 @@ beforeEach(async () => {
 // ----------------------------------------
 describe('GET /variables', () => {
 	beforeEach(async () => {
-		await Promise.all([
-			testDb.createVariable('test1', 'value1'),
-			testDb.createVariable('test2', 'value2'),
-		]);
+		await Promise.all([createVariable('test1', 'value1'), createVariable('test2', 'value2')]);
 	});
 
 	test('should return all variables for an owner', async () => {
@@ -61,8 +87,8 @@ describe('GET /variables/:id', () => {
 	let var1: Variables, var2: Variables;
 	beforeEach(async () => {
 		[var1, var2] = await Promise.all([
-			testDb.createVariable('test1', 'value1'),
-			testDb.createVariable('test2', 'value2'),
+			createVariable('test1', 'value1'),
+			createVariable('test2', 'value2'),
 		]);
 	});
 
@@ -104,8 +130,8 @@ describe('POST /variables', () => {
 		expect(response.body.data.value).toBe(toCreate.value);
 
 		const [byId, byKey] = await Promise.all([
-			testDb.getVariableById(response.body.data.id),
-			testDb.getVariableByKey(toCreate.key),
+			getVariableById(response.body.data.id),
+			getVariableByKey(toCreate.key),
 		]);
 
 		expect(byId).not.toBeNull();
@@ -119,27 +145,27 @@ describe('POST /variables', () => {
 
 	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(401);
+		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 testDb.getVariableByKey(toCreate.key);
+		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 () => {
-		licenseLike.isVariablesEnabled.mockReturnValue(false);
+		license.disable('feat:variables');
 		const response = await authOwnerAgent.post('/variables').send(toCreate);
-		expect(response.statusCode).toBe(400);
+		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 testDb.getVariableByKey(toCreate.key);
+		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 testDb.createVariable(toCreate.key, toCreate.value);
+		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);
@@ -147,11 +173,11 @@ describe('POST /variables', () => {
 	});
 
 	test('should not fail if variable limit not reached', async () => {
-		licenseLike.getVariablesLimit.mockReturnValue(5);
+		license.setQuota('quota:maxVariables', 5);
 		let i = 1;
 		let toCreate = generatePayload(i);
 		while (i < 3) {
-			await testDb.createVariable(toCreate.key, toCreate.value);
+			await createVariable(toCreate.key, toCreate.value);
 			i++;
 			toCreate = generatePayload(i);
 		}
@@ -162,11 +188,11 @@ describe('POST /variables', () => {
 	});
 
 	test('should fail if variable limit reached', async () => {
-		licenseLike.getVariablesLimit.mockReturnValue(5);
+		license.setQuota('quota:maxVariables', 5);
 		let i = 1;
 		let toCreate = generatePayload(i);
 		while (i < 6) {
-			await testDb.createVariable(toCreate.key, toCreate.value);
+			await createVariable(toCreate.key, toCreate.value);
 			i++;
 			toCreate = generatePayload(i);
 		}
@@ -224,15 +250,15 @@ describe('PATCH /variables/:id', () => {
 	};
 
 	test('should modify existing variable if use is an owner', async () => {
-		const variable = await testDb.createVariable('test1', 'value1');
+		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([
-			testDb.getVariableById(response.body.data.id),
-			testDb.getVariableByKey(toModify.key),
+			getVariableById(response.body.data.id),
+			getVariableByKey(toModify.key),
 		]);
 
 		expect(byId).not.toBeNull();
@@ -245,15 +271,15 @@ describe('PATCH /variables/:id', () => {
 	});
 
 	test('should modify existing variable if use is an owner', async () => {
-		const variable = await testDb.createVariable('test1', 'value1');
+		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([
-			testDb.getVariableById(response.body.data.id),
-			testDb.getVariableByKey(toModify.key),
+			getVariableById(response.body.data.id),
+			getVariableByKey(toModify.key),
 		]);
 
 		expect(byId).not.toBeNull();
@@ -266,13 +292,13 @@ describe('PATCH /variables/:id', () => {
 	});
 
 	test('should not modify existing variable if use is a member', async () => {
-		const variable = await testDb.createVariable('test1', 'value1');
+		const variable = await createVariable('test1', 'value1');
 		const response = await authMemberAgent.patch(`/variables/${variable.id}`).send(toModify);
-		expect(response.statusCode).toBe(401);
+		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 testDb.getVariableById(variable.id);
+		const byId = await getVariableById(variable.id);
 		expect(byId).not.toBeNull();
 		expect(byId!.key).not.toBe(toModify.key);
 		expect(byId!.value).not.toBe(toModify.value);
@@ -280,15 +306,15 @@ describe('PATCH /variables/:id', () => {
 
 	test('should not modify existing variable if one with the same key exists', async () => {
 		const [var1, var2] = await Promise.all([
-			testDb.createVariable('test1', 'value1'),
-			testDb.createVariable(toModify.key, toModify.value),
+			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 testDb.getVariableById(var1.id);
+		const byId = await getVariableById(var1.id);
 		expect(byId).not.toBeNull();
 		expect(byId!.key).toBe(var1.key);
 		expect(byId!.value).toBe(var1.value);
@@ -301,15 +327,15 @@ describe('PATCH /variables/:id', () => {
 describe('DELETE /variables/:id', () => {
 	test('should delete a single variable for an owner', async () => {
 		const [var1, var2, var3] = await Promise.all([
-			testDb.createVariable('test1', 'value1'),
-			testDb.createVariable('test2', 'value2'),
-			testDb.createVariable('test3', 'value3'),
+			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 testDb.getVariableById(var1.id);
+		const byId = await getVariableById(var1.id);
 		expect(byId).toBeNull();
 
 		const getResponse = await authOwnerAgent.get('/variables');
@@ -318,15 +344,15 @@ describe('DELETE /variables/:id', () => {
 
 	test('should not delete a single variable for a member', async () => {
 		const [var1, var2, var3] = await Promise.all([
-			testDb.createVariable('test1', 'value1'),
-			testDb.createVariable('test2', 'value2'),
-			testDb.createVariable('test3', 'value3'),
+			createVariable('test1', 'value1'),
+			createVariable('test2', 'value2'),
+			createVariable('test3', 'value3'),
 		]);
 
 		const delResponse = await authMemberAgent.delete(`/variables/${var1.id}`);
-		expect(delResponse.statusCode).toBe(401);
+		expect(delResponse.statusCode).toBe(403);
 
-		const byId = await testDb.getVariableById(var1.id);
+		const byId = await getVariableById(var1.id);
 		expect(byId).not.toBeNull();
 
 		const getResponse = await authMemberAgent.get('/variables');
diff --git a/packages/cli/test/integration/webhooks.api.test.ts b/packages/cli/test/integration/webhooks.api.test.ts
index d38375f36d..37862be6aa 100644
--- a/packages/cli/test/integration/webhooks.api.test.ts
+++ b/packages/cli/test/integration/webhooks.api.test.ts
@@ -10,8 +10,11 @@ import { NodeTypes } from '@/NodeTypes';
 import { Push } from '@/push';
 import type { WorkflowEntity } from '@db/entities/WorkflowEntity';
 
-import { mockInstance, initActiveWorkflowRunner } from './shared/utils';
+import { mockInstance } from '../shared/mocking';
+import { initActiveWorkflowRunner } 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);
@@ -31,8 +34,8 @@ describe('Webhook API', () => {
 	describe('Content-Type support', () => {
 		beforeAll(async () => {
 			const node = new WebhookTestingNode();
-			const user = await testDb.createUser();
-			await testDb.createWorkflow(createWebhookWorkflow(node), user);
+			const user = await createUser();
+			await createWorkflow(createWebhookWorkflow(node), user);
 
 			const nodeTypes = mockInstance(NodeTypes);
 			nodeTypes.getByName.mockReturnValue(node);
@@ -134,8 +137,8 @@ describe('Webhook API', () => {
 	describe('Params support', () => {
 		beforeAll(async () => {
 			const node = new WebhookTestingNode();
-			const user = await testDb.createUser();
-			await testDb.createWorkflow(createWebhookWorkflow(node, ':variable', 'PATCH'), user);
+			const user = await createUser();
+			await createWorkflow(createWebhookWorkflow(node, ':variable', 'PATCH'), user);
 
 			const nodeTypes = mockInstance(NodeTypes);
 			nodeTypes.getByName.mockReturnValue(node);
diff --git a/packages/cli/test/integration/workflow.service.test.ts b/packages/cli/test/integration/workflow.service.test.ts
new file mode 100644
index 0000000000..b98fb8ff74
--- /dev/null
+++ b/packages/cli/test/integration/workflow.service.test.ts
@@ -0,0 +1,119 @@
+import Container from 'typedi';
+import { ActiveWorkflowRunner } from '@/ActiveWorkflowRunner';
+import * as testDb from './shared/testDb';
+import { WorkflowService } from '@/workflows/workflow.service';
+import { mockInstance } from '../shared/mocking';
+import { createOwner } from './shared/db/users';
+import { createWorkflow } from './shared/db/workflows';
+import { SharedWorkflowRepository } from '@/databases/repositories/sharedWorkflow.repository';
+import { mock } from 'jest-mock-extended';
+import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
+import { Telemetry } from '@/telemetry';
+import { MultiMainSetup } from '@/services/orchestration/main/MultiMainSetup.ee';
+
+let workflowService: WorkflowService;
+let activeWorkflowRunner: ActiveWorkflowRunner;
+let multiMainSetup: MultiMainSetup;
+
+beforeAll(async () => {
+	await testDb.init();
+
+	activeWorkflowRunner = mockInstance(ActiveWorkflowRunner);
+	multiMainSetup = mockInstance(MultiMainSetup);
+	mockInstance(Telemetry);
+
+	workflowService = new WorkflowService(
+		mock(),
+		mock(),
+		Container.get(SharedWorkflowRepository),
+		Container.get(WorkflowRepository),
+		mock(),
+		mock(),
+		mock(),
+		mock(),
+		mock(),
+		multiMainSetup,
+		mock(),
+		mock(),
+		mock(),
+		activeWorkflowRunner,
+	);
+});
+
+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(activeWorkflowRunner, 'remove');
+		const addSpy = jest.spyOn(activeWorkflowRunner, '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(activeWorkflowRunner, 'remove');
+		const addSpy = jest.spyOn(activeWorkflowRunner, '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();
+	});
+
+	test('should broadcast active workflow state change if state changed', async () => {
+		const owner = await createOwner();
+		const workflow = await createWorkflow({ active: true }, owner);
+
+		const publishSpy = jest.spyOn(multiMainSetup, 'publish');
+
+		workflow.active = false;
+		await workflowService.update(owner, workflow, workflow.id);
+
+		expect(publishSpy).toHaveBeenCalledTimes(1);
+		expect(publishSpy).toHaveBeenCalledWith(
+			'workflowActiveStateChanged',
+			expect.objectContaining({
+				newState: false,
+				oldState: true,
+				workflowId: workflow.id,
+			}),
+		);
+	});
+
+	test('should not broadcast active workflow state change if state did not change', async () => {
+		const owner = await createOwner();
+		const workflow = await createWorkflow({ active: true }, owner);
+
+		const publishSpy = jest.spyOn(multiMainSetup, 'publish');
+
+		await workflowService.update(owner, workflow, workflow.id);
+
+		expect(publishSpy).not.toHaveBeenCalled();
+	});
+});
diff --git a/packages/cli/test/integration/workflowHistory.api.test.ts b/packages/cli/test/integration/workflowHistory.api.test.ts
index 1a7fbe2bc0..b3beb574a3 100644
--- a/packages/cli/test/integration/workflowHistory.api.test.ts
+++ b/packages/cli/test/integration/workflowHistory.api.test.ts
@@ -1,75 +1,70 @@
 import type { SuperAgentTest } from 'supertest';
-import { License } from '@/License';
+import type { User } from '@db/entities/User';
+
 import * as testDb from './shared/testDb';
 import * as utils from './shared/utils/';
-import type { User } from '@/databases/entities/User';
-import { WorkflowHistoryRepository } from '@/databases/repositories';
+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 licenseLike = utils.mockInstance(License, {
-	isWorkflowHistoryLicensed: jest.fn().mockReturnValue(true),
-	isWithinUsersLimit: jest.fn().mockReturnValue(true),
+const testServer = utils.setupTestServer({
+	endpointGroups: ['workflowHistory'],
+	enabledFeatures: ['feat:workflowHistory'],
 });
 
-const testServer = utils.setupTestServer({ endpointGroups: ['workflowHistory'] });
-
 beforeAll(async () => {
-	owner = await testDb.createOwner();
+	owner = await createOwner();
 	authOwnerAgent = testServer.authAgentFor(owner);
-	member = await testDb.createUser();
+	member = await createUser();
 	authMemberAgent = testServer.authAgentFor(member);
 });
 
-beforeEach(() => {
-	licenseLike.isWorkflowHistoryLicensed.mockReturnValue(true);
-});
-
 afterEach(async () => {
-	await testDb.truncate(['Workflow', 'SharedWorkflow', WorkflowHistoryRepository]);
+	await testDb.truncate(['Workflow', 'SharedWorkflow', 'WorkflowHistory']);
 });
 
 describe('GET /workflow-history/:workflowId', () => {
 	test('should not work when license is not available', async () => {
-		licenseLike.isWorkflowHistoryLicensed.mockReturnValue(false);
+		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 testDb.createWorkflow(undefined, owner);
+		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 testDb.createWorkflow(undefined, owner);
+		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 testDb.createWorkflow(undefined, owner);
+		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 testDb.createWorkflow(undefined, owner);
+		const workflow = await createWorkflow(undefined, owner);
 		const versions = await Promise.all(
 			new Array(10)
 				.fill(undefined)
 				.map(async (_, i) =>
-					testDb.createWorkflowHistoryItem(workflow.id, { createdAt: new Date(Date.now() + i) }),
+					createWorkflowHistoryItem(workflow.id, { createdAt: new Date(Date.now() + i) }),
 				),
 		);
 
-		// eslint-disable-next-line @typescript-eslint/no-explicit-any
 		const last = versions.sort((a, b) => b.createdAt.valueOf() - a.createdAt.valueOf())[0]! as any;
 		delete last.nodes;
 		delete last.connections;
@@ -84,23 +79,20 @@ describe('GET /workflow-history/:workflowId', () => {
 	});
 
 	test('should return versions only for workflow id provided', async () => {
-		const workflow = await testDb.createWorkflow(undefined, owner);
-		const workflow2 = await testDb.createWorkflow(undefined, owner);
+		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) =>
-					testDb.createWorkflowHistoryItem(workflow.id, { createdAt: new Date(Date.now() + i) }),
+					createWorkflowHistoryItem(workflow.id, { createdAt: new Date(Date.now() + i) }),
 				),
 		);
 
 		const versions2 = await Promise.all(
-			new Array(10)
-				.fill(undefined)
-				.map(async (_) => testDb.createWorkflowHistoryItem(workflow2.id)),
+			new Array(10).fill(undefined).map(async (_) => createWorkflowHistoryItem(workflow2.id)),
 		);
 
-		// eslint-disable-next-line @typescript-eslint/no-explicit-any
 		const last = versions.sort((a, b) => b.createdAt.valueOf() - a.createdAt.valueOf())[0]! as any;
 		delete last.nodes;
 		delete last.connections;
@@ -115,16 +107,15 @@ describe('GET /workflow-history/:workflowId', () => {
 	});
 
 	test('should work with take parameter', async () => {
-		const workflow = await testDb.createWorkflow(undefined, owner);
+		const workflow = await createWorkflow(undefined, owner);
 		const versions = await Promise.all(
 			new Array(10)
 				.fill(undefined)
 				.map(async (_, i) =>
-					testDb.createWorkflowHistoryItem(workflow.id, { createdAt: new Date(Date.now() + i) }),
+					createWorkflowHistoryItem(workflow.id, { createdAt: new Date(Date.now() + i) }),
 				),
 		);
 
-		// eslint-disable-next-line @typescript-eslint/no-explicit-any
 		const last = versions.sort((a, b) => b.createdAt.valueOf() - a.createdAt.valueOf())[0]! as any;
 		delete last.nodes;
 		delete last.connections;
@@ -139,16 +130,15 @@ describe('GET /workflow-history/:workflowId', () => {
 	});
 
 	test('should work with skip parameter', async () => {
-		const workflow = await testDb.createWorkflow(undefined, owner);
+		const workflow = await createWorkflow(undefined, owner);
 		const versions = await Promise.all(
 			new Array(10)
 				.fill(undefined)
 				.map(async (_, i) =>
-					testDb.createWorkflowHistoryItem(workflow.id, { createdAt: new Date(Date.now() + i) }),
+					createWorkflowHistoryItem(workflow.id, { createdAt: new Date(Date.now() + i) }),
 				),
 		);
 
-		// eslint-disable-next-line @typescript-eslint/no-explicit-any
 		const last = versions.sort((a, b) => b.createdAt.valueOf() - a.createdAt.valueOf())[5]! as any;
 		delete last.nodes;
 		delete last.connections;
@@ -167,15 +157,15 @@ describe('GET /workflow-history/:workflowId', () => {
 
 describe('GET /workflow-history/workflow/:workflowId/version/:versionId', () => {
 	test('should not work when license is not available', async () => {
-		licenseLike.isWorkflowHistoryLicensed.mockReturnValue(false);
+		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 testDb.createWorkflow(undefined, owner);
-		const version = await testDb.createWorkflowHistoryItem(workflow.id);
+		const workflow = await createWorkflow(undefined, owner);
+		const version = await createWorkflowHistoryItem(workflow.id);
 		const resp = await authOwnerAgent.get(
 			`/workflow-history/workflow/badid/version/${version.versionId}`,
 		);
@@ -183,8 +173,8 @@ describe('GET /workflow-history/workflow/:workflowId/version/:versionId', () =>
 	});
 
 	test('should not return anything on an invalid version ID', async () => {
-		const workflow = await testDb.createWorkflow(undefined, owner);
-		await testDb.createWorkflowHistoryItem(workflow.id);
+		const workflow = await createWorkflow(undefined, owner);
+		await createWorkflowHistoryItem(workflow.id);
 		const resp = await authOwnerAgent.get(
 			`/workflow-history/workflow/${workflow.id}/version/badid`,
 		);
@@ -192,8 +182,8 @@ describe('GET /workflow-history/workflow/:workflowId/version/:versionId', () =>
 	});
 
 	test('should return version', async () => {
-		const workflow = await testDb.createWorkflow(undefined, owner);
-		const version = await testDb.createWorkflowHistoryItem(workflow.id);
+		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}`,
 		);
@@ -206,8 +196,8 @@ describe('GET /workflow-history/workflow/:workflowId/version/:versionId', () =>
 	});
 
 	test('should not return anything if not shared with user', async () => {
-		const workflow = await testDb.createWorkflow(undefined, owner);
-		const version = await testDb.createWorkflowHistoryItem(workflow.id);
+		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}`,
 		);
@@ -215,9 +205,9 @@ describe('GET /workflow-history/workflow/:workflowId/version/:versionId', () =>
 	});
 
 	test('should not return anything if not shared with user and using workflow owned by unshared user', async () => {
-		const workflow = await testDb.createWorkflow(undefined, owner);
-		const workflowMember = await testDb.createWorkflow(undefined, member);
-		const version = await testDb.createWorkflowHistoryItem(workflow.id);
+		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}`,
 		);
diff --git a/packages/cli/test/integration/workflowHistoryManager.test.ts b/packages/cli/test/integration/workflowHistoryManager.test.ts
index e03d3b4b0e..fe8690efce 100644
--- a/packages/cli/test/integration/workflowHistoryManager.test.ts
+++ b/packages/cli/test/integration/workflowHistoryManager.test.ts
@@ -3,12 +3,14 @@ import { In } from 'typeorm';
 import { DateTime } from 'luxon';
 
 import config from '@/config';
-import { WorkflowHistoryRepository } from '@/databases/repositories';
+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 { mockInstance } from './shared/utils';
+import { createWorkflow } from './shared/db/workflows';
+import { createManyWorkflowHistoryItems } from './shared/db/workflowHistory';
 
 describe('Workflow History Manager', () => {
 	const license = mockInstance(License);
@@ -98,9 +100,9 @@ describe('Workflow History Manager', () => {
 	});
 
 	const createWorkflowHistory = async (ageInDays = 2) => {
-		const workflow = await testDb.createWorkflow();
+		const workflow = await createWorkflow();
 		const time = DateTime.now().minus({ days: ageInDays }).toJSDate();
-		return testDb.createManyWorkflowHistoryItems(workflow.id, 10, time);
+		return createManyWorkflowHistoryItems(workflow.id, 10, time);
 	};
 
 	const pruneAndAssertCount = async (finalCount = 10, initialCount = 10) => {
diff --git a/packages/cli/test/integration/workflows.controller.ee.test.ts b/packages/cli/test/integration/workflows.controller.ee.test.ts
index f09c716537..8ca0955442 100644
--- a/packages/cli/test/integration/workflows.controller.ee.test.ts
+++ b/packages/cli/test/integration/workflows.controller.ee.test.ts
@@ -1,3 +1,4 @@
+import Container from 'typedi';
 import type { SuperAgentTest } from 'supertest';
 import { v4 as uuid } from 'uuid';
 import type { INode } from 'n8n-workflow';
@@ -5,18 +6,23 @@ import type { INode } from 'n8n-workflow';
 import * as UserManagementHelpers from '@/UserManagement/UserManagementHelper';
 import type { User } from '@db/entities/User';
 import { getSharedWorkflowIds } from '@/WorkflowHelpers';
+import { WorkflowHistoryRepository } from '@db/repositories/workflowHistory.repository';
+import { ActiveWorkflowRunner } from '@/ActiveWorkflowRunner';
 
+import { mockInstance } from '../shared/mocking';
 import * as utils from './shared/utils/';
 import * as testDb from './shared/testDb';
-import { createWorkflow, getGlobalMemberRole, getGlobalOwnerRole } from './shared/testDb';
 import type { SaveCredentialFunction } from './shared/types';
 import { makeWorkflow } from './shared/utils/';
 import { randomCredentialPayload } from './shared/random';
-import { License } from '@/License';
-import { WorkflowHistoryRepository } from '@/databases/repositories';
-import Container from 'typedi';
-import { ActiveWorkflowRunner } from '@/ActiveWorkflowRunner';
+import { affixRoleToSaveCredential, shareCredentialWithUsers } from './shared/db/credentials';
+import { getCredentialOwnerRole, getGlobalMemberRole, getGlobalOwnerRole } from './shared/db/roles';
+import { createUser } from './shared/db/users';
+import { createWorkflow, getWorkflowSharing, shareWorkflowWithUsers } from './shared/db/workflows';
+import type { Role } from '@/databases/entities/Role';
+import { Push } from '@/push';
 
+let globalMemberRole: Role;
 let owner: User;
 let member: User;
 let anotherMember: User;
@@ -25,32 +31,30 @@ let authMemberAgent: SuperAgentTest;
 let authAnotherMemberAgent: SuperAgentTest;
 let saveCredential: SaveCredentialFunction;
 
-const licenseLike = utils.mockInstance(License, {
-	isWorkflowHistoryLicensed: jest.fn().mockReturnValue(false),
-	isWithinUsersLimit: jest.fn().mockReturnValue(true),
-});
-const activeWorkflowRunnerLike = utils.mockInstance(ActiveWorkflowRunner);
+const activeWorkflowRunnerLike = mockInstance(ActiveWorkflowRunner);
+mockInstance(Push);
 
 const sharingSpy = jest.spyOn(UserManagementHelpers, 'isSharingEnabled').mockReturnValue(true);
 const testServer = utils.setupTestServer({
 	endpointGroups: ['workflows'],
 	enabledFeatures: ['feat:sharing'],
 });
+const license = testServer.license;
 
 beforeAll(async () => {
-	const globalOwnerRole = await testDb.getGlobalOwnerRole();
-	const globalMemberRole = await testDb.getGlobalMemberRole();
-	const credentialOwnerRole = await testDb.getCredentialOwnerRole();
+	const globalOwnerRole = await getGlobalOwnerRole();
+	globalMemberRole = await getGlobalMemberRole();
+	const credentialOwnerRole = await getCredentialOwnerRole();
 
-	owner = await testDb.createUser({ globalRole: globalOwnerRole });
-	member = await testDb.createUser({ globalRole: globalMemberRole });
-	anotherMember = await testDb.createUser({ globalRole: globalMemberRole });
+	owner = await createUser({ globalRole: globalOwnerRole });
+	member = await createUser({ globalRole: globalMemberRole });
+	anotherMember = await createUser({ globalRole: globalMemberRole });
 
 	authOwnerAgent = testServer.authAgentFor(owner);
 	authMemberAgent = testServer.authAgentFor(member);
 	authAnotherMemberAgent = testServer.authAgentFor(anotherMember);
 
-	saveCredential = testDb.affixRoleToSaveCredential(credentialOwnerRole);
+	saveCredential = affixRoleToSaveCredential(credentialOwnerRole);
 
 	await utils.initNodeTypes();
 });
@@ -59,8 +63,7 @@ beforeEach(async () => {
 	activeWorkflowRunnerLike.add.mockReset();
 	activeWorkflowRunnerLike.remove.mockReset();
 
-	await testDb.truncate(['Workflow', 'SharedWorkflow', WorkflowHistoryRepository]);
-	licenseLike.isWorkflowHistoryLicensed.mockReturnValue(false);
+	await testDb.truncate(['Workflow', 'SharedWorkflow', 'WorkflowHistory']);
 });
 
 describe('router should switch based on flag', () => {
@@ -98,7 +101,7 @@ describe('PUT /workflows/:id', () => {
 
 		expect(response.statusCode).toBe(200);
 
-		const sharedWorkflows = await testDb.getWorkflowSharing(workflow);
+		const sharedWorkflows = await getWorkflowSharing(workflow);
 		expect(sharedWorkflows).toHaveLength(2);
 	});
 
@@ -111,7 +114,7 @@ describe('PUT /workflows/:id', () => {
 
 		expect(response.statusCode).toBe(200);
 
-		const sharedWorkflows = await testDb.getWorkflowSharing(workflow);
+		const sharedWorkflows = await getWorkflowSharing(workflow);
 		expect(sharedWorkflows).toHaveLength(1);
 	});
 
@@ -124,7 +127,7 @@ describe('PUT /workflows/:id', () => {
 
 		expect(response.statusCode).toBe(200);
 
-		const sharedWorkflows = await testDb.getWorkflowSharing(workflow);
+		const sharedWorkflows = await getWorkflowSharing(workflow);
 		expect(sharedWorkflows).toHaveLength(3);
 	});
 
@@ -137,7 +140,7 @@ describe('PUT /workflows/:id', () => {
 
 		expect(response.statusCode).toBe(200);
 
-		const sharedWorkflows = await testDb.getWorkflowSharing(workflow);
+		const sharedWorkflows = await getWorkflowSharing(workflow);
 		expect(sharedWorkflows).toHaveLength(3);
 
 		const secondResponse = await authOwnerAgent
@@ -145,9 +148,78 @@ describe('PUT /workflows/:id', () => {
 			.send({ shareWithIds: [member.id] });
 		expect(secondResponse.statusCode).toBe(200);
 
-		const secondSharedWorkflows = await testDb.getWorkflowSharing(workflow);
+		const secondSharedWorkflows = await getWorkflowSharing(workflow);
 		expect(secondSharedWorkflows).toHaveLength(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);
+	});
+
+	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);
+	});
+
+	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);
+	});
+
+	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);
+	});
+
+	test('PUT /workflows/:id/share should not allow sharing by another non-shared member', async () => {
+		const workflow = await createWorkflow({}, member);
+
+		const tempUser = await createUser({ globalRole: globalMemberRole });
+
+		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);
+	});
 });
 
 describe('GET /workflows/new', () => {
@@ -198,7 +270,7 @@ describe('GET /workflows/:id', () => {
 
 	test('GET should return shared workflow with user data', async () => {
 		const workflow = await createWorkflow({}, owner);
-		await testDb.shareWorkflowWithUsers(workflow, [member]);
+		await shareWorkflowWithUsers(workflow, [member]);
 
 		const response = await authOwnerAgent.get(`/workflows/${workflow.id}`);
 
@@ -221,7 +293,7 @@ describe('GET /workflows/:id', () => {
 
 	test('GET should return all sharees', async () => {
 		const workflow = await createWorkflow({}, owner);
-		await testDb.shareWorkflowWithUsers(workflow, [member, anotherMember]);
+		await shareWorkflowWithUsers(workflow, [member, anotherMember]);
 
 		const response = await authOwnerAgent.get(`/workflows/${workflow.id}`);
 
@@ -290,7 +362,7 @@ describe('GET /workflows/:id', () => {
 			withCredential: { id: savedCredential.id, name: savedCredential.name },
 		});
 		const workflow = await createWorkflow(workflowPayload, member);
-		await testDb.shareWorkflowWithUsers(workflow, [anotherMember]);
+		await shareWorkflowWithUsers(workflow, [anotherMember]);
 
 		const responseMember1 = await authMemberAgent.get(`/workflows/${workflow.id}`);
 		expect(responseMember1.statusCode).toBe(200);
@@ -318,14 +390,14 @@ describe('GET /workflows/:id', () => {
 	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]);
+		await 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]);
+		await shareWorkflowWithUsers(workflow, [anotherMember]);
 
 		const responseMember1 = await authMemberAgent.get(`/workflows/${workflow.id}`);
 		expect(responseMember1.statusCode).toBe(200);
@@ -403,7 +475,7 @@ describe('POST /workflows', () => {
 
 	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]);
+		await shareCredentialWithUsers(savedCredential, [anotherMember]);
 
 		const workflow = makeWorkflow({
 			withPinData: false,
@@ -415,7 +487,7 @@ describe('POST /workflows', () => {
 	});
 
 	test('Should create workflow history version when licensed', async () => {
-		licenseLike.isWorkflowHistoryLicensed.mockReturnValue(true);
+		license.enable('feat:workflowHistory');
 		const payload = {
 			name: 'testing',
 			nodes: [
@@ -464,7 +536,7 @@ describe('POST /workflows', () => {
 	});
 
 	test('Should not create workflow history version when not licensed', async () => {
-		licenseLike.isWorkflowHistoryLicensed.mockReturnValue(false);
+		license.disable('feat:workflowHistory');
 		const payload = {
 			name: 'testing',
 			nodes: [
@@ -927,8 +999,8 @@ describe('getSharedWorkflowIds', () => {
 		const workflow1 = await createWorkflow({}, anotherMember);
 		const workflow2 = await createWorkflow({}, anotherMember);
 		const workflow3 = await createWorkflow({}, anotherMember);
-		await testDb.shareWorkflowWithUsers(workflow1, [member]);
-		await testDb.shareWorkflowWithUsers(workflow3, [member]);
+		await shareWorkflowWithUsers(workflow1, [member]);
+		await shareWorkflowWithUsers(workflow3, [member]);
 		const sharedWorkflowIds = await getSharedWorkflowIds(member);
 		expect(sharedWorkflowIds).toHaveLength(2);
 		expect(sharedWorkflowIds).toContain(workflow1.id);
@@ -938,8 +1010,8 @@ describe('getSharedWorkflowIds', () => {
 
 describe('PATCH /workflows/:id - workflow history', () => {
 	test('Should create workflow history version when licensed', async () => {
-		licenseLike.isWorkflowHistoryLicensed.mockReturnValue(true);
-		const workflow = await testDb.createWorkflow({}, owner);
+		license.enable('feat:workflowHistory');
+		const workflow = await createWorkflow({}, owner);
 		const payload = {
 			name: 'name updated',
 			versionId: workflow.versionId,
@@ -996,8 +1068,8 @@ describe('PATCH /workflows/:id - workflow history', () => {
 	});
 
 	test('Should not create workflow history version when not licensed', async () => {
-		licenseLike.isWorkflowHistoryLicensed.mockReturnValue(false);
-		const workflow = await testDb.createWorkflow({}, owner);
+		license.disable('feat:workflowHistory');
+		const workflow = await createWorkflow({}, owner);
 		const payload = {
 			name: 'name updated',
 			versionId: workflow.versionId,
@@ -1048,8 +1120,8 @@ describe('PATCH /workflows/:id - workflow history', () => {
 
 describe('PATCH /workflows/:id - activate workflow', () => {
 	test('should activate workflow without changing version ID', async () => {
-		licenseLike.isWorkflowHistoryLicensed.mockReturnValue(false);
-		const workflow = await testDb.createWorkflow({}, owner);
+		license.disable('feat:workflowHistory');
+		const workflow = await createWorkflow({}, owner);
 		const payload = {
 			versionId: workflow.versionId,
 			active: true,
@@ -1070,8 +1142,8 @@ describe('PATCH /workflows/:id - activate workflow', () => {
 	});
 
 	test('should deactivate workflow without changing version ID', async () => {
-		licenseLike.isWorkflowHistoryLicensed.mockReturnValue(false);
-		const workflow = await testDb.createWorkflow({ active: true }, owner);
+		license.disable('feat:workflowHistory');
+		const workflow = await createWorkflow({ active: true }, owner);
 		const payload = {
 			versionId: workflow.versionId,
 			active: false,
diff --git a/packages/cli/test/integration/workflows.controller.test.ts b/packages/cli/test/integration/workflows.controller.test.ts
index 2a816de1db..a85dfee776 100644
--- a/packages/cli/test/integration/workflows.controller.test.ts
+++ b/packages/cli/test/integration/workflows.controller.test.ts
@@ -1,44 +1,49 @@
 import type { SuperAgentTest } from 'supertest';
 import type { INode, IPinData } from 'n8n-workflow';
 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/';
-import type { User } from '@/databases/entities/User';
-import { randomCredentialPayload } from './shared/random';
+import type { User } from '@db/entities/User';
 import { v4 as uuid } from 'uuid';
 import { RoleService } from '@/services/role.service';
 import Container from 'typedi';
 import type { ListQuery } from '@/requests';
-import { License } from '@/License';
-import { WorkflowHistoryRepository } from '@/databases/repositories';
+import { WorkflowHistoryRepository } from '@db/repositories/workflowHistory.repository';
 import { ActiveWorkflowRunner } from '@/ActiveWorkflowRunner';
 
+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 { Push } from '@/push';
+import { EnterpriseWorkflowService } from '@/workflows/workflow.service.ee';
+import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
+import type { WorkflowEntity } from '@/databases/entities/WorkflowEntity';
+
 let owner: User;
 let authOwnerAgent: SuperAgentTest;
 
 jest.spyOn(UserManagementHelpers, 'isSharingEnabled').mockReturnValue(false);
+
 const testServer = utils.setupTestServer({ endpointGroups: ['workflows'] });
+const license = testServer.license;
 
 const { objectContaining, arrayContaining, any } = expect;
 
-const licenseLike = utils.mockInstance(License, {
-	isWorkflowHistoryLicensed: jest.fn().mockReturnValue(false),
-	isWithinUsersLimit: jest.fn().mockReturnValue(true),
-});
-
-const activeWorkflowRunnerLike = utils.mockInstance(ActiveWorkflowRunner);
+const activeWorkflowRunnerLike = mockInstance(ActiveWorkflowRunner);
+mockInstance(Push);
 
 beforeAll(async () => {
-	owner = await testDb.createOwner();
+	owner = await createOwner();
 	authOwnerAgent = testServer.authAgentFor(owner);
 });
 
 beforeEach(async () => {
 	jest.resetAllMocks();
-	await testDb.truncate(['Workflow', 'SharedWorkflow', 'Tag', WorkflowHistoryRepository]);
-	licenseLike.isWorkflowHistoryLicensed.mockReturnValue(false);
+	await testDb.truncate(['Workflow', 'SharedWorkflow', 'Tag', 'WorkflowHistory']);
 });
 
 describe('POST /workflows', () => {
@@ -60,7 +65,7 @@ describe('POST /workflows', () => {
 	});
 
 	test('should create workflow history version when licensed', async () => {
-		licenseLike.isWorkflowHistoryLicensed.mockReturnValue(true);
+		license.enable('feat:workflowHistory');
 		const payload = {
 			name: 'testing',
 			nodes: [
@@ -109,7 +114,7 @@ describe('POST /workflows', () => {
 	});
 
 	test('should not create workflow history version when not licensed', async () => {
-		licenseLike.isWorkflowHistoryLicensed.mockReturnValue(false);
+		license.disable('feat:workflowHistory');
 		const payload = {
 			name: 'testing',
 			nodes: [
@@ -172,7 +177,7 @@ describe('GET /workflows', () => {
 	});
 
 	test('should return workflows', async () => {
-		const credential = await testDb.saveCredential(randomCredentialPayload(), {
+		const credential = await saveCredential(randomCredentialPayload(), {
 			user: owner,
 			role: await Container.get(RoleService).findCredentialOwnerRole(),
 		});
@@ -194,10 +199,10 @@ describe('GET /workflows', () => {
 			},
 		];
 
-		const tag = await testDb.createTag({ name: 'A' });
+		const tag = await createTag({ name: 'A' });
 
-		await testDb.createWorkflow({ name: 'First', nodes, tags: [tag] }, owner);
-		await testDb.createWorkflow({ name: 'Second' }, owner);
+		await createWorkflow({ name: 'First', nodes, tags: [tag] }, owner);
+		await createWorkflow({ name: 'Second' }, owner);
 
 		const response = await authOwnerAgent.get('/workflows').expect(200);
 
@@ -212,7 +217,13 @@ describe('GET /workflows', () => {
 					updatedAt: any(String),
 					tags: [{ id: any(String), name: 'A' }],
 					versionId: any(String),
-					ownedBy: { id: owner.id },
+					ownedBy: {
+						id: owner.id,
+						email: any(String),
+						firstName: any(String),
+						lastName: any(String),
+					},
+					sharedWith: [],
 				}),
 				objectContaining({
 					id: any(String),
@@ -222,7 +233,13 @@ describe('GET /workflows', () => {
 					updatedAt: any(String),
 					tags: [],
 					versionId: any(String),
-					ownedBy: { id: owner.id },
+					ownedBy: {
+						id: owner.id,
+						email: any(String),
+						firstName: any(String),
+						lastName: any(String),
+					},
+					sharedWith: [],
 				}),
 			]),
 		});
@@ -232,14 +249,14 @@ describe('GET /workflows', () => {
 		);
 
 		expect(found.nodes).toBeUndefined();
-		expect(found.sharedWith).toBeUndefined();
+		expect(found.sharedWith).toHaveLength(0);
 		expect(found.usedCredentials).toBeUndefined();
 	});
 
 	describe('filter', () => {
 		test('should filter workflows by field: name', async () => {
-			await testDb.createWorkflow({ name: 'First' }, owner);
-			await testDb.createWorkflow({ name: 'Second' }, owner);
+			await createWorkflow({ name: 'First' }, owner);
+			await createWorkflow({ name: 'Second' }, owner);
 
 			const response = await authOwnerAgent
 				.get('/workflows')
@@ -253,8 +270,8 @@ describe('GET /workflows', () => {
 		});
 
 		test('should filter workflows by field: active', async () => {
-			await testDb.createWorkflow({ active: true }, owner);
-			await testDb.createWorkflow({ active: false }, owner);
+			await createWorkflow({ active: true }, owner);
+			await createWorkflow({ active: false }, owner);
 
 			const response = await authOwnerAgent
 				.get('/workflows')
@@ -268,10 +285,10 @@ describe('GET /workflows', () => {
 		});
 
 		test('should filter workflows by field: tags', async () => {
-			const workflow = await testDb.createWorkflow({ name: 'First' }, owner);
+			const workflow = await createWorkflow({ name: 'First' }, owner);
 
-			await testDb.createTag({ name: 'A' }, workflow);
-			await testDb.createTag({ name: 'B' }, workflow);
+			await createTag({ name: 'A' }, workflow);
+			await createTag({ name: 'B' }, workflow);
 
 			const response = await authOwnerAgent
 				.get('/workflows')
@@ -287,8 +304,8 @@ describe('GET /workflows', () => {
 
 	describe('select', () => {
 		test('should select workflow field: name', async () => {
-			await testDb.createWorkflow({ name: 'First' }, owner);
-			await testDb.createWorkflow({ name: 'Second' }, owner);
+			await createWorkflow({ name: 'First' }, owner);
+			await createWorkflow({ name: 'Second' }, owner);
 
 			const response = await authOwnerAgent.get('/workflows').query('select=["name"]').expect(200);
 
@@ -302,8 +319,8 @@ describe('GET /workflows', () => {
 		});
 
 		test('should select workflow field: active', async () => {
-			await testDb.createWorkflow({ active: true }, owner);
-			await testDb.createWorkflow({ active: false }, owner);
+			await createWorkflow({ active: true }, owner);
+			await createWorkflow({ active: false }, owner);
 
 			const response = await authOwnerAgent
 				.get('/workflows')
@@ -320,11 +337,11 @@ describe('GET /workflows', () => {
 		});
 
 		test('should select workflow field: tags', async () => {
-			const firstWorkflow = await testDb.createWorkflow({ name: 'First' }, owner);
-			const secondWorkflow = await testDb.createWorkflow({ name: 'Second' }, owner);
+			const firstWorkflow = await createWorkflow({ name: 'First' }, owner);
+			const secondWorkflow = await createWorkflow({ name: 'Second' }, owner);
 
-			await testDb.createTag({ name: 'A' }, firstWorkflow);
-			await testDb.createTag({ name: 'B' }, secondWorkflow);
+			await createTag({ name: 'A' }, firstWorkflow);
+			await createTag({ name: 'B' }, secondWorkflow);
 
 			const response = await authOwnerAgent.get('/workflows').query('select=["tags"]').expect(200);
 
@@ -343,14 +360,14 @@ describe('GET /workflows', () => {
 			const secondWorkflowCreatedAt = '2023-07-07T09:31:25.000Z';
 			const secondWorkflowUpdatedAt = '2023-07-07T09:31:40.000Z';
 
-			await testDb.createWorkflow(
+			await createWorkflow(
 				{
 					createdAt: new Date(firstWorkflowCreatedAt),
 					updatedAt: new Date(firstWorkflowUpdatedAt),
 				},
 				owner,
 			);
-			await testDb.createWorkflow(
+			await createWorkflow(
 				{
 					createdAt: new Date(secondWorkflowCreatedAt),
 					updatedAt: new Date(secondWorkflowUpdatedAt),
@@ -384,8 +401,8 @@ describe('GET /workflows', () => {
 			const firstWorkflowVersionId = 'e95ccdde-2b4e-4fd0-8834-220a2b5b4353';
 			const secondWorkflowVersionId = 'd099b8dc-b1d8-4b2d-9b02-26f32c0ee785';
 
-			await testDb.createWorkflow({ versionId: firstWorkflowVersionId }, owner);
-			await testDb.createWorkflow({ versionId: secondWorkflowVersionId }, owner);
+			await createWorkflow({ versionId: firstWorkflowVersionId }, owner);
+			await createWorkflow({ versionId: secondWorkflowVersionId }, owner);
 
 			const response = await authOwnerAgent
 				.get('/workflows')
@@ -402,8 +419,8 @@ describe('GET /workflows', () => {
 		});
 
 		test('should select workflow field: ownedBy', async () => {
-			await testDb.createWorkflow({}, owner);
-			await testDb.createWorkflow({}, owner);
+			await createWorkflow({}, owner);
+			await createWorkflow({}, owner);
 
 			const response = await authOwnerAgent
 				.get('/workflows')
@@ -413,8 +430,26 @@ describe('GET /workflows', () => {
 			expect(response.body).toEqual({
 				count: 2,
 				data: arrayContaining([
-					{ id: any(String), ownedBy: { id: owner.id } },
-					{ id: any(String), ownedBy: { id: owner.id } },
+					{
+						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: [],
+					},
 				]),
 			});
 		});
@@ -423,8 +458,8 @@ describe('GET /workflows', () => {
 
 describe('PATCH /workflows/:id', () => {
 	test('should create workflow history version when licensed', async () => {
-		licenseLike.isWorkflowHistoryLicensed.mockReturnValue(true);
-		const workflow = await testDb.createWorkflow({}, owner);
+		license.enable('feat:workflowHistory');
+		const workflow = await createWorkflow({}, owner);
 		const payload = {
 			name: 'name updated',
 			versionId: workflow.versionId,
@@ -481,8 +516,8 @@ describe('PATCH /workflows/:id', () => {
 	});
 
 	test('should not create workflow history version when not licensed', async () => {
-		licenseLike.isWorkflowHistoryLicensed.mockReturnValue(false);
-		const workflow = await testDb.createWorkflow({}, owner);
+		license.disable('feat:workflowHistory');
+		const workflow = await createWorkflow({}, owner);
 		const payload = {
 			name: 'name updated',
 			versionId: workflow.versionId,
@@ -531,8 +566,8 @@ describe('PATCH /workflows/:id', () => {
 	});
 
 	test('should activate workflow without changing version ID', async () => {
-		licenseLike.isWorkflowHistoryLicensed.mockReturnValue(false);
-		const workflow = await testDb.createWorkflow({}, owner);
+		license.disable('feat:workflowHistory');
+		const workflow = await createWorkflow({}, owner);
 		const payload = {
 			versionId: workflow.versionId,
 			active: true,
@@ -553,8 +588,8 @@ describe('PATCH /workflows/:id', () => {
 	});
 
 	test('should deactivate workflow without changing version ID', async () => {
-		licenseLike.isWorkflowHistoryLicensed.mockReturnValue(false);
-		const workflow = await testDb.createWorkflow({ active: true }, owner);
+		license.disable('feat:workflowHistory');
+		const workflow = await createWorkflow({ active: true }, owner);
 		const payload = {
 			versionId: workflow.versionId,
 			active: false,
@@ -574,4 +609,54 @@ describe('PATCH /workflows/: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(UserManagementHelpers, '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/integration/shared/utils/mocking.ts b/packages/cli/test/shared/mocking.ts
similarity index 72%
rename from packages/cli/test/integration/shared/utils/mocking.ts
rename to packages/cli/test/shared/mocking.ts
index a7fc5d183e..7f941378b1 100644
--- a/packages/cli/test/integration/shared/utils/mocking.ts
+++ b/packages/cli/test/shared/mocking.ts
@@ -1,12 +1,13 @@
 import { Container } from 'typedi';
 import { mock } from 'jest-mock-extended';
 import type { DeepPartial } from 'ts-essentials';
+import type { Class } from 'n8n-core';
 
 export const mockInstance = <T>(
-	ctor: new (...args: unknown[]) => T,
+	serviceClass: Class<T>,
 	data: DeepPartial<T> | undefined = undefined,
 ) => {
 	const instance = mock<T>(data);
-	Container.set(ctor, instance);
+	Container.set(serviceClass, instance);
 	return instance;
 };
diff --git a/packages/cli/test/unit/ActiveExecutions.test.ts b/packages/cli/test/unit/ActiveExecutions.test.ts
index 485d1cd13e..6ac1438b4b 100644
--- a/packages/cli/test/unit/ActiveExecutions.test.ts
+++ b/packages/cli/test/unit/ActiveExecutions.test.ts
@@ -5,16 +5,14 @@ import { Container } from 'typedi';
 import type { IExecuteResponsePromiseData, IRun } from 'n8n-workflow';
 import { createDeferredPromise } from 'n8n-workflow';
 import type { IWorkflowExecutionDataProcess } from '@/Interfaces';
-import { ExecutionRepository } from '@db/repositories';
+import { ExecutionRepository } from '@db/repositories/execution.repository';
 import { mock } from 'jest-mock-extended';
 
 const FAKE_EXECUTION_ID = '15';
 const FAKE_SECOND_EXECUTION_ID = '20';
 
 const updateExistingExecution = jest.fn();
-const createNewExecution = jest.fn(async () => {
-	return { id: FAKE_EXECUTION_ID };
-});
+const createNewExecution = jest.fn(async () => FAKE_EXECUTION_ID);
 
 Container.set(ExecutionRepository, {
 	updateExistingExecution,
diff --git a/packages/cli/test/unit/ActiveWorkflowRunner.test.ts b/packages/cli/test/unit/ActiveWorkflowRunner.test.ts
deleted file mode 100644
index 8b4a599f9b..0000000000
--- a/packages/cli/test/unit/ActiveWorkflowRunner.test.ts
+++ /dev/null
@@ -1,280 +0,0 @@
-import { v4 as uuid } from 'uuid';
-import { mocked } from 'jest-mock';
-import { Container } from 'typedi';
-
-import type { INode } from 'n8n-workflow';
-import { NodeApiError, 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 * as WorkflowExecuteAdditionalData from '@/WorkflowExecuteAdditionalData';
-import { WorkflowRunner } from '@/WorkflowRunner';
-import { ExternalHooks } from '@/ExternalHooks';
-import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
-import { Push } from '@/push';
-import { ActiveExecutions } from '@/ActiveExecutions';
-import { SecretsHelper } from '@/SecretsHelpers';
-import { WebhookService } from '@/services/webhook.service';
-import { VariablesService } from '@/environments/variables/variables.service';
-
-import { mockInstance } from '../integration/shared/utils/';
-import { randomEmail, randomName } from '../integration/shared/random';
-import * as Helpers from './Helpers';
-
-/**
- * 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).toString(),
-			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 === searchParams.where.id.toString(),
-					);
-				}),
-				update: jest.fn(),
-				createQueryBuilder: jest.fn(() => {
-					const fakeQueryBuilder = {
-						update: () => fakeQueryBuilder,
-						set: () => fakeQueryBuilder,
-						where: () => fakeQueryBuilder,
-						execute: async () => {},
-					};
-					return fakeQueryBuilder;
-				}),
-			},
-		},
-	};
-});
-
-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', () => {
-	mockInstance(ActiveExecutions);
-	const externalHooks = mockInstance(ExternalHooks);
-	const webhookService = mockInstance(WebhookService);
-	mockInstance(Push);
-	mockInstance(SecretsHelper);
-	const variablesService = mockInstance(VariablesService);
-	const nodesAndCredentials = mockInstance(LoadNodesAndCredentials);
-	Object.assign(nodesAndCredentials, {
-		loadedNodes: MOCK_NODE_TYPES_DATA,
-		known: { nodes: {}, credentials: {} },
-		types: { nodes: [], credentials: [] },
-	});
-
-	const activeWorkflowRunner = Container.get(ActiveWorkflowRunner);
-
-	beforeAll(async () => {
-		variablesService.getAllCached.mockResolvedValue([]);
-	});
-
-	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(webhookService.deleteInstanceWebhooks).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(webhookService.deleteInstanceWebhooks).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);
-	});
-
-	describe('init()', () => {
-		it('should execute error workflow on failure to activate due to 401', async () => {
-			databaseActiveWorkflowsCount = 1;
-
-			jest.spyOn(ActiveWorkflowRunner.prototype, 'add').mockImplementation(() => {
-				throw new NodeApiError(
-					{
-						id: 'a75dcd1b-9fed-4643-90bd-75933d67936c',
-						name: 'Github Trigger',
-						type: 'n8n-nodes-base.githubTrigger',
-						typeVersion: 1,
-						position: [0, 0],
-					} as INode,
-					{
-						httpCode: '401',
-						message: 'Authorization failed - please check your credentials',
-					},
-				);
-			});
-
-			const executeSpy = jest.spyOn(ActiveWorkflowRunner.prototype, 'executeErrorWorkflow');
-
-			await activeWorkflowRunner.init();
-
-			const [error, workflow] = executeSpy.mock.calls[0];
-
-			expect(error.message).toContain('Authorization');
-			expect(workflow.id).toBe('1');
-		});
-	});
-});
diff --git a/packages/cli/test/unit/CredentialTypes.test.ts b/packages/cli/test/unit/CredentialTypes.test.ts
index 731e1b2bac..0ee99c9f8a 100644
--- a/packages/cli/test/unit/CredentialTypes.test.ts
+++ b/packages/cli/test/unit/CredentialTypes.test.ts
@@ -1,7 +1,7 @@
 import { CredentialTypes } from '@/CredentialTypes';
 import { Container } from 'typedi';
 import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
-import { mockInstance } from '../integration/shared/utils';
+import { mockInstance } from '../shared/mocking';
 
 describe('CredentialTypes', () => {
 	const mockNodesAndCredentials = mockInstance(LoadNodesAndCredentials, {
diff --git a/packages/cli/test/unit/CredentialsHelper.test.ts b/packages/cli/test/unit/CredentialsHelper.test.ts
index 52db57e27f..19be100b02 100644
--- a/packages/cli/test/unit/CredentialsHelper.test.ts
+++ b/packages/cli/test/unit/CredentialsHelper.test.ts
@@ -1,3 +1,4 @@
+import Container from 'typedi';
 import type {
 	IAuthenticateGeneric,
 	ICredentialDataDecryptedObject,
@@ -11,12 +12,13 @@ import { Workflow } from 'n8n-workflow';
 import { CredentialsHelper } from '@/CredentialsHelper';
 import { NodeTypes } from '@/NodeTypes';
 import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
-import { mockInstance } from '../integration/shared/utils';
-import Container from 'typedi';
+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';
-
+	mockInstance(CredentialsRepository);
+	mockInstance(SharedCredentialsRepository);
 	const mockNodesAndCredentials = mockInstance(LoadNodesAndCredentials, {
 		loadedNodes: {
 			'test.set': {
@@ -267,10 +269,9 @@ describe('CredentialsHelper', () => {
 			nodeTypes,
 		});
 
-		const timezone = 'America/New_York';
-
 		for (const testData of tests) {
 			test(testData.description, async () => {
+				//@ts-expect-error `loadedCredentials` is a getter and we are replacing it here with a property
 				mockNodesAndCredentials.loadedCredentials = {
 					[testData.input.credentialType.name]: {
 						type: testData.input.credentialType,
@@ -286,7 +287,6 @@ describe('CredentialsHelper', () => {
 					deepCopy(incomingRequestOptions),
 					workflow,
 					node,
-					timezone,
 				);
 
 				expect(result).toEqual(testData.output);
diff --git a/packages/cli/test/unit/ExternalSecrets/ExternalSecretsManager.test.ts b/packages/cli/test/unit/ExternalSecrets/ExternalSecretsManager.test.ts
index acb6e7a4cb..b8a728d5f5 100644
--- a/packages/cli/test/unit/ExternalSecrets/ExternalSecretsManager.test.ts
+++ b/packages/cli/test/unit/ExternalSecrets/ExternalSecretsManager.test.ts
@@ -1,12 +1,12 @@
 import { Container } from 'typedi';
 import { Cipher } from 'n8n-core';
-import { SettingsRepository } from '@/databases/repositories';
+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 '../../integration/shared/utils';
+import { mockInstance } from '../../shared/mocking';
 import {
 	DummyProvider,
 	ErrorProvider,
diff --git a/packages/cli/test/unit/InternalHooks.test.ts b/packages/cli/test/unit/InternalHooks.test.ts
index 3093dc109e..e91759dadd 100644
--- a/packages/cli/test/unit/InternalHooks.test.ts
+++ b/packages/cli/test/unit/InternalHooks.test.ts
@@ -1,6 +1,6 @@
 import { Telemetry } from '@/telemetry';
 import { InternalHooks } from '@/InternalHooks';
-import { mockInstance } from '../integration/shared/utils';
+import { mockInstance } from '../shared/mocking';
 import type { IDiagnosticInfo } from '@/Interfaces';
 import { mock } from 'jest-mock-extended';
 
@@ -12,7 +12,7 @@ let telemetry: Telemetry;
 describe('InternalHooks', () => {
 	beforeAll(() => {
 		telemetry = mockInstance(Telemetry);
-		internalHooks = new InternalHooks(telemetry, mock(), mock(), mock(), mock(), mock());
+		internalHooks = new InternalHooks(telemetry, mock(), mock(), mock(), mock());
 	});
 
 	it('Should be defined', () => {
@@ -41,6 +41,7 @@ describe('InternalHooks', () => {
 			licensePlanName,
 			licenseTenantId,
 			binary_data_s3: false,
+			multi_main_setup_enabled: false,
 		};
 
 		const parameters = {
diff --git a/packages/cli/test/unit/License.test.ts b/packages/cli/test/unit/License.test.ts
index 356fb07685..3079695d46 100644
--- a/packages/cli/test/unit/License.test.ts
+++ b/packages/cli/test/unit/License.test.ts
@@ -1,10 +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 '../integration/shared/utils';
+import { mockInstance } from '../shared/mocking';
+import { MultiMainSetup } from '@/services/orchestration/main/MultiMainSetup.ee';
 
 jest.mock('@n8n_io/license-sdk');
 
@@ -26,9 +28,10 @@ describe('License', () => {
 	let license: License;
 	const logger = mockInstance(Logger);
 	const instanceSettings = mockInstance(InstanceSettings, { instanceId: MOCK_INSTANCE_ID });
+	mockInstance(MultiMainSetup);
 
 	beforeEach(async () => {
-		license = new License(logger, instanceSettings);
+		license = new License(logger, instanceSettings, mock(), mock(), mock());
 		await license.init();
 	});
 
@@ -51,7 +54,7 @@ describe('License', () => {
 	});
 
 	test('initializes license manager for worker', async () => {
-		license = new License(logger, instanceSettings);
+		license = new License(logger, instanceSettings, mock(), mock(), mock());
 		await license.init('worker');
 		expect(LicenseManager).toHaveBeenCalledWith({
 			autoRenewEnabled: false,
@@ -82,20 +85,20 @@ 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();
 	});
@@ -107,7 +110,7 @@ describe('License', () => {
 	});
 
 	test('check management jwt', async () => {
-		await license.getManagementJwt();
+		license.getManagementJwt();
 
 		expect(LicenseManager.prototype.getManagementJwt).toHaveBeenCalled();
 	});
diff --git a/packages/cli/test/unit/PermissionChecker.test.ts b/packages/cli/test/unit/PermissionChecker.test.ts
index 460f701941..d411db0ea3 100644
--- a/packages/cli/test/unit/PermissionChecker.test.ts
+++ b/packages/cli/test/unit/PermissionChecker.test.ts
@@ -1,29 +1,75 @@
 import { v4 as uuid } from 'uuid';
 import { Container } from 'typedi';
-import type { INodeTypes } from 'n8n-workflow';
+import type { INodeTypes, WorkflowSettings } from 'n8n-workflow';
 import { SubworkflowOperationError, Workflow } from 'n8n-workflow';
 
 import config from '@/config';
-import * as Db from '@/Db';
-import { Role } from '@db/entities/Role';
+import type { 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 '@/services/user.service';
 import { PermissionChecker } from '@/UserManagement/PermissionChecker';
-import * as UserManagementHelper from '@/UserManagement/UserManagementHelper';
-import { WorkflowsService } from '@/workflows/workflows.services';
 import { OwnershipService } from '@/services/ownership.service';
 
-import { mockInstance } from '../integration/shared/utils/';
+import { mockInstance } from '../shared/mocking';
 import {
 	randomCredentialPayload as randomCred,
+	randomName,
 	randomPositiveDigit,
 } from '../integration/shared/random';
 import * as testDb from '../integration/shared/testDb';
 import type { SaveCredentialFunction } from '../integration/shared/types';
 import { mockNodeTypesData } from './Helpers';
+import { affixRoleToSaveCredential } from '../integration/shared/db/credentials';
+import { getCredentialOwnerRole, getWorkflowOwnerRole } from '../integration/shared/db/roles';
+import { createOwner, createUser } from '../integration/shared/db/users';
+import { WorkflowRepository } from '@db/repositories/workflow.repository';
+import { SharedWorkflowRepository } from '@db/repositories/sharedWorkflow.repository';
+import { UserRepository } from '@/databases/repositories/user.repository';
+import { LicenseMocker } from '../integration/shared/license';
+import { License } from '@/License';
+import { generateNanoId } from '@/databases/utils/generators';
+
+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 } : {}),
+		},
+	});
+}
 
 let mockNodeTypes: INodeTypes;
 let credentialOwnerRole: Role;
@@ -39,21 +85,21 @@ beforeAll(async () => {
 
 	mockNodeTypes = Container.get(NodeTypes);
 
-	credentialOwnerRole = await testDb.getCredentialOwnerRole();
-	workflowOwnerRole = await testDb.getWorkflowOwnerRole();
+	credentialOwnerRole = await getCredentialOwnerRole();
+	workflowOwnerRole = await getWorkflowOwnerRole();
 
-	saveCredential = testDb.affixRoleToSaveCredential(credentialOwnerRole);
+	saveCredential = affixRoleToSaveCredential(credentialOwnerRole);
 });
 
-beforeEach(async () => {
-	await testDb.truncate(['SharedWorkflow', 'SharedCredentials', 'Workflow', 'Credentials', 'User']);
-});
+describe('check()', () => {
+	beforeEach(async () => {
+		await testDb.truncate(['Workflow', 'Credentials']);
+	});
 
-afterAll(async () => {
-	await testDb.terminate();
-});
+	afterAll(async () => {
+		await testDb.terminate();
+	});
 
-describe('PermissionChecker.check()', () => {
 	test('should allow if workflow has no creds', async () => {
 		const userId = uuid();
 
@@ -79,7 +125,7 @@ describe('PermissionChecker.check()', () => {
 	});
 
 	test('should allow if requesting user is instance owner', async () => {
-		const owner = await testDb.createOwner();
+		const owner = await createOwner();
 
 		const workflow = new Workflow({
 			id: randomPositiveDigit().toString(),
@@ -109,7 +155,7 @@ describe('PermissionChecker.check()', () => {
 	});
 
 	test('should allow if workflow creds are valid subset', async () => {
-		const [owner, member] = await Promise.all([testDb.createOwner(), testDb.createUser()]);
+		const [owner, member] = await Promise.all([createOwner(), createUser()]);
 
 		const ownerCred = await saveCredential(randomCred(), { user: owner });
 		const memberCred = await saveCredential(randomCred(), { user: member });
@@ -156,7 +202,7 @@ describe('PermissionChecker.check()', () => {
 	});
 
 	test('should deny if workflow creds are not valid subset', async () => {
-		const member = await testDb.createUser();
+		const member = await createUser();
 
 		const memberCred = await saveCredential(randomCred(), { user: member });
 
@@ -198,9 +244,9 @@ describe('PermissionChecker.check()', () => {
 			],
 		};
 
-		const workflowEntity = await Db.collections.Workflow.save(workflowDetails);
+		const workflowEntity = await Container.get(WorkflowRepository).save(workflowDetails);
 
-		await Db.collections.SharedWorkflow.save({
+		await Container.get(SharedWorkflowRepository).save({
 			workflow: workflowEntity,
 			user: member,
 			role: workflowOwnerRole,
@@ -212,176 +258,133 @@ describe('PermissionChecker.check()', () => {
 	});
 });
 
-describe('PermissionChecker.checkSubworkflowExecutePolicy', () => {
-	const userId = uuid();
-	const fakeUser = new User();
-	fakeUser.id = userId;
+describe('checkSubworkflowExecutePolicy()', () => {
 	const ownershipService = mockInstance(OwnershipService);
 
-	const ownerMockRole = new Role();
-	ownerMockRole.name = 'owner';
-	const sharedWorkflowOwner = new SharedWorkflow();
-	sharedWorkflowOwner.role = ownerMockRole;
+	let license: LicenseMocker;
 
-	const nonOwnerMockRole = new Role();
-	nonOwnerMockRole.name = 'editor';
-	const sharedWorkflowNotOwner = new SharedWorkflow();
-	sharedWorkflowNotOwner.role = nonOwnerMockRole;
-
-	const userService = mockInstance(UserService);
-
-	test('sets default policy from environment when subworkflow has none', async () => {
-		config.set('workflows.callerPolicyDefaultOption', 'none');
-		jest
-			.spyOn(ownershipService, 'getWorkflowOwnerCached')
-			.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`);
+	beforeAll(() => {
+		license = new LicenseMocker();
+		license.mock(Container.get(License));
+		license.enable('feat:sharing');
 	});
 
-	test('if sharing is disabled, ensures that workflows are owner by same user', async () => {
-		jest
-			.spyOn(ownershipService, 'getWorkflowOwnerCached')
-			.mockImplementation(async (workflowId) => fakeUser);
-		jest.spyOn(UserManagementHelper, 'isSharingEnabled').mockReturnValue(false);
-		jest.spyOn(userService, 'findOne').mockImplementation(async () => fakeUser);
-		jest.spyOn(WorkflowsService, 'getSharing').mockImplementation(async () => {
-			return sharedWorkflowNotOwner;
-		});
+	describe('no caller policy', () => {
+		test('should fall back to N8N_WORKFLOW_CALLER_POLICY_DEFAULT_OPTION', async () => {
+			config.set('workflows.callerPolicyDefaultOption', 'none');
 
-		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`);
+			const parentWorkflow = createParentWorkflow();
+			const subworkflow = createSubworkflow(); // no caller policy
 
-		// Check description
-		try {
-			await PermissionChecker.checkSubworkflowExecutePolicy(subworkflow, '', '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}`,
-				);
+			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');
+		});
 	});
 
-	test('list of ids must include the parent workflow id', async () => {
-		const invalidParentWorkflowId = uuid();
-		jest
-			.spyOn(ownershipService, 'getWorkflowOwnerCached')
-			.mockImplementation(async (workflowId) => fakeUser);
-		jest.spyOn(UserManagementHelper, 'isSharingEnabled').mockReturnValue(true);
-		jest.spyOn(userService, 'findOne').mockImplementation(async () => fakeUser);
-		jest.spyOn(WorkflowsService, 'getSharing').mockImplementation(async () => {
-			return sharedWorkflowNotOwner;
+	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();
 		});
 
-		const subworkflow = new Workflow({
-			nodes: [],
-			connections: {},
-			active: false,
-			nodeTypes: mockNodeTypes,
-			id: '2',
-			settings: {
-				callerPolicy: 'workflowsFromAList',
-				callerIds: '123,456,bcdef  ',
-			},
+		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();
 		});
-		await expect(
-			PermissionChecker.checkSubworkflowExecutePolicy(subworkflow, userId, invalidParentWorkflowId),
-		).rejects.toThrow(`Target workflow ID ${subworkflow.id} may not be called`);
 	});
 
-	test('sameOwner passes when both workflows are owned by the same user', async () => {
-		jest
-			.spyOn(ownershipService, 'getWorkflowOwnerCached')
-			.mockImplementation(async (workflowId) => fakeUser);
-		jest.spyOn(UserManagementHelper, 'isSharingEnabled').mockReturnValue(false);
-		jest.spyOn(userService, 'findOne').mockImplementation(async () => fakeUser);
-		jest.spyOn(WorkflowsService, 'getSharing').mockImplementation(async () => {
-			return sharedWorkflowOwner;
-		});
+	describe('any caller policy', () => {
+		test('should not throw', async () => {
+			const parentWorkflow = createParentWorkflow();
+			const subworkflow = createSubworkflow({ policy: 'any' });
+			ownershipService.getWorkflowOwnerCached.mockResolvedValue(new User());
 
-		const subworkflow = new Workflow({
-			nodes: [],
-			connections: {},
-			active: false,
-			nodeTypes: mockNodeTypes,
-			id: '2',
+			const check = PermissionChecker.checkSubworkflowExecutePolicy(subworkflow, parentWorkflow.id);
+
+			await expect(check).resolves.not.toThrow();
 		});
-		await expect(
-			PermissionChecker.checkSubworkflowExecutePolicy(subworkflow, userId, userId),
-		).resolves.not.toThrow();
 	});
 
-	test('workflowsFromAList works when the list contains the parent id', async () => {
-		const workflowId = uuid();
-		jest
-			.spyOn(ownershipService, 'getWorkflowOwnerCached')
-			.mockImplementation(async (workflowId) => fakeUser);
-		jest.spyOn(UserManagementHelper, 'isSharingEnabled').mockReturnValue(true);
-		jest.spyOn(userService, 'findOne').mockImplementation(async () => fakeUser);
-		jest.spyOn(WorkflowsService, 'getSharing').mockImplementation(async () => {
-			return sharedWorkflowNotOwner;
+	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));
 		});
 
-		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();
-	});
+		test('should allow if both workflows are owned by the same user', async () => {
+			const parentWorkflow = createParentWorkflow();
 
-	test('should not throw when workflow policy is set to any', async () => {
-		jest
-			.spyOn(ownershipService, 'getWorkflowOwnerCached')
-			.mockImplementation(async (workflowId) => fakeUser);
-		jest.spyOn(UserManagementHelper, 'isSharingEnabled').mockReturnValue(true);
-		jest.spyOn(userService, 'findOne').mockImplementation(async () => fakeUser);
-		jest.spyOn(WorkflowsService, 'getSharing').mockImplementation(async () => {
-			return sharedWorkflowNotOwner;
-		});
+			const bothWorkflowsOwner = Container.get(UserRepository).create({ id: uuid() });
 
-		const subworkflow = new Workflow({
-			nodes: [],
-			connections: {},
-			active: false,
-			nodeTypes: mockNodeTypes,
-			id: '2',
-			settings: {
-				callerPolicy: 'any',
-			},
+			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();
 		});
-		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 6c53b44891..5798c0cce2 100644
--- a/packages/cli/test/unit/PostHog.test.ts
+++ b/packages/cli/test/unit/PostHog.test.ts
@@ -2,7 +2,7 @@ import { PostHog } from 'posthog-node';
 import { InstanceSettings } from 'n8n-core';
 import { PostHogClient } from '@/posthog';
 import config from '@/config';
-import { mockInstance } from '../integration/shared/utils';
+import { mockInstance } from '../shared/mocking';
 
 jest.mock('posthog-node');
 
diff --git a/packages/cli/test/unit/SourceControl.test.ts b/packages/cli/test/unit/SourceControl.test.ts
index 48f055ed21..4d0d786532 100644
--- a/packages/cli/test/unit/SourceControl.test.ts
+++ b/packages/cli/test/unit/SourceControl.test.ts
@@ -18,6 +18,7 @@ import {
 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[] = [
 	{
@@ -149,8 +150,11 @@ const pullResult: SourceControlledFile[] = [
 	},
 ];
 
+const license = mockInstance(License);
+
 beforeAll(async () => {
-	Container.get(License).isSourceControlLicensed = () => true;
+	jest.resetAllMocks();
+	license.isSourceControlLicensed.mockReturnValue(true);
 	Container.get(SourceControlPreferencesService).getPreferences = () => ({
 		branchName: 'main',
 		connected: true,
@@ -205,10 +209,6 @@ describe('Source Control', () => {
 		expect(accessSync(gitFolder, fsConstants.F_OK)).toBeUndefined();
 	});
 
-	it('should check if source control is licensed', async () => {
-		expect(Container.get(License).isSourceControlLicensed()).toBe(true);
-	});
-
 	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');
diff --git a/packages/cli/test/unit/Telemetry.test.ts b/packages/cli/test/unit/Telemetry.test.ts
index 6899604279..25f4a80867 100644
--- a/packages/cli/test/unit/Telemetry.test.ts
+++ b/packages/cli/test/unit/Telemetry.test.ts
@@ -4,17 +4,10 @@ import config from '@/config';
 import { flushPromises } from './Helpers';
 import { PostHogClient } from '@/posthog';
 import { mock } from 'jest-mock-extended';
-import { mockInstance } from '../integration/shared/utils';
 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', () => {
@@ -55,7 +48,7 @@ describe('Telemetry', () => {
 		const postHog = new PostHogClient(instanceSettings);
 		await postHog.init();
 
-		telemetry = new Telemetry(mock(), postHog, mock(), instanceSettings);
+		telemetry = new Telemetry(mock(), postHog, mock(), instanceSettings, mock());
 		(telemetry as any).rudderStack = mockRudderStack;
 	});
 
diff --git a/packages/cli/test/unit/TestWebhooks.test.ts b/packages/cli/test/unit/TestWebhooks.test.ts
new file mode 100644
index 0000000000..3f53dc006b
--- /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>({
+				sessionId: '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/WaitTracker.test.ts b/packages/cli/test/unit/WaitTracker.test.ts
new file mode 100644
index 0000000000..f1f8f306dd
--- /dev/null
+++ b/packages/cli/test/unit/WaitTracker.test.ts
@@ -0,0 +1,83 @@
+import { WaitTracker } from '@/WaitTracker';
+import { mock } from 'jest-mock-extended';
+import type { ExecutionRepository } from '@/databases/repositories/execution.repository';
+import type { IExecutionResponse } from '@/Interfaces';
+
+jest.useFakeTimers();
+
+describe('WaitTracker', () => {
+	const executionRepository = mock<ExecutionRepository>();
+
+	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());
+
+			expect(executionRepository.getWaitingExecutions).toHaveBeenCalledTimes(1);
+		});
+
+		it('if no executions to start, should do nothing', () => {
+			executionRepository.getWaitingExecutions.mockResolvedValue([]);
+
+			new WaitTracker(mock(), executionRepository, mock());
+
+			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());
+
+				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());
+
+				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());
+
+			executionRepository.findSingleExecution.mockResolvedValue(execution);
+			waitTracker.startExecution(execution.id);
+			jest.advanceTimersByTime(5);
+
+			expect(executionRepository.findSingleExecution).toHaveBeenCalledWith(execution.id, {
+				includeData: true,
+				unflattenData: true,
+			});
+		});
+	});
+});
diff --git a/packages/cli/test/unit/WebhookHelpers.test.ts b/packages/cli/test/unit/WebhookHelpers.test.ts
new file mode 100644
index 0000000000..fb455b098a
--- /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 5f922adfd6..0000000000
--- 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,
-				name: 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', async () => {
-		const credentials = noIdNode.credentials!.test;
-		const expectedError = new Error(
-			`Credentials with name "${credentials.name}" for type "test" miss an ID.`,
-		);
-		await 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', async () => {
-		const credentials = notFoundNode.credentials!.test;
-		const expectedError = new Error(
-			`Could not find credentials for type "test" with ID "${credentials.id}".`,
-		);
-		await 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 5d72a01f2e..c36c43455e 100644
--- a/packages/cli/test/unit/WorkflowExecuteAdditionalData.test.ts
+++ b/packages/cli/test/unit/WorkflowExecuteAdditionalData.test.ts
@@ -1,7 +1,7 @@
 import { Container } from 'typedi';
-import { ExecutionMetadataRepository } from '@db/repositories';
+import { ExecutionMetadataRepository } from '@db/repositories/executionMetadata.repository';
 import { ExecutionMetadataService } from '@/services/executionMetadata.service';
-import { mockInstance } from '../integration/shared/utils';
+import { mockInstance } from '../shared/mocking';
 
 describe('WorkflowExecuteAdditionalData', () => {
 	const repository = mockInstance(ExecutionMetadataRepository);
diff --git a/packages/cli/test/unit/WorkflowHelpers.test.ts b/packages/cli/test/unit/WorkflowHelpers.test.ts
index dde5cdcd60..54f8b6e912 100644
--- a/packages/cli/test/unit/WorkflowHelpers.test.ts
+++ b/packages/cli/test/unit/WorkflowHelpers.test.ts
@@ -193,7 +193,7 @@ function generateCredentialEntity(credentialId: string) {
 	return credentialEntity;
 }
 
-function getWorkflow(options?: {
+export function getWorkflow(options?: {
 	addNodeWithoutCreds?: boolean;
 	addNodeWithOneCred?: boolean;
 	addNodeWithTwoCreds?: boolean;
diff --git a/packages/cli/test/unit/WorkflowRunner.test.ts b/packages/cli/test/unit/WorkflowRunner.test.ts
index ecd3436494..876ae1ac1c 100644
--- a/packages/cli/test/unit/WorkflowRunner.test.ts
+++ b/packages/cli/test/unit/WorkflowRunner.test.ts
@@ -1,18 +1,22 @@
 import type { User } from '@db/entities/User';
-import * as testDb from '../integration/shared/testDb';
-import * as utils from '../integration/shared/utils/';
-import { createWorkflow, createExecution } from '../integration/shared/testDb';
 import { WorkflowRunner } from '@/WorkflowRunner';
 import { WorkflowHooks, type ExecutionError, type IWorkflowExecuteHooks } from 'n8n-workflow';
 import { Push } from '@/push';
-import { mockInstance } from '../integration/shared/utils';
 import Container from 'typedi';
 import config from '@/config';
 
+import { mockInstance } from '../shared/mocking';
+import * as testDb from '../integration/shared/testDb';
+import { setupTestServer } from '../integration/shared/utils';
+import { getGlobalOwnerRole } from '../integration/shared/db/roles';
+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;
-utils.setupTestServer({ endpointGroups: [] });
+setupTestServer({ endpointGroups: [] });
 
 class Watchers {
 	workflowExecuteAfter = jest.fn();
@@ -21,8 +25,8 @@ const watchers = new Watchers();
 const watchedWorkflowExecuteAfter = jest.spyOn(watchers, 'workflowExecuteAfter');
 
 beforeAll(async () => {
-	const globalOwnerRole = await testDb.getGlobalOwnerRole();
-	owner = await testDb.createUser({ globalRole: globalOwnerRole });
+	const globalOwnerRole = await getGlobalOwnerRole();
+	owner = await createUser({ globalRole: globalOwnerRole });
 
 	mockInstance(Push);
 	Container.set(Push, new Push());
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 0000000000..bb9041b3b6
--- /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 0000000000..b390bf9ad9
--- /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/controllers/me.controller.test.ts b/packages/cli/test/unit/controllers/me.controller.test.ts
index 8ac2a3b826..aaaea5a86a 100644
--- a/packages/cli/test/unit/controllers/me.controller.test.ts
+++ b/packages/cli/test/unit/controllers/me.controller.test.ts
@@ -4,20 +4,24 @@ import jwt from 'jsonwebtoken';
 import { mock, anyObject, captor } from 'jest-mock-extended';
 import type { PublicUser } from '@/Interfaces';
 import type { User } from '@db/entities/User';
-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 { badPasswords } from '../shared/testData';
-import { mockInstance } from '../../integration/shared/utils';
+import { mockInstance } from '../../shared/mocking';
+import { BadRequestError } from '@/errors/response-errors/bad-request.error';
+import { UserRepository } from '@/databases/repositories/user.repository';
 
 describe('MeController', () => {
 	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', () => {
@@ -45,12 +49,18 @@ describe('MeController', () => {
 			const reqBody = { email: 'valid@email.com', firstName: 'John', lastName: 'Potato' };
 			const req = mock<MeRequest.UserUpdate>({ user, body: reqBody });
 			const res = mock<Response>();
-			userService.findOneOrFail.mockResolvedValue(user);
+			userRepository.findOneOrFail.mockResolvedValue(user);
 			jest.spyOn(jwt, 'sign').mockImplementation(() => 'signed-token');
 			userService.toPublic.mockResolvedValue({} as unknown as PublicUser);
 
 			await controller.updateCurrentUser(req, res);
 
+			expect(externalHooks.run).toHaveBeenCalledWith('user.profile.beforeUpdate', [
+				user.id,
+				user.email,
+				reqBody,
+			]);
+
 			expect(userService.update).toHaveBeenCalled();
 
 			const cookieOptions = captor<CookieOptions>();
@@ -74,7 +84,7 @@ describe('MeController', () => {
 			const reqBody = { email: 'valid@email.com', firstName: 'John', lastName: 'Potato' };
 			const req = mock<MeRequest.UserUpdate>({ user, body: reqBody });
 			const res = mock<Response>();
-			userService.findOneOrFail.mockResolvedValue(user);
+			userRepository.findOneOrFail.mockResolvedValue(user);
 			jest.spyOn(jwt, 'sign').mockImplementation(() => 'signed-token');
 
 			// Add invalid data to the request payload
@@ -91,6 +101,28 @@ describe('MeController', () => {
 			expect(updatedUser.id).not.toBe('0');
 			expect(updatedUser.globalRoleId).not.toBe('42');
 		});
+
+		it('should throw BadRequestError if beforeUpdate hook throws BadRequestError', async () => {
+			const user = mock<User>({
+				id: '123',
+				password: 'password',
+				authIdentities: [],
+				globalRoleId: '1',
+			});
+			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'),
+			);
+		});
 	});
 
 	describe('updatePassword', () => {
@@ -136,7 +168,7 @@ describe('MeController', () => {
 				body: { currentPassword: 'old_password', newPassword: 'NewPassword123' },
 			});
 			const res = mock<Response>();
-			userService.save.calledWith(req.user).mockResolvedValue(req.user);
+			userRepository.save.calledWith(req.user).mockResolvedValue(req.user);
 			jest.spyOn(jwt, 'sign').mockImplementation(() => 'new-signed-token');
 
 			await controller.updatePassword(req, res);
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 0000000000..0ea169261c
--- /dev/null
+++ b/packages/cli/test/unit/controllers/oAuth1Credential.controller.test.ts
@@ -0,0 +1,98 @@
+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: [],
+		globalRoleId: '1',
+	});
+	const credential = mock<CredentialsEntity>({
+		id: '1',
+		name: 'Test Credential',
+		nodesAccess: [],
+		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 0000000000..3498f6a532
--- /dev/null
+++ b/packages/cli/test/unit/controllers/oAuth2Credential.controller.test.ts
@@ -0,0 +1,221 @@
+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: [],
+		globalRoleId: '1',
+	});
+	const credential = mock<CredentialsEntity>({
+		id: '1',
+		name: 'Test Credential',
+		nodesAccess: [],
+		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 b131f2c04d..90c6e02eb6 100644
--- a/packages/cli/test/unit/controllers/owner.controller.test.ts
+++ b/packages/cli/test/unit/controllers/owner.controller.test.ts
@@ -1,41 +1,50 @@
 import type { CookieOptions, Response } from 'express';
 import { anyObject, captor, mock } from 'jest-mock-extended';
 import jwt from 'jsonwebtoken';
-import type { IInternalHooksClass } from '@/Interfaces';
 import type { User } from '@db/entities/User';
-import type { SettingsRepository } from '@db/repositories';
-import type { Config } from '@/config';
-import { BadRequestError } from '@/ResponseHelper';
+import type { SettingsRepository } from '@db/repositories/settings.repository';
+import config from '@/config';
 import type { OwnerRequest } from '@/requests';
-import { OwnerController } from '@/controllers';
-import { badPasswords } from '../shared/testData';
+import { OwnerController } from '@/controllers/owner.controller';
 import { AUTH_COOKIE_NAME } from '@/constants';
 import { UserService } from '@/services/user.service';
-import { mockInstance } from '../../integration/shared/utils';
+import { License } from '@/License';
+
+import { mockInstance } from '../../shared/mocking';
+import { badPasswords } from '../shared/testData';
+import { BadRequestError } from '@/errors/response-errors/bad-request.error';
+import { PasswordUtility } from '@/services/password.utility';
+import Container from 'typedi';
+import type { InternalHooks } from '@/InternalHooks';
+import { UserRepository } from '@/databases/repositories/user.repository';
 
 describe('OwnerController', () => {
-	const config = mock<Config>();
-	const internalHooks = mock<IInternalHooksClass>();
+	const configGetSpy = jest.spyOn(config, 'getEnv');
+	const internalHooks = mock<InternalHooks>();
 	const userService = mockInstance(UserService);
+	const userRepository = mockInstance(UserRepository);
 	const settingsRepository = mock<SettingsRepository>();
+	mockInstance(License).isWithinUsersLimit.mockReturnValue(true);
 	const controller = new OwnerController(
-		config,
 		mock(),
 		internalHooks,
 		settingsRepository,
 		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);
+			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' } });
 			await expect(controller.setupOwner(req, mock())).rejects.toThrowError(
 				new BadRequestError('Invalid email address'),
@@ -45,7 +54,7 @@ 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 } });
 					await expect(controller.setupOwner(req, mock())).rejects.toThrowError(
 						new BadRequestError(errorMessage),
@@ -55,7 +64,7 @@ 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: '' },
 			});
@@ -80,13 +89,13 @@ describe('OwnerController', () => {
 				user,
 			});
 			const res = mock<Response>();
-			config.getEnv.calledWith('userManagement.isInstanceOwnerSetUp').mockReturnValue(false);
-			userService.save.calledWith(anyObject()).mockResolvedValue(user);
+			configGetSpy.mockReturnValue(false);
+			userRepository.save.calledWith(anyObject()).mockResolvedValue(user);
 			jest.spyOn(jwt, 'sign').mockImplementation(() => 'signed-token');
 
 			await controller.setupOwner(req, res);
 
-			expect(userService.save).toHaveBeenCalledWith(user);
+			expect(userRepository.save).toHaveBeenCalledWith(user);
 
 			const cookieOptions = captor<CookieOptions>();
 			expect(res.cookie).toHaveBeenCalledWith(AUTH_COOKIE_NAME, 'signed-token', cookieOptions);
diff --git a/packages/cli/test/unit/controllers/translation.controller.test.ts b/packages/cli/test/unit/controllers/translation.controller.test.ts
index e23f196d0d..b56fdf2a58 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,
 	CREDENTIAL_TRANSLATIONS_DIR,
 } from '@/controllers/translation.controller';
-import { BadRequestError } from '@/ResponseHelper';
+import { BadRequestError } from '@/errors/response-errors/bad-request.error';
 
 describe('TranslationController', () => {
-	const config = mock<Config>();
+	const configGetSpy = jest.spyOn(config, 'getEnv');
 	const credentialTypes = mock<ICredentialTypes>();
-	const controller = new TranslationController(config, credentialTypes);
+	const controller = new TranslationController(credentialTypes);
 
 	describe('getCredentialTranslation', () => {
 		it('should throw 400 on invalid credential types', async () => {
@@ -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/databases/utils/customValidators.test.ts b/packages/cli/test/unit/databases/utils/customValidators.test.ts
new file mode 100644
index 0000000000..df906b36d6
--- /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 0000000000..1870d95122
--- /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/execution-lifecyle/restoreBinaryDataId.test.ts b/packages/cli/test/unit/execution-lifecyle/restoreBinaryDataId.test.ts
new file mode 100644
index 0000000000..3fcdb79c72
--- /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 0000000000..4235e56ecb
--- /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 0000000000..6fc516a0ea
--- /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/execution.lifecycle.test.ts b/packages/cli/test/unit/execution.lifecycle.test.ts
deleted file mode 100644
index c41465c8e5..0000000000
--- a/packages/cli/test/unit/execution.lifecycle.test.ts
+++ /dev/null
@@ -1,132 +0,0 @@
-import { restoreBinaryDataId } from '@/executionLifecycleHooks/restoreBinaryDataId';
-import { BinaryDataService } from 'n8n-core';
-import { mockInstance } from '../integration/shared/utils/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') {
-	// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-	// @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`, () => {
-		describe('restoreBinaryDataId()', () => {
-			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);
-
-				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);
-
-				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);
-
-				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);
-
-				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);
-
-				await expect(promise).resolves.not.toThrow();
-
-				expect(binaryDataService.rename).not.toHaveBeenCalled();
-			});
-		});
-	});
-}
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 0000000000..7ac75ba5b3
--- /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/push/websocket.push.test.ts b/packages/cli/test/unit/push/websocket.push.test.ts
new file mode 100644
index 0000000000..ab55605ba9
--- /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 sessionId1 = 'test-session1';
+	const sessionId2 = '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(sessionId1, 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(sessionId1, 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(sessionId1, userId, mockWebSocket1);
+		webSocketPush.add(sessionId2, userId, mockWebSocket2);
+		const data: PushDataExecutionRecovered = {
+			type: 'executionRecovered',
+			data: {
+				executionId: 'test-execution-id',
+			},
+		};
+
+		webSocketPush.sendToOneSession('executionRecovered', data, sessionId1);
+
+		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(sessionId1, userId, mockWebSocket1);
+		webSocketPush.add(sessionId2, userId, mockWebSocket2);
+		const data: PushDataExecutionRecovered = {
+			type: 'executionRecovered',
+			data: {
+				executionId: 'test-execution-id',
+			},
+		};
+
+		webSocketPush.sendToAllSessions('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(sessionId1, userId, mockWebSocket1);
+		webSocketPush.add(sessionId2, 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(sessionId1, userId, mockWebSocket1);
+		webSocketPush.add(sessionId2, 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(sessionId1, userId, mockWebSocket1);
+		webSocketPush.add(sessionId2, userId, mockWebSocket2);
+
+		const data = { test: 'data' };
+		const buffer = Buffer.from(JSON.stringify(data));
+
+		mockWebSocket1.emit('message', buffer);
+
+		expect(mockOnMessageReceived).toHaveBeenCalledWith({
+			msg: data,
+			sessionId: sessionId1,
+			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 0000000000..e101e77557
--- /dev/null
+++ b/packages/cli/test/unit/repositories/execution.repository.test.ts
@@ -0,0 +1,52 @@
+import { mock } from 'jest-mock-extended';
+import Container from 'typedi';
+import type { EntityMetadata } from 'typeorm';
+import { EntityManager, DataSource, Not, LessThanOrEqual } from 'typeorm';
+
+import config from '@/config';
+import { ExecutionEntity } from '@db/entities/ExecutionEntity';
+import { ExecutionRepository } from '@db/repositories/execution.repository';
+
+import { mockInstance } from '../../shared/mocking';
+
+describe('ExecutionRepository', () => {
+	const entityManager = mockInstance(EntityManager);
+	const dataSource = mockInstance(DataSource, { manager: entityManager });
+	dataSource.getMetadata.mockReturnValue(mock<EntityMetadata>({ target: ExecutionEntity }));
+	Object.assign(entityManager, { connection: dataSource });
+
+	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'),
+						),
+					},
+				});
+			},
+		);
+	});
+});
diff --git a/packages/cli/test/unit/repositories/role.repository.test.ts b/packages/cli/test/unit/repositories/role.repository.test.ts
index c7669967cf..40d95207ac 100644
--- a/packages/cli/test/unit/repositories/role.repository.test.ts
+++ b/packages/cli/test/unit/repositories/role.repository.test.ts
@@ -4,7 +4,7 @@ import { mock } from 'jest-mock-extended';
 import type { RoleNames, RoleScopes } from '@db/entities/Role';
 import { Role } from '@db/entities/Role';
 import { RoleRepository } from '@db/repositories/role.repository';
-import { mockInstance } from '../../integration/shared/utils/';
+import { mockInstance } from '../../shared/mocking';
 import { randomInteger } from '../../integration/shared/random';
 
 describe('RoleRepository', () => {
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 0000000000..f14c2ee354
--- /dev/null
+++ b/packages/cli/test/unit/repositories/sharedCredentials.repository.test.ts
@@ -0,0 +1,75 @@
+import { Container } from 'typedi';
+import { DataSource, EntityManager, type EntityMetadata } from 'typeorm';
+import { mock } from 'jest-mock-extended';
+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 { mockInstance } from '../../shared/mocking';
+import { memberPermissions, ownerPermissions } from '@/permissions/roles';
+import { hasScope } from '@n8n/permissions';
+
+describe('SharedCredentialsRepository', () => {
+	const entityManager = mockInstance(EntityManager);
+	const dataSource = mockInstance(DataSource, {
+		manager: entityManager,
+		getMetadata: () => mock<EntityMetadata>({ target: SharedCredentials }),
+	});
+	Object.assign(entityManager, { connection: dataSource });
+	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 0000000000..7aa0280600
--- /dev/null
+++ b/packages/cli/test/unit/repositories/workflowStatistics.test.ts
@@ -0,0 +1,53 @@
+import { WorkflowStatisticsRepository } from '@db/repositories/workflowStatistics.repository';
+import { DataSource, EntityManager, InsertResult, QueryFailedError } from 'typeorm';
+import { mockInstance } from '../../shared/mocking';
+import { mock, mockClear } from 'jest-mock-extended';
+import { StatisticsNames, WorkflowStatistics } from '@/databases/entities/WorkflowStatistics';
+
+const entityManager = mockInstance(EntityManager);
+const dataSource = mockInstance(DataSource, { manager: entityManager });
+dataSource.getMetadata.mockReturnValue(mock());
+Object.assign(entityManager, { connection: dataSource });
+const workflowStatisticsRepository = new WorkflowStatisticsRepository(dataSource);
+
+describe('insertWorkflowStatistics', () => {
+	beforeEach(() => {
+		mockClear(entityManager.insert);
+	});
+	it('Successfully inserts data when it is not yet present', async () => {
+		entityManager.findOne.mockResolvedValueOnce(null);
+		entityManager.insert.mockResolvedValueOnce(mockInstance(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(mockInstance(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', [], '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 0000000000..7432d22491
--- /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/cache-mock.service.test.ts b/packages/cli/test/unit/services/cache-mock.service.test.ts
index 925ab9fdcf..b094f3e0d0 100644
--- a/packages/cli/test/unit/services/cache-mock.service.test.ts
+++ b/packages/cli/test/unit/services/cache-mock.service.test.ts
@@ -1,6 +1,6 @@
 import Container from 'typedi';
 import { mock } from 'jest-mock-extended';
-import { CacheService } from '@/services/cache.service';
+import { CacheService } from '@/services/cache/cache.service';
 
 const cacheService = Container.get(CacheService);
 const store = mock<NonNullable<CacheService['cache']>['store']>({ isCacheable: () => true });
diff --git a/packages/cli/test/unit/services/cache.service.test.ts b/packages/cli/test/unit/services/cache.service.test.ts
index 2648acc150..a742b20698 100644
--- a/packages/cli/test/unit/services/cache.service.test.ts
+++ b/packages/cli/test/unit/services/cache.service.test.ts
@@ -1,356 +1,240 @@
-import Container from 'typedi';
-import { CacheService } from '@/services/cache.service';
-import type { MemoryCache } from 'cache-manager';
-import type { RedisCache } from 'cache-manager-ioredis-yet';
+import { CacheService } from '@/services/cache/cache.service';
 import config from '@/config';
+import { sleep } from 'n8n-workflow';
 
-const cacheService = Container.get(CacheService);
+jest.mock('ioredis', () => {
+	const Redis = require('ioredis-mock');
 
-function setDefaultConfig() {
-	config.set('executions.mode', 'regular');
-	config.set('cache.enabled', true);
-	config.set('cache.backend', 'memory');
-	config.set('cache.memory.maxSize', 1 * 1024 * 1024);
-}
+	return function (...args: unknown[]) {
+		return new Redis(args);
+	};
+});
 
-interface TestObject {
-	test: string;
-	test2: number;
-	test3?: TestObject & { test4: TestObject };
-}
+for (const backend of ['memory', 'redis'] as const) {
+	describe(backend, () => {
+		let cacheService: CacheService;
 
-const testObject: TestObject = {
-	test: 'test',
-	test2: 123,
-	test3: {
-		test: 'test3',
-		test2: 123,
-		test4: {
-			test: 'test4',
-			test2: 123,
-		},
-	},
-};
+		beforeAll(async () => {
+			config.set('cache.backend', backend);
+			cacheService = new CacheService();
+			await cacheService.init();
+		});
 
-describe('cacheService', () => {
-	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: {} } },
-				};
+		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);
+				});
 			}
-			// second mock for our code
-			// eslint-disable-next-line @typescript-eslint/no-explicit-any
-			return function (...args: any) {
-				return new Redis(args);
-			};
+
+			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');
+			});
 		});
 	});
-
-	beforeEach(async () => {
-		setDefaultConfig();
-		await Container.get(CacheService).destroy();
-	});
-
-	test('should create a memory cache by default', async () => {
-		await cacheService.init();
-		await expect(cacheService.getCache()).resolves.toBeDefined();
-		const candidate = (await cacheService.getCache()) as MemoryCache;
-		// type guard to check that a MemoryCache is returned and not a RedisCache (which does not have a size property)
-		expect(candidate.store.size).toBeDefined();
-	});
-
-	test('should cache and retrieve a value', async () => {
-		await cacheService.init();
-		await expect(cacheService.getCache()).resolves.toBeDefined();
-		await cacheService.set('testString', 'test');
-		await cacheService.set('testNumber1', 123);
-
-		await expect(cacheService.get('testString')).resolves.toBe('test');
-		expect(typeof (await cacheService.get('testString'))).toBe('string');
-		await expect(cacheService.get('testNumber1')).resolves.toBe(123);
-		expect(typeof (await cacheService.get('testNumber1'))).toBe('number');
-	});
-
-	test('should honour ttl values', async () => {
-		await cacheService.set('testString', 'test', 10);
-		await cacheService.set('testNumber1', 123, 1000);
-
-		const store = (await cacheService.getCache())?.store;
-
-		expect(store).toBeDefined();
-
-		await expect(store!.ttl('testString')).resolves.toBeLessThanOrEqual(100);
-		await expect(store!.ttl('testNumber1')).resolves.toBeLessThanOrEqual(1000);
-	});
-
-	test('should set and remove values', async () => {
-		await cacheService.set('testString', 'test');
-		await expect(cacheService.get('testString')).resolves.toBe('test');
-		await cacheService.delete('testString');
-		await expect(cacheService.get('testString')).resolves.toBeUndefined();
-	});
-
-	test('should calculate maxSize', async () => {
-		config.set('cache.memory.maxSize', 16);
-		await cacheService.destroy();
-
-		// 16 bytes because stringify wraps the string in quotes, so 2 bytes for the quotes
-		await cacheService.set('testString', 'withoutUnicode');
-		await expect(cacheService.get('testString')).resolves.toBe('withoutUnicode');
-
-		await cacheService.destroy();
-
-		// should not fit!
-		await cacheService.set('testString', 'withUnicodeԱԲԳ');
-		await expect(cacheService.get('testString')).resolves.toBeUndefined();
-	});
-
-	test('should set and get complex objects', async () => {
-		await cacheService.set('testObject', testObject);
-		await expect(cacheService.get('testObject')).resolves.toMatchObject(testObject);
-	});
-
-	test('should set and get multiple values', async () => {
-		await cacheService.destroy();
-		expect(cacheService.isRedisCache()).toBe(false);
-
-		await cacheService.setMany([
-			['testString', 'test'],
-			['testString2', 'test2'],
-		]);
-		await cacheService.setMany([
-			['testNumber1', 123],
-			['testNumber2', 456],
-		]);
-		await expect(cacheService.getMany(['testString', 'testString2'])).resolves.toStrictEqual([
-			'test',
-			'test2',
-		]);
-		await expect(cacheService.getMany(['testNumber1', 'testNumber2'])).resolves.toStrictEqual([
-			123, 456,
-		]);
-	});
-
-	test('should create a redis in queue mode', async () => {
-		config.set('cache.backend', 'auto');
-		config.set('executions.mode', 'queue');
-		await cacheService.destroy();
-		await cacheService.init();
-
-		const cache = await cacheService.getCache();
-		await expect(cacheService.getCache()).resolves.toBeDefined();
-		const candidate = (await cacheService.getCache()) as RedisCache;
-		expect(candidate.store.client).toBeDefined();
-	});
-
-	test('should create a redis cache if asked', async () => {
-		config.set('cache.backend', 'redis');
-		config.set('executions.mode', 'queue');
-		await cacheService.destroy();
-		await cacheService.init();
-
-		const cache = await cacheService.getCache();
-		await expect(cacheService.getCache()).resolves.toBeDefined();
-		const candidate = (await cacheService.getCache()) as RedisCache;
-		expect(candidate.store.client).toBeDefined();
-	});
-
-	test('should get/set/delete redis cache', async () => {
-		config.set('cache.backend', 'redis');
-		config.set('executions.mode', 'queue');
-		await cacheService.destroy();
-		await cacheService.init();
-
-		await cacheService.set('testObject', testObject);
-		await expect(cacheService.get('testObject')).resolves.toMatchObject(testObject);
-		await cacheService.delete('testObject');
-		await expect(cacheService.get('testObject')).resolves.toBeUndefined();
-	});
-
-	// NOTE: mset and mget are not supported by ioredis-mock
-	// test('should set and get multiple values with redis', async () => {
-	// });
-
-	test('should return fallback value if key is not set', async () => {
-		await cacheService.reset();
-		await expect(cacheService.get('testString')).resolves.toBeUndefined();
-		await expect(
-			cacheService.get('testString', {
-				fallbackValue: 'fallback',
-			}),
-		).resolves.toBe('fallback');
-	});
-
-	test('should call refreshFunction if key is not set', async () => {
-		await cacheService.reset();
-		await expect(cacheService.get('testString')).resolves.toBeUndefined();
-		await expect(
-			cacheService.get('testString', {
-				refreshFunction: async () => 'refreshed',
-				fallbackValue: 'this should not be returned',
-			}),
-		).resolves.toBe('refreshed');
-	});
-
-	test('should transparently handle disabled cache', async () => {
-		await cacheService.disable();
-		await expect(cacheService.get('testString')).resolves.toBeUndefined();
-		await cacheService.set('testString', 'whatever');
-		await expect(cacheService.get('testString')).resolves.toBeUndefined();
-		await expect(
-			cacheService.get('testString', {
-				fallbackValue: 'fallback',
-			}),
-		).resolves.toBe('fallback');
-		await expect(
-			cacheService.get('testString', {
-				refreshFunction: async () => 'refreshed',
-				fallbackValue: 'this should not be returned',
-			}),
-		).resolves.toBe('refreshed');
-	});
-
-	test('should set and get partial results', async () => {
-		await cacheService.setMany([
-			['testNumber1', 123],
-			['testNumber2', 456],
-		]);
-		await expect(cacheService.getMany(['testNumber1', 'testNumber2'])).resolves.toStrictEqual([
-			123, 456,
-		]);
-		await expect(cacheService.getMany(['testNumber3', 'testNumber2'])).resolves.toStrictEqual([
-			undefined,
-			456,
-		]);
-	});
-
-	test('should getMany and fix partial results and set single key', async () => {
-		await cacheService.setMany([
-			['testNumber1', 123],
-			['testNumber2', 456],
-		]);
-		await expect(
-			cacheService.getMany(['testNumber1', 'testNumber2', 'testNumber3']),
-		).resolves.toStrictEqual([123, 456, undefined]);
-		await expect(cacheService.get('testNumber3')).resolves.toBeUndefined();
-		await expect(
-			cacheService.getMany(['testNumber1', 'testNumber2', 'testNumber3'], {
-				async refreshFunctionEach(key) {
-					return key === 'testNumber3' ? 789 : undefined;
-				},
-			}),
-		).resolves.toStrictEqual([123, 456, 789]);
-		await expect(cacheService.get('testNumber3')).resolves.toBe(789);
-	});
-
-	test('should getMany and set all keys', async () => {
-		await cacheService.setMany([
-			['testNumber1', 123],
-			['testNumber2', 456],
-		]);
-		await expect(
-			cacheService.getMany(['testNumber1', 'testNumber2', 'testNumber3']),
-		).resolves.toStrictEqual([123, 456, undefined]);
-		await expect(cacheService.get('testNumber3')).resolves.toBeUndefined();
-		await expect(
-			cacheService.getMany(['testNumber1', 'testNumber2', 'testNumber3'], {
-				async refreshFunctionMany(keys) {
-					return [111, 222, 333];
-				},
-			}),
-		).resolves.toStrictEqual([111, 222, 333]);
-		await expect(cacheService.get('testNumber1')).resolves.toBe(111);
-		await expect(cacheService.get('testNumber2')).resolves.toBe(222);
-		await expect(cacheService.get('testNumber3')).resolves.toBe(333);
-	});
-
-	test('should set and get multiple values with fallbackValue', async () => {
-		await cacheService.disable();
-		await cacheService.setMany([
-			['testNumber1', 123],
-			['testNumber2', 456],
-		]);
-		await expect(cacheService.getMany(['testNumber1', 'testNumber2'])).resolves.toStrictEqual([
-			undefined,
-			undefined,
-		]);
-		await expect(
-			cacheService.getMany(['testNumber1', 'testNumber2'], {
-				fallbackValues: [123, 456],
-			}),
-		).resolves.toStrictEqual([123, 456]);
-		await expect(
-			cacheService.getMany(['testNumber1', 'testNumber2'], {
-				refreshFunctionMany: async () => [123, 456],
-				fallbackValues: [0, 1],
-			}),
-		).resolves.toStrictEqual([123, 456]);
-	});
-
-	test('should deal with unicode keys', async () => {
-		const key = '? > ":< ! withUnicodeԱԲԳ';
-		await cacheService.set(key, 'test');
-		await expect(cacheService.get(key)).resolves.toBe('test');
-		await cacheService.delete(key);
-		await expect(cacheService.get(key)).resolves.toBeUndefined();
-	});
-
-	test('should deal with unicode keys in redis', async () => {
-		config.set('cache.backend', 'redis');
-		config.set('executions.mode', 'queue');
-		await cacheService.destroy();
-		await cacheService.init();
-		const key = '? > ":< ! withUnicodeԱԲԳ';
-
-		expect(((await cacheService.getCache()) as RedisCache).store.client).toBeDefined();
-
-		await cacheService.set(key, 'test');
-		await expect(cacheService.get(key)).resolves.toBe('test');
-		await cacheService.delete(key);
-		await expect(cacheService.get(key)).resolves.toBeUndefined();
-	});
-
-	test('should not cache null or undefined values', async () => {
-		await cacheService.set('nullValue', null);
-		await cacheService.set('undefValue', undefined);
-		await cacheService.set('normalValue', 'test');
-
-		await expect(cacheService.get('normalValue')).resolves.toBe('test');
-		await expect(cacheService.get('undefValue')).resolves.toBeUndefined();
-		await expect(cacheService.get('nullValue')).resolves.toBeUndefined();
-	});
-
-	test('should handle setting empty keys', async () => {
-		await cacheService.set('', null);
-		await expect(cacheService.get('')).resolves.toBeUndefined();
-		await cacheService.setMany([
-			['', 'something'],
-			['', 'something'],
-		]);
-		await expect(cacheService.getMany([''])).resolves.toStrictEqual([undefined]);
-		await cacheService.setMany([]);
-		await expect(cacheService.getMany([])).resolves.toStrictEqual([]);
-	});
-
-	test('should handle setting empty keys (redis)', async () => {
-		config.set('cache.backend', 'redis');
-		config.set('executions.mode', 'queue');
-		await cacheService.destroy();
-		await cacheService.init();
-
-		await cacheService.set('', null);
-		await expect(cacheService.get('')).resolves.toBeUndefined();
-		await cacheService.setMany([
-			['', 'something'],
-			['', 'something'],
-		]);
-		await expect(cacheService.getMany([''])).resolves.toStrictEqual([undefined]);
-		await cacheService.setMany([]);
-		await expect(cacheService.getMany([])).resolves.toStrictEqual([]);
-	});
-});
+}
diff --git a/packages/cli/test/unit/services/communityPackages.service.test.ts b/packages/cli/test/unit/services/communityPackages.service.test.ts
index 6bbee36d53..1d2a74e369 100644
--- a/packages/cli/test/unit/services/communityPackages.service.test.ts
+++ b/packages/cli/test/unit/services/communityPackages.service.test.ts
@@ -15,16 +15,18 @@ import config from '@/config';
 import { InstalledPackages } from '@db/entities/InstalledPackages';
 import type { CommunityPackages } from '@/Interfaces';
 import { CommunityPackagesService } from '@/services/communityPackages.service';
-import { InstalledNodesRepository, InstalledPackagesRepository } from '@/databases/repositories';
-import { InstalledNodes } from '@/databases/entities/InstalledNodes';
+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 { mockInstance, mockPackageName, mockPackagePair } from '../../integration/shared/utils';
+import { mockPackageName, mockPackagePair } from '../../integration/shared/utils';
 
 jest.mock('fs/promises');
 jest.mock('child_process');
diff --git a/packages/cli/test/unit/services/events.service.test.ts b/packages/cli/test/unit/services/events.service.test.ts
index b8703054a8..bc1aeb6387 100644
--- a/packages/cli/test/unit/services/events.service.test.ts
+++ b/packages/cli/test/unit/services/events.service.test.ts
@@ -11,11 +11,11 @@ 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';
+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 '../../integration/shared/utils';
+import { mockInstance } from '../../shared/mocking';
 
 jest.mock('@/UserManagement/UserManagementHelper', () => ({ getWorkflowOwner: jest.fn() }));
 
diff --git a/packages/cli/test/unit/services/jwt.service.test.ts b/packages/cli/test/unit/services/jwt.service.test.ts
index c3dde6be5d..74dd5cd51b 100644
--- a/packages/cli/test/unit/services/jwt.service.test.ts
+++ b/packages/cli/test/unit/services/jwt.service.test.ts
@@ -1,42 +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';
-import { randomString } from '../../integration/shared/random';
-import * as jwt from 'jsonwebtoken';
 
 describe('JwtService', () => {
-	config.set('userManagement.jwtSecret', randomString(5, 10));
+	const iat = 1699984313;
+	const jwtSecret = 'random-string';
+	const payload = { sub: 1 };
+	const signedToken =
+		'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOjEsImlhdCI6MTY5OTk4NDMxM30.xNZOAmcidW5ovEF_mwIOzCWkJ70FEO6MFNLK2QRDOeQ';
 
-	const jwtService = new JwtService();
+	const instanceSettings = mock<InstanceSettings>({ encryptionKey: 'test-key' });
 
 	beforeEach(() => {
 		jest.clearAllMocks();
 	});
 
-	test('Should sign input with user management secret', async () => {
-		const userId = 1;
+	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);
+		});
 
-		const token = jwtService.signData({ sub: userId });
-		expect(typeof token).toBe('string');
-
-		const secret = config.get('userManagement.jwtSecret');
-
-		const decodedToken = jwt.verify(token, secret);
-
-		expect(decodedToken).toHaveProperty('sub');
-		expect(decodedToken).toHaveProperty('iat');
-		expect(decodedToken?.sub).toBe(userId);
+		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',
+			);
+		});
 	});
 
-	test('Should verify token with user management secret', async () => {
-		const userId = 1;
+	describe('with a secret set', () => {
+		config.set('userManagement.jwtSecret', jwtSecret);
+		const jwtService = new JwtService(instanceSettings);
 
-		const secret = config.get('userManagement.jwtSecret');
+		beforeAll(() => {
+			jest.useFakeTimers().setSystemTime(new Date(iat * 1000));
+		});
 
-		const token = jwt.sign({ sub: userId }, secret);
+		afterAll(() => jest.useRealTimers());
 
-		const decodedToken = jwt.verify(token, secret);
+		it('should sign', () => {
+			const token = jwtService.sign(payload);
+			expect(token).toEqual(signedToken);
+		});
 
-		expect(decodedToken).toHaveProperty('sub');
-		expect(decodedToken?.sub).toBe(userId);
+		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 0000000000..ea2c34fb8c
--- /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
index 18b8e7ea0c..8a71d6784e 100644
--- a/packages/cli/test/unit/services/orchestration.service.test.ts
+++ b/packages/cli/test/unit/services/orchestration.service.test.ts
@@ -1,19 +1,22 @@
 import Container from 'typedi';
 import config from '@/config';
-import { OrchestrationMainService } from '@/services/orchestration/main/orchestration.main.service';
+import { SingleMainSetup } from '@/services/orchestration/main/SingleMainSetup';
 import type { RedisServiceWorkerResponseObject } from '@/services/redis/RedisServiceCommands';
 import { eventBus } from '@/eventbus';
 import { RedisService } from '@/services/redis.service';
-import { mockInstance } from '../../integration/shared/utils';
 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 { ActiveWorkflowRunner } from '@/ActiveWorkflowRunner';
+import { mockInstance } from '../../shared/mocking';
 
-const os = Container.get(OrchestrationMainService);
+const os = Container.get(SingleMainSetup);
 const handler = Container.get(OrchestrationHandlerMainService);
+mockInstance(ActiveWorkflowRunner);
 
 let queueModeId: string;
 
@@ -33,6 +36,7 @@ const workerRestartEventbusResponse: RedisServiceWorkerResponseObject = {
 
 describe('Orchestration Service', () => {
 	const logger = mockInstance(Logger);
+	mockInstance(Push);
 	beforeAll(async () => {
 		mockInstance(RedisService);
 		mockInstance(ExternalSecretsManager);
@@ -46,7 +50,6 @@ describe('Orchestration Service', () => {
 				};
 			}
 			// second mock for our code
-			// eslint-disable-next-line @typescript-eslint/no-explicit-any
 			return function (...args: any) {
 				return new Redis(args);
 			};
diff --git a/packages/cli/test/unit/services/ownership.service.test.ts b/packages/cli/test/unit/services/ownership.service.test.ts
index 32b50bb417..20be942c2f 100644
--- a/packages/cli/test/unit/services/ownership.service.test.ts
+++ b/packages/cli/test/unit/services/ownership.service.test.ts
@@ -1,55 +1,30 @@
 import { OwnershipService } from '@/services/ownership.service';
-import { SharedWorkflowRepository } from '@/databases/repositories';
-import { mockInstance } from '../../integration/shared/utils';
-import { Role } from '@/databases/entities/Role';
-import {
-	randomCredentialPayload,
-	randomEmail,
-	randomInteger,
-	randomName,
-} from '../../integration/shared/random';
-import { SharedWorkflow } from '@/databases/entities/SharedWorkflow';
-import { CacheService } from '@/services/cache.service';
-import { User } from '@/databases/entities/User';
+import { SharedWorkflowRepository } from '@db/repositories/sharedWorkflow.repository';
+import { Role } from '@db/entities/Role';
+import { SharedWorkflow } from '@db/entities/SharedWorkflow';
+import { User } from '@db/entities/User';
 import { RoleService } from '@/services/role.service';
-import { UserService } from '@/services/user.service';
-import { CredentialsEntity } from '@/databases/entities/CredentialsEntity';
-import type { SharedCredentials } from '@/databases/entities/SharedCredentials';
-
-const wfOwnerRole = () =>
-	Object.assign(new Role(), {
-		scope: 'workflow',
-		name: 'owner',
-		id: randomInteger(),
-	});
-
-const mockCredRole = (name: 'owner' | 'editor'): Role =>
-	Object.assign(new Role(), {
-		scope: 'credentials',
-		name,
-		id: randomInteger(),
-	});
-
-const mockCredential = (): CredentialsEntity =>
-	Object.assign(new CredentialsEntity(), randomCredentialPayload());
-
-const mockUser = (): User =>
-	Object.assign(new User(), {
-		id: randomInteger(),
-		email: randomEmail(),
-		firstName: randomName(),
-		lastName: randomName(),
-	});
+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 {
+	mockCredRole,
+	mockCredential,
+	mockUser,
+	mockInstanceOwnerRole,
+	wfOwnerRole,
+} from '../shared/mockObjects';
 
 describe('OwnershipService', () => {
-	const cacheService = mockInstance(CacheService);
 	const roleService = mockInstance(RoleService);
-	const userService = mockInstance(UserService);
+	const userRepository = mockInstance(UserRepository);
 	const sharedWorkflowRepository = mockInstance(SharedWorkflowRepository);
 
 	const ownershipService = new OwnershipService(
-		cacheService,
-		userService,
+		mock(),
+		userRepository,
 		roleService,
 		sharedWorkflowRepository,
 	);
@@ -58,89 +33,150 @@ describe('OwnershipService', () => {
 		jest.clearAllMocks();
 	});
 
-	describe('getWorkflowOwner()', () => {
-		test('should retrieve a workflow owner', async () => {
-			roleService.findWorkflowOwnerRole.mockResolvedValueOnce(wfOwnerRole());
+	describe('OwnershipService', () => {
+		const roleService = mockInstance(RoleService);
+		const userRepository = mockInstance(UserRepository);
+		const sharedWorkflowRepository = mockInstance(SharedWorkflowRepository);
 
-			const mockOwner = new User();
-			const mockNonOwner = new User();
+		const ownershipService = new OwnershipService(
+			mock(),
+			userRepository,
+			roleService,
+			sharedWorkflowRepository,
+		);
 
-			const sharedWorkflow = Object.assign(new SharedWorkflow(), {
-				role: new Role(),
-				user: mockOwner,
+		beforeEach(() => {
+			jest.clearAllMocks();
+		});
+
+		describe('getWorkflowOwner()', () => {
+			test('should retrieve a workflow owner', async () => {
+				roleService.findWorkflowOwnerRole.mockResolvedValueOnce(wfOwnerRole());
+
+				const mockOwner = new User();
+				const mockNonOwner = new User();
+
+				const sharedWorkflow = Object.assign(new SharedWorkflow(), {
+					role: new Role(),
+					user: mockOwner,
+				});
+
+				sharedWorkflowRepository.findOneOrFail.mockResolvedValueOnce(sharedWorkflow);
+
+				const returnedOwner = await ownershipService.getWorkflowOwnerCached('some-workflow-id');
+
+				expect(returnedOwner).toBe(mockOwner);
+				expect(returnedOwner).not.toBe(mockNonOwner);
 			});
 
-			sharedWorkflowRepository.findOneOrFail.mockResolvedValueOnce(sharedWorkflow);
+			test('should throw if no workflow owner role found', async () => {
+				roleService.findWorkflowOwnerRole.mockRejectedValueOnce(new Error());
 
-			const returnedOwner = await ownershipService.getWorkflowOwnerCached('some-workflow-id');
-
-			expect(returnedOwner).toBe(mockOwner);
-			expect(returnedOwner).not.toBe(mockNonOwner);
-		});
-
-		test('should throw if no workflow owner role found', async () => {
-			roleService.findWorkflowOwnerRole.mockRejectedValueOnce(new Error());
-
-			await expect(ownershipService.getWorkflowOwnerCached('some-workflow-id')).rejects.toThrow();
-		});
-
-		test('should throw if no workflow owner found', async () => {
-			roleService.findWorkflowOwnerRole.mockResolvedValueOnce(wfOwnerRole());
-
-			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: mockCredRole('owner'), user: owner },
-				{ role: mockCredRole('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,
+				await expect(ownershipService.getWorkflowOwnerCached('some-workflow-id')).rejects.toThrow();
 			});
 
-			expect(sharedWith).toStrictEqual([
-				{
-					id: editor.id,
-					email: editor.email,
-					firstName: editor.firstName,
-					lastName: editor.lastName,
-				},
-			]);
+			test('should throw if no workflow owner found', async () => {
+				roleService.findWorkflowOwnerRole.mockResolvedValueOnce(wfOwnerRole());
+
+				sharedWorkflowRepository.findOneOrFail.mockRejectedValue(new Error());
+
+				await expect(ownershipService.getWorkflowOwnerCached('some-workflow-id')).rejects.toThrow();
+			});
 		});
 
-		test('should produce an empty sharedWith if no sharee', async () => {
-			const owner = mockUser();
+		describe('addOwnedByAndSharedWith()', () => {
+			test('should add `ownedBy` and `sharedWith` to credential', async () => {
+				const owner = mockUser();
+				const editor = mockUser();
 
-			const credential = mockCredential();
+				const credential = mockCredential();
 
-			credential.shared = [{ role: mockCredRole('owner'), user: owner }] as SharedCredentials[];
+				credential.shared = [
+					{ role: mockCredRole('owner'), user: owner },
+					{ role: mockCredRole('editor'), user: editor },
+				] as SharedCredentials[];
 
-			const { ownedBy, sharedWith } = ownershipService.addOwnedByAndSharedWith(credential);
+				const { ownedBy, sharedWith } = ownershipService.addOwnedByAndSharedWith(credential);
 
-			expect(ownedBy).toStrictEqual({
-				id: owner.id,
-				email: owner.email,
-				firstName: owner.firstName,
-				lastName: owner.lastName,
+				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,
+					},
+				]);
 			});
 
-			expect(sharedWith).toHaveLength(0);
+			test('should add `ownedBy` and `sharedWith` to workflow', async () => {
+				const owner = mockUser();
+				const editor = mockUser();
+
+				const workflow = new WorkflowEntity();
+
+				workflow.shared = [
+					{ role: mockCredRole('owner'), user: owner },
+					{ role: mockCredRole('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: mockCredRole('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 () => {
+				const instanceOwnerRole = mockInstanceOwnerRole();
+				roleService.findGlobalOwnerRole.mockResolvedValue(instanceOwnerRole);
+
+				await ownershipService.getInstanceOwner();
+
+				expect(userRepository.findOneOrFail).toHaveBeenCalledWith({
+					where: { globalRoleId: instanceOwnerRole.id },
+					relations: ['globalRole'],
+				});
+			});
 		});
 	});
 });
diff --git a/packages/cli/test/unit/services/redis.service.test.ts b/packages/cli/test/unit/services/redis.service.test.ts
index d0cffa128a..04fb980db6 100644
--- a/packages/cli/test/unit/services/redis.service.test.ts
+++ b/packages/cli/test/unit/services/redis.service.test.ts
@@ -2,7 +2,7 @@ import Container from 'typedi';
 import { Logger } from '@/Logger';
 import config from '@/config';
 import { RedisService } from '@/services/redis.service';
-import { mockInstance } from '../../integration/shared/utils';
+import { mockInstance } from '../../shared/mocking';
 
 mockInstance(Logger);
 const redisService = Container.get(RedisService);
@@ -27,7 +27,6 @@ describe('RedisService', () => {
 				};
 			}
 			// second mock for our code
-			// eslint-disable-next-line @typescript-eslint/no-explicit-any
 			return function (...args: any) {
 				return new Redis(args);
 			};
@@ -56,25 +55,6 @@ describe('RedisService', () => {
 		await pub.destroy();
 	});
 
-	test('should create list sender and receiver', async () => {
-		const sender = await redisService.getListSender();
-		const receiver = await redisService.getListReceiver();
-		expect(sender).toBeDefined();
-		expect(receiver).toBeDefined();
-		await sender.prepend(LIST_CHANNEL, 'middle');
-		await sender.prepend(LIST_CHANNEL, 'first');
-		await sender.append(LIST_CHANNEL, 'end');
-		let popResult = await receiver.popFromHead(LIST_CHANNEL);
-		expect(popResult).toBe('first');
-		popResult = await receiver.popFromTail(LIST_CHANNEL);
-		expect(popResult).toBe('end');
-		await sender.prepend(LIST_CHANNEL, 'somevalue');
-		popResult = await receiver.popFromTail(LIST_CHANNEL);
-		expect(popResult).toBe('middle');
-		await sender.destroy();
-		await receiver.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 () => {
diff --git a/packages/cli/test/unit/services/role.service.test.ts b/packages/cli/test/unit/services/role.service.test.ts
index 9b0f524a10..19c26ae4af 100644
--- a/packages/cli/test/unit/services/role.service.test.ts
+++ b/packages/cli/test/unit/services/role.service.test.ts
@@ -1,11 +1,11 @@
 import { SharedWorkflowRepository } from '@db/repositories/sharedWorkflow.repository';
 import type { RoleNames, RoleScopes } from '@db/entities/Role';
 import { Role } from '@db/entities/Role';
-import { mockInstance } from '../../integration/shared/utils/';
 import { RoleService } from '@/services/role.service';
-import { RoleRepository } from '@/databases/repositories';
-import { CacheService } from '@/services/cache.service';
-import { SharedWorkflow } from '@/databases/entities/SharedWorkflow';
+import { RoleRepository } from '@db/repositories/role.repository';
+import { CacheService } from '@/services/cache/cache.service';
+import { SharedWorkflow } from '@db/entities/SharedWorkflow';
+import { mockInstance } from '../../shared/mocking';
 import { chooseRandomly } from '../../integration/shared/random';
 import config from '@/config';
 
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 0000000000..4bd9efac47
--- /dev/null
+++ b/packages/cli/test/unit/services/test-webhook-registrations.service.test.ts
@@ -0,0 +1,88 @@
+import type { CacheService } from '@/services/cache/cache.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);
+
+	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 });
+		});
+	});
+
+	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 0000000000..56eb26194b
--- /dev/null
+++ b/packages/cli/test/unit/services/user.service.test.ts
@@ -0,0 +1,140 @@
+import Container from 'typedi';
+import jwt from 'jsonwebtoken';
+import { Logger } from '@/Logger';
+import config from '@/config';
+import { User } from '@db/entities/User';
+import { UserRepository } from '@db/repositories/user.repository';
+import { UserService } from '@/services/user.service';
+import { mockInstance } from '../../shared/mocking';
+import { RoleService } from '@/services/role.service';
+import { v4 as uuid } from 'uuid';
+
+describe('UserService', () => {
+	config.set('userManagement.jwtSecret', 'random-secret');
+
+	mockInstance(Logger);
+	mockInstance(RoleService);
+
+	const userRepository = mockInstance(UserRepository);
+	const userService = Container.get(UserService);
+
+	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);
+		});
+	});
+
+	describe('generatePasswordResetToken', () => {
+		it('should generate valid password-reset tokens', () => {
+			const token = userService.generatePasswordResetToken(commonMockUser);
+
+			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(commonMockUser.id);
+			expect(decoded.exp - decoded.iat).toEqual(1200); // Expires in 20 minutes
+			expect(decoded.passwordSha).toEqual(
+				'31513c5a9e3c5afe5c06d5675ace74e8bc3fadd9744ab5d89c311f2a62ccbd39',
+			);
+		});
+	});
+
+	describe('resolvePasswordResetToken', () => {
+		it('should not return a user if the token in invalid', async () => {
+			const user = await userService.resolvePasswordResetToken('invalid-token');
+
+			expect(user).toBeUndefined();
+		});
+
+		it('should not return a user if the token in expired', async () => {
+			const token = userService.generatePasswordResetToken(commonMockUser, '-1h');
+
+			const user = await userService.resolvePasswordResetToken(token);
+
+			expect(user).toBeUndefined();
+		});
+
+		it('should not return a user if the user does not exist in the DB', async () => {
+			userRepository.findOne.mockResolvedValueOnce(null);
+			const token = userService.generatePasswordResetToken(commonMockUser);
+
+			const user = await userService.resolvePasswordResetToken(token);
+
+			expect(user).toBeUndefined();
+		});
+
+		it('should not return a user if the password sha does not match', async () => {
+			const token = userService.generatePasswordResetToken(commonMockUser);
+			const updatedUser = Object.create(commonMockUser);
+			updatedUser.password = 'something-else';
+			userRepository.findOne.mockResolvedValueOnce(updatedUser);
+
+			const user = await userService.resolvePasswordResetToken(token);
+
+			expect(user).toBeUndefined();
+		});
+
+		it('should not return the user if all checks pass', async () => {
+			const token = userService.generatePasswordResetToken(commonMockUser);
+			userRepository.findOne.mockResolvedValueOnce(commonMockUser);
+
+			const user = await userService.resolvePasswordResetToken(token);
+
+			expect(user).toEqual(commonMockUser);
+		});
+	});
+});
diff --git a/packages/cli/test/unit/services/webhook.service.test.ts b/packages/cli/test/unit/services/webhook.service.test.ts
index 7c8f62212d..adb18de4b3 100644
--- a/packages/cli/test/unit/services/webhook.service.test.ts
+++ b/packages/cli/test/unit/services/webhook.service.test.ts
@@ -1,10 +1,10 @@
 import { v4 as uuid } from 'uuid';
 import config from '@/config';
-import { mockInstance } from '../../integration/shared/utils/';
-import { WebhookRepository } from '@/databases/repositories';
-import { CacheService } from '@/services/cache.service';
+import { WebhookRepository } from '@db/repositories/webhook.repository';
+import { CacheService } from '@/services/cache/cache.service';
 import { WebhookService } from '@/services/webhook.service';
-import { WebhookEntity } from '@/databases/entities/WebhookEntity';
+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(), {
@@ -150,30 +150,6 @@ describe('WebhookService', () => {
 		});
 	});
 
-	describe('deleteInstanceWebhooks()', () => {
-		test('should delete all webhooks of the instance', async () => {
-			const mockInstanceWebhooks = [
-				createWebhook('PUT', 'users'),
-				createWebhook('GET', 'user/:id'),
-				createWebhook('POST', ':var'),
-			];
-
-			webhookRepository.find.mockResolvedValue(mockInstanceWebhooks);
-
-			await webhookService.deleteInstanceWebhooks();
-
-			expect(webhookRepository.remove).toHaveBeenCalledWith(mockInstanceWebhooks);
-		});
-
-		test('should not delete any webhooks if none found', async () => {
-			webhookRepository.find.mockResolvedValue([]);
-
-			await webhookService.deleteInstanceWebhooks();
-
-			expect(webhookRepository.remove).toHaveBeenCalledWith([]);
-		});
-	});
-
 	describe('deleteWorkflowWebhooks()', () => {
 		test('should delete all webhooks of the workflow', async () => {
 			const mockWorkflowWebhooks = [
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 0000000000..7a623188e6
--- /dev/null
+++ b/packages/cli/test/unit/services/workflowHistory.service.ee.test.ts
@@ -0,0 +1,114 @@
+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 { mockInstance } from '../../shared/mocking';
+import { Logger } from '@/Logger';
+import { getWorkflow } from '../WorkflowHelpers.test';
+import { mockClear } from 'jest-mock-extended';
+
+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 0000000000..dee4d97150
--- /dev/null
+++ b/packages/cli/test/unit/shared/mockObjects.ts
@@ -0,0 +1,42 @@
+import { User } from '@db/entities/User';
+import { Role } from '@db/entities/Role';
+import { CredentialsEntity } from '@db/entities/CredentialsEntity';
+
+import {
+	randomCredentialPayload,
+	randomEmail,
+	randomInteger,
+	randomName,
+} from '../../integration/shared/random';
+
+export const wfOwnerRole = () =>
+	Object.assign(new Role(), {
+		scope: 'workflow',
+		name: 'owner',
+		id: randomInteger(),
+	});
+
+export const mockCredRole = (name: 'owner' | 'editor'): Role =>
+	Object.assign(new Role(), {
+		scope: 'credentials',
+		name,
+		id: randomInteger(),
+	});
+
+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(),
+	});
+
+export const mockInstanceOwnerRole = () =>
+	Object.assign(new Role(), {
+		scope: 'global',
+		name: 'owner',
+		id: randomInteger(),
+	});
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 0000000000..b253929cbb
--- /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 () => 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/utilities/password.utility.test.ts b/packages/cli/test/unit/utilities/password.utility.test.ts
new file mode 100644
index 0000000000..3cab55ae48
--- /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
index cf6de8103b..92a89003d6 100644
--- a/packages/cli/test/unit/utils.test.ts
+++ b/packages/cli/test/unit/utils.test.ts
@@ -1,32 +1,44 @@
-import { webhookNotFoundErrorMessage } from '@/utils';
+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('webhook12345', 'GET');
+		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('webhook12345');
+		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('webhook12345', 'POST', ['GET', 'PUT']);
+		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('webhook12345', 'POST', ['PUT']);
+		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('webhook12345', 'POST', ['GET', 'PUT', 'DELETE']);
+		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
index f4b1b02d5b..3070a5d478 100644
--- a/packages/cli/test/unit/webhooks.test.ts
+++ b/packages/cli/test/unit/webhooks.test.ts
@@ -4,14 +4,15 @@ import { mock } from 'jest-mock-extended';
 
 import config from '@/config';
 import { AbstractServer } from '@/AbstractServer';
-import { ActiveWorkflowRunner } from '@/ActiveWorkflowRunner';
+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 '../integration/shared/utils';
+import { mockInstance } from '../shared/mocking';
 
 let agent: SuperAgentTest;
 
@@ -21,9 +22,10 @@ describe('WebhookServer', () => {
 
 	describe('CORS', () => {
 		const corsOrigin = 'https://example.com';
-		const activeWorkflowRunner = mockInstance(ActiveWorkflowRunner);
+		const activeWebhooks = mockInstance(ActiveWebhooks);
 		const testWebhooks = mockInstance(TestWebhooks);
 		mockInstance(WaitingWebhooks);
+		mockInstance(WaitingForms);
 
 		beforeAll(async () => {
 			const server = new (class extends AbstractServer {
@@ -34,10 +36,11 @@ describe('WebhookServer', () => {
 		});
 
 		const tests = [
-			['webhook', activeWorkflowRunner],
+			['webhook', activeWebhooks],
 			['webhookTest', testWebhooks],
-			// TODO: enable webhookWaiting after CORS support is added
+			// TODO: enable webhookWaiting & waitingForms after CORS support is added
 			// ['webhookWaiting', waitingWebhooks],
+			// ['formWaiting', waitingForms],
 		] as const;
 
 		for (const [key, manager] of tests) {
@@ -46,7 +49,10 @@ describe('WebhookServer', () => {
 					const pathPrefix = config.getEnv(`endpoints.${key}`);
 					manager.getWebhookMethods.mockResolvedValueOnce(['GET']);
 
-					const response = await agent.options(`/${pathPrefix}/abcd`).set('origin', corsOrigin);
+					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);
@@ -60,7 +66,10 @@ describe('WebhookServer', () => {
 						mockResponse({ test: true }, { key: 'value ' }),
 					);
 
-					const response = await agent.get(`/${pathPrefix}/abcd`).set('origin', corsOrigin);
+					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);
diff --git a/packages/cli/test/unit/workflowHistoryHelper.test.ts b/packages/cli/test/unit/workflowHistoryHelper.test.ts
index a6a701452d..09849b1437 100644
--- a/packages/cli/test/unit/workflowHistoryHelper.test.ts
+++ b/packages/cli/test/unit/workflowHistoryHelper.test.ts
@@ -1,7 +1,7 @@
 import { License } from '@/License';
-import { mockInstance } from '../integration/shared/utils';
 import config from '@/config';
 import { getWorkflowHistoryPruneTime } from '@/workflows/workflowHistory/workflowHistoryHelper.ee';
+import { mockInstance } from '../shared/mocking';
 
 let licenseMock: License;
 let licensePruneTime = -1;
diff --git a/packages/cli/tsconfig.json b/packages/cli/tsconfig.json
index 37e5dcbef8..4398f65fb6 100644
--- a/packages/cli/tsconfig.json
+++ b/packages/cli/tsconfig.json
@@ -20,6 +20,7 @@
 	"references": [
 		{ "path": "../workflow/tsconfig.build.json" },
 		{ "path": "../core/tsconfig.build.json" },
-		{ "path": "../@n8n/client-oauth2/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 e6441f9071..479dcfe872 100644
--- a/packages/core/.eslintrc.js
+++ b/packages/core/.eslintrc.js
@@ -8,6 +8,10 @@ module.exports = {
 
 	...sharedOptions(__dirname),
 
+	parserOptions: {
+		project: './tsconfig.json',
+	},
+
 	ignorePatterns: ['bin/*.js'],
 
 	rules: {
diff --git a/packages/core/README.md b/packages/core/README.md
index 1eeb8579e4..0518567fc9 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/generate-known b/packages/core/bin/generate-known
index df38a7ecc6..3784f15fb1 100755
--- a/packages/core/bin/generate-known
+++ b/packages/core/bin/generate-known
@@ -2,7 +2,8 @@
 
 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');
 
@@ -19,48 +20,80 @@ const loadClass = (sourcePath) => {
 	}
 };
 
-const nodesToTestWith = {};
-
-const generate = async (kind) => {
-	const data = glob
-		.sync(`dist/${kind}/**/*.${kind === 'nodes' ? 'node' : kind}.js`, {
-			cwd: packageDir,
-		})
+const generateKnownNodes = async () => {
+	const nodeClasses = glob
+		.sync('dist/nodes/**/*.node.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 };
+		// 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] = [];
 			}
 
-			if (kind === 'credentials' && Array.isArray(instance.extends)) {
-				obj[name].extends = instance.extends;
+			nodesByCredential[credential.name].push(nodeName);
+		}
+	}
+
+	LoggerProxy.info(`Detected ${Object.keys(nodes).length} nodes`);
+	await writeJSON('known/nodes.json', nodes);
+	return { nodes, nodesByCredential };
+};
+
+const generateKnownCredentials = async (nodesByCredential) => {
+	const credentialClasses = glob
+		.sync(`dist/credentials/**/*.credentials.js`, { cwd: packageDir })
+		.map(loadClass)
+		.filter((data) => !!data);
+
+	for (const { instance } of credentialClasses) {
+		if (Array.isArray(instance.extends)) {
+			for (const extendedCredential of instance.extends) {
+				nodesByCredential[extendedCredential] = [
+					...(nodesByCredential[extendedCredential] ?? []),
+					...(nodesByCredential[instance.name] ?? []),
+				];
+			}
+		}
+	}
+
+	const credentials = credentialClasses.reduce(
+		(credentials, { className, sourcePath, instance }) => {
+			const credentialName = instance.name;
+			const credential = {
+				className,
+				sourcePath,
+			};
+
+			if (Array.isArray(instance.extends)) {
+				credential.extends = instance.extends;
 			}
 
-			if (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-ui-types b/packages/core/bin/generate-ui-types
index 317c0e121e..988462d604 100755
--- a/packages/core/bin/generate-ui-types
+++ b/packages/core/bin/generate-ui-types
@@ -26,26 +26,18 @@ function findReferencedMethods(obj, refs = {}, latestName = '') {
 	return refs;
 }
 
-function addWebhookLifecycle(nodeType) {
-	if (nodeType.description.webhooks) {
-		nodeType.description.webhooks = nodeType.description.webhooks.map((webhook) => {
-			const webhookMethods =
-				nodeType?.webhookMethods?.[webhook.name] ?? nodeType?.webhookMethods?.default;
-			webhook.hasLifecycleMethods = Boolean(
-				webhookMethods?.checkExists && webhookMethods?.create && webhookMethods?.delete,
-			);
-			return webhook;
-		});
-	}
-
-	return nodeType;
-}
-
 (async () => {
 	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);
 
@@ -72,16 +64,14 @@ function addWebhookLifecycle(nodeType) {
 		.map((data) => {
 			const nodeType = NodeHelpers.getVersionedNodeType(data.type);
 			NodeHelpers.applySpecialNodeParameters(nodeType);
-			addWebhookLifecycle(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 a066fe093c..b23dc24426 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 deaf1281b3..2c336663fc 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-core",
-  "version": "1.14.0",
+  "version": "1.24.0",
   "description": "Core functionality of n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",
@@ -37,7 +37,6 @@
     "@types/aws4": "^1.5.1",
     "@types/concat-stream": "^2.0.0",
     "@types/cron": "~1.7.1",
-    "@types/crypto-js": "^4.1.3",
     "@types/express": "^4.17.6",
     "@types/lodash": "^4.14.195",
     "@types/mime-types": "^2.1.0",
@@ -50,24 +49,22 @@
   },
   "dependencies": {
     "@n8n/client-oauth2": "workspace:*",
-    "aws4": "^1.8.0",
-    "axios": "^0.21.1",
-    "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": "^4.17.21",
-    "mime-types": "^2.1.27",
+    "aws4": "1.11.0",
+    "axios": "1.6.2",
+    "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",
+    "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",
-    "typedi": "^0.10.0",
-    "uuid": "^8.3.2",
-    "xml2js": "^0.5.0"
+    "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.5.0"
   }
 }
diff --git a/packages/core/src/ActiveWorkflows.ts b/packages/core/src/ActiveWorkflows.ts
index 5218d2c885..d42729b1f2 100644
--- a/packages/core/src/ActiveWorkflows.ts
+++ b/packages/core/src/ActiveWorkflows.ts
@@ -1,5 +1,4 @@
-/* eslint-disable @typescript-eslint/no-unsafe-argument */
-
+import { Service } from 'typedi';
 import { CronJob } from 'cron';
 
 import type {
@@ -14,62 +13,64 @@ import type {
 	WorkflowActivateMode,
 	WorkflowExecuteMode,
 } from 'n8n-workflow';
-import { LoggerProxy as Logger, toCronExpression, WorkflowActivationError } from 'n8n-workflow';
+import {
+	ApplicationError,
+	LoggerProxy as Logger,
+	toCronExpression,
+	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 {
-		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(
@@ -82,46 +83,49 @@ export class ActiveWorkflows {
 				if (triggerResponse !== undefined) {
 					// If a response was given save it
 
-					this.workflowData[id].triggerResponses!.push(triggerResponse);
+					this.activeWorkflows[workflowId].triggerResponses!.push(triggerResponse);
 				}
-			} catch (error) {
+			} catch (e) {
+				const error = e instanceof Error ? e : new Error(`${e}`);
+
 				throw new WorkflowActivationError(
-					// eslint-disable-next-line @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 {
-					this.workflowData[id].pollResponses!.push(
-						await this.activatePolling(
-							pollNode,
-							workflow,
-							additionalData,
-							getPollFunctions,
-							mode,
-							activation,
-						),
-					);
-				} catch (error) {
-					throw new WorkflowActivationError(
-						// eslint-disable-next-line @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,
@@ -159,7 +163,7 @@ export class ActiveWorkflows {
 				if (testingTrigger) {
 					throw error;
 				}
-				pollFunctions.__emitError(error);
+				pollFunctions.__emitError(error as Error);
 			}
 		};
 
@@ -174,7 +178,9 @@ export class ActiveWorkflows {
 		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));
@@ -193,59 +199,49 @@ 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<boolean> {
-		if (!this.isActive(id)) {
-			// Workflow is currently not registered
-			Logger.warn(
-				`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];
+		const w = this.activeWorkflows[workflowId];
 
-		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
-							`There was a problem deactivating trigger of workflow "${id}": "${error.message}"`,
-							{
-								workflowId: id,
-							},
-						);
-					}
-				}
-			}
-		}
+		w.triggerResponses?.forEach(async (r) => this.close(r, workflowId, 'trigger'));
+		w.pollResponses?.forEach(async (r) => this.close(r, workflowId, 'poller'));
 
-		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
-							`There was a problem deactivating polling trigger of workflow "${id}": "${error.message}"`,
-							{
-								workflowId: id,
-							},
-						);
-					}
-				}
-			}
-		}
-
-		delete this.workflowData[id];
+		delete this.activeWorkflows[workflowId];
 
 		return true;
 	}
+
+	async removeAllTriggerAndPollerBasedWorkflows() {
+		for (const workflowId of Object.keys(this.activeWorkflows)) {
+			const w = this.activeWorkflows[workflowId];
+
+			w.triggerResponses?.forEach(async (r) => this.close(r, workflowId, 'trigger'));
+			w.pollResponses?.forEach(async (r) => this.close(r, workflowId, 'poller'));
+		}
+	}
+
+	private async close(
+		response: ITriggerResponse | IPollResponse,
+		workflowId: string,
+		target: 'trigger' | 'poller',
+	) {
+		if (!response.closeFunction) return;
+
+		try {
+			await response.closeFunction();
+		} catch (e) {
+			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
index b96e87d915..ad8a071b8f 100644
--- a/packages/core/src/BinaryData/BinaryData.service.ts
+++ b/packages/core/src/BinaryData/BinaryData.service.ts
@@ -1,16 +1,14 @@
-/* eslint-disable @typescript-eslint/naming-convention */
-
 import { readFile, stat } from 'node:fs/promises';
 import prettyBytes from 'pretty-bytes';
 import Container, { Service } from 'typedi';
-import { BINARY_ENCODING, LoggerProxy as Logger, IBinaryData } from 'n8n-workflow';
-import { UnknownManagerError, InvalidModeError } from './errors';
+import { BINARY_ENCODING } from 'n8n-workflow';
+import { InvalidModeError } from '../errors/invalid-mode.error';
 import { areConfigModes, toBuffer } from './utils';
-import { LogCatch } from '../decorators/LogCatch.decorator';
 
 import type { Readable } from 'stream';
 import type { BinaryData } from './types';
-import type { INodeExecutionData } from 'n8n-workflow';
+import type { INodeExecutionData, IBinaryData } from 'n8n-workflow';
+import { InvalidManagerError } from '../errors/invalid-manager.error';
 
 @Service()
 export class BinaryDataService {
@@ -42,7 +40,6 @@ export class BinaryDataService {
 		}
 	}
 
-	@LogCatch((error) => Logger.error('Failed to copy binary data file', { error }))
 	async copyBinaryFile(
 		workflowId: string,
 		executionId: string,
@@ -78,7 +75,6 @@ export class BinaryDataService {
 		return binaryData;
 	}
 
-	@LogCatch((error) => Logger.error('Failed to write binary data file', { error }))
 	async store(
 		workflowId: string,
 		executionId: string,
@@ -154,9 +150,6 @@ export class BinaryDataService {
 		if (manager.deleteMany) await manager.deleteMany(ids);
 	}
 
-	@LogCatch((error) =>
-		Logger.error('Failed to copy all binary data files for execution', { error }),
-	)
 	async duplicateBinaryData(
 		workflowId: string,
 		executionId: string,
@@ -249,6 +242,6 @@ export class BinaryDataService {
 
 		if (manager) return manager;
 
-		throw new UnknownManagerError(mode);
+		throw new InvalidManagerError(mode);
 	}
 }
diff --git a/packages/core/src/BinaryData/FileSystem.manager.ts b/packages/core/src/BinaryData/FileSystem.manager.ts
index f210597266..1e076ad4c7 100644
--- a/packages/core/src/BinaryData/FileSystem.manager.ts
+++ b/packages/core/src/BinaryData/FileSystem.manager.ts
@@ -3,11 +3,12 @@ import fs from 'node:fs/promises';
 import path from 'node:path';
 import { v4 as uuid } from 'uuid';
 import { jsonParse } from 'n8n-workflow';
-import { assertDir } from './utils';
-import { FileNotFoundError } from '../errors';
+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})$/;
@@ -46,17 +47,21 @@ export class FileSystemManager implements BinaryData.Manager {
 	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);
 
-		try {
-			return await fs.readFile(filePath);
-		} catch {
-			throw new Error(`Error finding file: ${filePath}`);
+		if (await doesNotExist(filePath)) {
+			throw new FileNotFoundError(filePath);
 		}
+
+		return fs.readFile(filePath);
 	}
 
 	async getMetadata(fileId: string): Promise<BinaryData.Metadata> {
@@ -167,7 +172,7 @@ export class FileSystemManager implements BinaryData.Manager {
 		const returnPath = path.join(this.storagePath, ...args);
 
 		if (path.relative(this.storagePath, returnPath).startsWith('..')) {
-			throw new FileNotFoundError('Invalid path detected');
+			throw new DisallowedFilepathError(returnPath);
 		}
 
 		return returnPath;
@@ -186,7 +191,7 @@ export class FileSystemManager implements BinaryData.Manager {
 			const stats = await fs.stat(filePath);
 			return stats.size;
 		} catch (error) {
-			throw new Error('Failed to find binary data file in filesystem', { cause: error });
+			throw new FileNotFoundError(filePath);
 		}
 	}
 }
diff --git a/packages/core/src/BinaryData/errors.ts b/packages/core/src/BinaryData/errors.ts
deleted file mode 100644
index 31b3adc1e4..0000000000
--- a/packages/core/src/BinaryData/errors.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { CONFIG_MODES } from './utils';
-
-export class InvalidModeError extends Error {
-	message = `Invalid binary data mode. Valid modes: ${CONFIG_MODES.join(', ')}`;
-}
-
-export class UnknownManagerError extends Error {
-	constructor(mode: string) {
-		super(`No binary data manager found for: ${mode}`);
-	}
-}
diff --git a/packages/core/src/BinaryData/utils.ts b/packages/core/src/BinaryData/utils.ts
index 14a9b45788..f1d692067b 100644
--- a/packages/core/src/BinaryData/utils.ts
+++ b/packages/core/src/BinaryData/utils.ts
@@ -23,9 +23,24 @@ export async function assertDir(dir: string) {
 	}
 }
 
+export async function doesNotExist(dir: string) {
+	try {
+		await fs.access(dir);
+		return false;
+	} catch {
+		return true;
+	}
+}
+
 export async function toBuffer(body: Buffer | Readable) {
-	return new Promise<Buffer>((resolve) => {
-		if (Buffer.isBuffer(body)) resolve(body);
-		else body.pipe(concatStream(resolve));
+	if (Buffer.isBuffer(body)) return body;
+	return 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/Cipher.ts b/packages/core/src/Cipher.ts
index 08af32a26c..4e1b649bed 100644
--- a/packages/core/src/Cipher.ts
+++ b/packages/core/src/Cipher.ts
@@ -1,19 +1,43 @@
 import { Service } from 'typedi';
-import { AES, enc } from 'crypto-js';
+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) {
-		return AES.encrypt(
-			typeof data === 'string' ? data : JSON.stringify(data),
-			this.instanceSettings.encryptionKey,
-		).toString();
+		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) {
-		return AES.decrypt(data, this.instanceSettings.encryptionKey).toString(enc.Utf8);
+		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 4ce7b66341..dd6277b69b 100644
--- a/packages/core/src/Constants.ts
+++ b/packages/core/src/Constants.ts
@@ -1,6 +1,7 @@
 export const CUSTOM_EXTENSION_ENV = 'N8N_CUSTOM_EXTENSIONS';
 export const PLACEHOLDER_EMPTY_EXECUTION_ID = '__UNKNOWN__';
 export const PLACEHOLDER_EMPTY_WORKFLOW_ID = '__EMPTY__';
+export const HTTP_REQUEST_NODE_TYPE = 'n8n-nodes-base.httpRequest';
 
 export const CUSTOM_NODES_CATEGORY = 'Custom Nodes';
 
diff --git a/packages/core/src/Credentials.ts b/packages/core/src/Credentials.ts
index 00873c1da6..9bf58284df 100644
--- a/packages/core/src/Credentials.ts
+++ b/packages/core/src/Credentials.ts
@@ -1,6 +1,6 @@
 import { Container } from 'typedi';
 import type { ICredentialDataDecryptedObject, ICredentialsEncrypted } from 'n8n-workflow';
-import { ICredentials, jsonParse } from 'n8n-workflow';
+import { ApplicationError, ICredentials, jsonParse } from 'n8n-workflow';
 import { Cipher } from './Cipher';
 
 export class Credentials extends ICredentials {
@@ -31,13 +31,14 @@ export class Credentials extends ICredentials {
 	 */
 	getData(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}".`,
-			);
+			throw new ApplicationError('Node does not have access to credential', {
+				tags: { nodeType, credentialType: this.type },
+				extra: { credentialName: this.name },
+			});
 		}
 
 		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 = this.cipher.decrypt(this.data);
@@ -45,7 +46,7 @@ export class Credentials extends ICredentials {
 		try {
 			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.',
 			);
 		}
@@ -56,7 +57,7 @@ export class Credentials extends ICredentials {
 	 */
 	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 {
diff --git a/packages/core/src/DirectoryLoader.ts b/packages/core/src/DirectoryLoader.ts
index 6a5c195d8c..94fefddbc5 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,8 +117,9 @@ export abstract class DirectoryLoader {
 			nodeVersion = tempNode.currentVersion;
 
 			if (currentVersionNode.hasOwnProperty('executeSingle')) {
-				throw new Error(
-					`"executeSingle" has been removed. Please update the code of node "${this.packageName}.${nodeName}" to use "execute" instead!`,
+				throw new ApplicationError(
+					'"executeSingle" has been removed. Please update the code of this node to use "execute" instead!',
+					{ extra: { nodeName: `${this.packageName}.${nodeName}` } },
 				);
 			}
 		} else {
@@ -140,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.
@@ -156,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;
@@ -165,9 +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] = {
@@ -276,19 +294,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 +338,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 +347,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 +369,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 } });
 		}
 	}
 }
diff --git a/packages/core/src/WorkflowExecutionMetadata.ts b/packages/core/src/ExecutionMetadata.ts
similarity index 76%
rename from packages/core/src/WorkflowExecutionMetadata.ts
rename to packages/core/src/ExecutionMetadata.ts
index a6c186a20d..cc2743a56f 100644
--- a/packages/core/src/WorkflowExecutionMetadata.ts
+++ b/packages/core/src/ExecutionMetadata.ts
@@ -1,20 +1,9 @@
 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 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,
@@ -31,17 +20,17 @@ export function setWorkflowExecutionMetadata(
 		return;
 	}
 	if (typeof key !== 'string') {
-		throw new ExecutionMetadataValidationError('key', key);
+		throw new InvalidExecutionMetadataError('key', key);
 	}
 	if (key.replace(/[A-Za-z0-9_]/g, '').length !== 0) {
-		throw new ExecutionMetadataValidationError(
+		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 ExecutionMetadataValidationError('value', key);
+		throw new InvalidExecutionMetadataError('value', key);
 	}
 	const val = String(value);
 	if (key.length > 50) {
@@ -74,7 +63,7 @@ export function getAllWorkflowExecutionMetadata(
 	executionData: IRunExecutionData,
 ): Record<string, string> {
 	// Make a copy so it can't be modified directly
-	return { ...executionData.resultData.metadata } ?? {};
+	return executionData.resultData.metadata ? { ...executionData.resultData.metadata } : {};
 }
 
 export function getWorkflowExecutionMetadata(
diff --git a/packages/core/src/ExtractValue.ts b/packages/core/src/ExtractValue.ts
index 749fa12ce8..17959e37e3 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,
@@ -41,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;
@@ -62,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.`,
 		);
 	}
@@ -101,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,
@@ -137,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);
@@ -159,6 +183,7 @@ export function extractValue(
 	parameterName: string,
 	node: INode,
 	nodeType: INodeType,
+	itemIndex = 0,
 ): NodeParameterValueType | object {
 	let property: INodePropertyOptions | INodeProperties | INodePropertyCollection;
 	try {
@@ -171,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
index 6802914c97..4731ad91f2 100644
--- a/packages/core/src/InstanceSettings.ts
+++ b/packages/core/src/InstanceSettings.ts
@@ -16,11 +16,14 @@ type Settings = ReadOnlySettings & WritableSettings;
 
 @Service()
 export class InstanceSettings {
-	readonly userHome = this.getUserHome();
+	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');
 
diff --git a/packages/core/src/Interfaces.ts b/packages/core/src/Interfaces.ts
index 777f9055a7..40e5d88eee 100644
--- a/packages/core/src/Interfaces.ts
+++ b/packages/core/src/Interfaces.ts
@@ -5,6 +5,8 @@ import type {
 	ValidationResult,
 } from 'n8n-workflow';
 
+export type Class<T = object, A extends unknown[] = unknown[]> = new (...args: A) => T;
+
 export interface IProcessMessage {
 	// eslint-disable-next-line @typescript-eslint/no-explicit-any
 	data?: any;
diff --git a/packages/core/src/LoadMappingOptions.ts b/packages/core/src/LoadMappingOptions.ts
deleted file mode 100644
index 614fe75efc..0000000000
--- a/packages/core/src/LoadMappingOptions.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import type { IWorkflowExecuteAdditionalData, ResourceMapperFields } from 'n8n-workflow';
-
-import * as NodeExecuteFunctions from './NodeExecuteFunctions';
-import { LoadNodeDetails } from './LoadNodeDetails';
-
-export class LoadMappingOptions extends LoadNodeDetails {
-	/**
-	 * Returns the available mapping fields for the ResourceMapper component
-	 */
-	async getOptionsViaMethodName(
-		methodName: string,
-		additionalData: IWorkflowExecuteAdditionalData,
-	): Promise<ResourceMapperFields> {
-		const node = this.getTempNode();
-
-		const nodeType = this.workflow.nodeTypes.getByNameAndVersion(node.type, node.typeVersion);
-		const method = nodeType?.methods?.resourceMapping?.[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);
-	}
-}
diff --git a/packages/core/src/LoadNodeDetails.ts b/packages/core/src/LoadNodeDetails.ts
deleted file mode 100644
index a612759f07..0000000000
--- a/packages/core/src/LoadNodeDetails.ts
+++ /dev/null
@@ -1,81 +0,0 @@
-import type { INode } from 'n8n-workflow';
-import {
-	Workflow,
-	INodeCredentials,
-	INodeParameters,
-	INodeTypeNameVersion,
-	INodeTypes,
-} 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() {
-		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 bac92c269b..0000000000
--- 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 7bf39e1939..0000000000
--- 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 8ba714ae5f..f539b30a94 100644
--- a/packages/core/src/NodeExecuteFunctions.ts
+++ b/packages/core/src/NodeExecuteFunctions.ts
@@ -12,10 +12,12 @@ import type {
 	ClientOAuth2Options,
 	ClientOAuth2RequestObject,
 	ClientOAuth2TokenData,
+	OAuth2CredentialData,
 } from '@n8n/client-oauth2';
 import { ClientOAuth2 } from '@n8n/client-oauth2';
 import type {
 	AxiosError,
+	AxiosHeaders,
 	AxiosPromise,
 	AxiosProxyConfig,
 	AxiosRequestConfig,
@@ -36,8 +38,9 @@ import pick from 'lodash/pick';
 import { extension, lookup } from 'mime-types';
 import type {
 	BinaryHelperFunctions,
+	CloseFunction,
 	ConnectionTypes,
-	ExecutionError,
+	ContextType,
 	FieldType,
 	FileSystemHelperFunctions,
 	FunctionsBase,
@@ -88,6 +91,7 @@ import type {
 	NodeExecutionWithMetadata,
 	NodeHelperFunctions,
 	NodeParameterValueType,
+	PaginationOptions,
 	RequestHelperFunctions,
 	Workflow,
 	WorkflowActivateMode,
@@ -99,23 +103,26 @@ import {
 	NodeApiError,
 	NodeHelpers,
 	NodeOperationError,
-	NodeSSLError,
-	OAuth2GrantType,
+	NodeSslError,
 	WorkflowDataProxy,
 	createDeferredPromise,
 	deepCopy,
 	fileTypeFromMimeType,
+	getGlobalState,
 	isObjectEmpty,
 	isResourceMapperValue,
 	validateFieldType,
 	ExecutionBaseError,
+	jsonParse,
+	ApplicationError,
+	sleep,
 } from 'n8n-workflow';
 import type { Token } from 'oauth-1.0a';
 import clientOAuth1 from 'oauth-1.0a';
 import path from 'path';
 import { stringify } from 'qs';
-import type { OptionsWithUri, OptionsWithUrl } from 'request';
-import type { RequestPromiseOptions } from 'request-promise-native';
+import type { OptionsWithUrl } from 'request';
+import type { OptionsWithUri, RequestPromiseOptions } from 'request-promise-native';
 import { Readable } from 'stream';
 import url, { URL, URLSearchParams } from 'url';
 
@@ -125,23 +132,24 @@ import {
 	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 type { ExtendedValidationResult, IResponseError, IWorkflowSettings } from './Interfaces';
-import { getClientCredentialsToken } from './OAuth2Helper';
+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;
@@ -155,6 +163,13 @@ axios.defaults.paramsSerializer = (params) => {
 	}
 	return stringify(params, { arrayFormat: 'indices' });
 };
+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) => {
 	if (value?.hasOwnProperty('value') && value.hasOwnProperty('options')) {
@@ -180,23 +195,24 @@ const createFormDataObject = (data: Record<string, unknown>) => {
 	});
 	return formData;
 };
-function searchForHeader(headers: IDataObject, headerName: string) {
-	if (headers === undefined) {
+
+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;
@@ -204,9 +220,10 @@ 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 });
 	}
@@ -222,7 +239,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.
@@ -240,7 +257,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.
@@ -259,7 +276,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 {
@@ -272,10 +289,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) {
@@ -285,7 +302,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];
 				}
@@ -299,9 +316,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) {
@@ -312,7 +331,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) {
@@ -716,14 +735,6 @@ export async function proxyRequestToAxios(
 
 	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
@@ -757,7 +768,7 @@ export async function proxyRequestToAxios(
 		return configObject.resolveWithFullResponse
 			? {
 					body,
-					headers: response.headers,
+					headers: { ...response.headers },
 					statusCode: response.status,
 					statusMessage: response.statusText,
 					request: response.request,
@@ -802,7 +813,7 @@ export async function proxyRequestToAxios(
 					response: pick(response, ['headers', 'status', 'statusText']),
 				});
 			} else if ('rejectUnauthorized' in configObject && error.code?.includes('CERT')) {
-				throw new NodeSSLError(error);
+				throw new NodeSslError(error);
 			}
 		}
 
@@ -854,7 +865,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
@@ -868,7 +879,7 @@ 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>);
 		}
@@ -881,19 +892,25 @@ function convertN8nRequestToAxios(n8nRequest: IHttpRequestOptions): AxiosRequest
 	}
 
 	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) {
@@ -970,16 +987,27 @@ export function assertBinaryData(
 ): IBinaryData {
 	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;
@@ -1186,45 +1214,47 @@ export async function requestOAuth2(
 	oAuth2Options?: IOAuth2Options,
 	isN8nRequest = false,
 ) {
-	const credentials = await this.getCredentials(credentialsType);
+	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,
+		clientId: credentials.clientId,
+		clientSecret: credentials.clientSecret,
+		accessTokenUri: credentials.accessTokenUrl,
 		scopes: (credentials.scope as string).split(' '),
-		ignoreSSLIssues: credentials.ignoreSSLIssues as boolean,
+		ignoreSSLIssues: credentials.ignoreSSLIssues,
+		authentication: credentials.authentication ?? 'header',
 	});
 
 	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;
@@ -1266,7 +1296,7 @@ export async function requestOAuth2(
 				const tokenRefreshOptions: IDataObject = {};
 				if (oAuth2Options?.includeCredentialsOnRefreshOnBody) {
 					const body: IDataObject = {
-						client_id: credentials.clientId as string,
+						client_id: credentials.clientId,
 						...(credentials.grantType === 'authorizationCode' && {
 							client_secret: credentials.clientSecret as string,
 						}),
@@ -1284,8 +1314,8 @@ 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 as unknown as ClientOAuth2Options);
 				}
@@ -1297,15 +1327,15 @@ 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 ClientOAuth2RequestObject);
 
@@ -1361,8 +1391,8 @@ 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 as unknown as ClientOAuth2Options);
 				}
@@ -1374,9 +1404,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];
 
@@ -1421,11 +1452,11 @@ export async function requestOAuth1(
 	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({
@@ -1520,7 +1551,7 @@ export async function httpRequestWithAuthentication(
 			throw new NodeOperationError(
 				node,
 				`Node "${node.name}" does not have any credentials of type "${credentialsType}" set!`,
-				{ severity: 'warning' },
+				{ level: 'warning' },
 			);
 		}
 
@@ -1544,7 +1575,6 @@ export async function httpRequestWithAuthentication(
 			requestOptions,
 			workflow,
 			node,
-			additionalData.timezone,
 		);
 		return await httpRequest(requestOptions);
 	} catch (error) {
@@ -1577,7 +1607,6 @@ export async function httpRequestWithAuthentication(
 						requestOptions,
 						workflow,
 						node,
-						additionalData.timezone,
 					);
 				}
 				// retry the request
@@ -1648,7 +1677,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)) {
@@ -1668,7 +1697,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) => {
@@ -1691,10 +1720,10 @@ export async function requestWithAuthentication(
 	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,
@@ -1716,7 +1745,7 @@ export async function requestWithAuthentication(
 			throw new NodeOperationError(
 				node,
 				`Node "${node.name}" does not have any credentials of type "${credentialsType}" set!`,
-				{ severity: 'warning' },
+				{ level: 'warning' },
 			);
 		}
 
@@ -1740,7 +1769,6 @@ export async function requestWithAuthentication(
 			requestOptions as IHttpRequestOptions,
 			workflow,
 			node,
-			additionalData.timezone,
 		);
 		return await proxyRequestToAxios(workflow, additionalData, node, requestOptions as IDataObject);
 	} catch (error) {
@@ -1765,7 +1793,6 @@ export async function requestWithAuthentication(
 						requestOptions as IHttpRequestOptions,
 						workflow,
 						node,
-						additionalData.timezone,
 					);
 					// retry the request
 					return await proxyRequestToAxios(
@@ -1778,6 +1805,8 @@ export async function requestWithAuthentication(
 			}
 			throw error;
 		} catch (error) {
+			if (error instanceof ExecutionBaseError) throw error;
+
 			throw new NodeApiError(this.getNode(), error);
 		}
 	}
@@ -1795,11 +1824,13 @@ export function getAdditionalKeys(
 ): 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 {
@@ -1853,6 +1884,7 @@ export async function getCredentials(
 	type: string,
 	additionalData: IWorkflowExecuteAdditionalData,
 	mode: WorkflowExecuteMode,
+	executeData?: IExecuteData,
 	runExecutionData?: IRunExecutionData | null,
 	runIndex?: number,
 	connectionInputData?: INodeExecutionData[],
@@ -1869,7 +1901,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) {
@@ -1877,7 +1909,7 @@ export async function getCredentials(
 			throw new NodeOperationError(
 				node,
 				`Node type "${node.type}" does not have any credentials defined!`,
-				{ severity: 'warning' },
+				{ level: 'warning' },
 			);
 		}
 
@@ -1888,7 +1920,7 @@ export async function getCredentials(
 			throw new NodeOperationError(
 				node,
 				`Node type "${node.type}" does not have any credentials of type "${type}" defined!`,
-				{ severity: 'warning' },
+				{ level: 'warning' },
 			);
 		}
 
@@ -1913,14 +1945,14 @@ export async function getCredentials(
 			// Credentials are required so error
 			if (!node.credentials) {
 				throw new NodeOperationError(node, 'Node does not have any credentials set!', {
-					severity: 'warning',
+					level: 'warning',
 				});
 			}
 			if (!node.credentials[type]) {
 				throw new NodeOperationError(
 					node,
 					`Node does not have any credentials set for "${type}"!`,
-					{ severity: 'warning' },
+					{ level: 'warning' },
 				);
 			}
 		} else {
@@ -1972,7 +2004,7 @@ export async function getCredentials(
 		nodeCredentials,
 		type,
 		mode,
-		additionalData.timezone,
+		executeData,
 		false,
 		expressionResolveValues,
 	);
@@ -2046,12 +2078,9 @@ const validateResourceMapperValue = (
 		}
 
 		if (schemaEntry?.type) {
-			const validationResult = validateFieldType(
-				key,
-				resolvedValue,
-				schemaEntry.type,
-				schemaEntry.options,
-			);
+			const validationResult = validateFieldType(key, resolvedValue, schemaEntry.type, {
+				valueOptions: schemaEntry.options,
+			});
 			if (!validationResult.valid) {
 				return { ...validationResult, fieldName: key };
 			} else {
@@ -2112,12 +2141,9 @@ const validateCollection = (
 		for (const key of Object.keys(value)) {
 			if (!validationMap[key]) continue;
 
-			const fieldValidationResult = validateFieldType(
-				key,
-				value[key],
-				validationMap[key].type,
-				validationMap[key].options,
-			);
+			const fieldValidationResult = validateFieldType(key, value[key], validationMap[key].type, {
+				valueOptions: validationMap[key].options,
+			});
 
 			if (!fieldValidationResult.valid) {
 				throw new ExpressionError(
@@ -2222,7 +2248,6 @@ export function getNodeParameter(
 	parameterName: string,
 	itemIndex: number,
 	mode: WorkflowExecuteMode,
-	timezone: string,
 	additionalKeys: IWorkflowDataProxyAdditionalKeys,
 	executeData?: IExecuteData,
 	fallbackValue?: any,
@@ -2230,13 +2255,15 @@ 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) {
@@ -2244,6 +2271,7 @@ export function getNodeParameter(
 	}
 
 	let returnData;
+
 	try {
 		returnData = workflow.expression.getParameterValue(
 			value,
@@ -2253,7 +2281,6 @@ export function getNodeParameter(
 			node.name,
 			connectionInputData,
 			mode,
-			timezone,
 			additionalKeys,
 			executeData,
 			false,
@@ -2274,7 +2301,7 @@ 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
@@ -2295,7 +2322,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);
 }
 
 /**
@@ -2308,7 +2341,6 @@ export function getNodeWebhookUrl(
 	node: INode,
 	additionalData: IWorkflowExecuteAdditionalData,
 	mode: WorkflowExecuteMode,
-	timezone: string,
 	additionalKeys: IWorkflowDataProxyAdditionalKeys,
 	isTest?: boolean,
 ): string | undefined {
@@ -2327,7 +2359,6 @@ export function getNodeWebhookUrl(
 		node,
 		webhookDescription.path,
 		mode,
-		timezone,
 		additionalKeys,
 	);
 	if (path === undefined) {
@@ -2338,7 +2369,6 @@ export function getNodeWebhookUrl(
 		node,
 		webhookDescription.isFullPath,
 		mode,
-		timezone,
 		additionalKeys,
 		undefined,
 		false,
@@ -2348,17 +2378,9 @@ export function getNodeWebhookUrl(
 
 /**
  * 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;
 }
 
 /**
@@ -2399,7 +2421,9 @@ const addExecutionDataFunctions = async (
 	currentNodeRunIndex: number,
 ): Promise<void> => {
 	if (connectionType === 'main') {
-		throw new Error(`Setting the ${type} is not supported for the main connection!`);
+		throw new ApplicationError('Setting type is not supported for main connection', {
+			extra: { type },
+		});
 	}
 
 	let taskData: ITaskData | undefined;
@@ -2490,6 +2514,197 @@ const addExecutionDataFunctions = async (
 	}
 };
 
+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,
+	// TODO: Not implemented yet, and maybe also not needed
+	inputIndex?: 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,
@@ -2508,79 +2723,328 @@ const getCommonWorkflowFunctions = (
 	getRestApiUrl: () => additionalData.restApiUrl,
 	getInstanceBaseUrl: () => additionalData.instanceBaseUrl,
 	getInstanceId: () => Container.get(InstanceSettings).instanceId,
-	getTimezone: () => getTimezone(workflow, additionalData),
+	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,
+		async requestWithAuthenticationPaginated(
+			this: IExecuteFunctions,
+			requestOptions: OptionsWithUri,
+			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: IHttpRequestOptions;
+
+			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 IHttpRequestOptions;
+
+				const tempRequestOptions = merge(requestOptions, paginateRequestData);
+
+				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?.constructor.name === 'IncomingMessage' &&
+					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?.constructor.name === 'IncomingMessage' &&
+							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 httpRequestWithAuthentication.call(
+				this,
+				credentialsType,
+				requestOptions,
+				workflow,
+				node,
+				additionalData,
+				additionalCredentialOptions,
+			);
+		},
 
-	request: async (uriOrObject, options) =>
-		proxyRequestToAxios(workflow, additionalData, node, uriOrObject, options),
+		request: async (uriOrObject, options) =>
+			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,
-		);
-	},
+		): Promise<any> {
+			return requestWithAuthentication.call(
+				this,
+				credentialsType,
+				requestOptions,
+				workflow,
+				node,
+				additionalData,
+				additionalCredentialOptions,
+			);
+		},
 
-	async requestOAuth1(
-		this: IAllExecuteFunctions,
-		credentialsType: string,
-		requestOptions: OptionsWithUrl | RequestPromiseOptions,
-	): Promise<any> {
-		return requestOAuth1.call(this, credentialsType, requestOptions);
-	},
+		async requestOAuth1(
+			this: IAllExecuteFunctions,
+			credentialsType: string,
+			requestOptions: OptionsWithUrl | RequestPromiseOptions,
+		): Promise<any> {
+			return requestOAuth1.call(this, credentialsType, requestOptions);
+		},
 
-	async requestOAuth2(
-		this: IAllExecuteFunctions,
-		credentialsType: string,
-		requestOptions: OptionsWithUri | RequestPromiseOptions,
-		oAuth2Options?: IOAuth2Options,
-	): Promise<any> {
-		return requestOAuth2.call(
-			this,
-			credentialsType,
-			requestOptions,
-			node,
-			additionalData,
-			oAuth2Options,
-		);
-	},
-});
+		async requestOAuth2(
+			this: IAllExecuteFunctions,
+			credentialsType: string,
+			requestOptions: OptionsWithUri | RequestPromiseOptions,
+			oAuth2Options?: IOAuth2Options,
+		): Promise<any> {
+			return requestOAuth2.call(
+				this,
+				credentialsType,
+				requestOptions,
+				node,
+				additionalData,
+				oAuth2Options,
+			);
+		},
+	};
+};
 
 const getAllowedPaths = () => {
 	const restrictFileAccessTo = process.env[RESTRICT_FILE_ACCESS_TO];
@@ -2656,7 +3120,7 @@ const getFileSystemHelperFunctions = (node: INode): FileSystemHelperFunctions =>
 			throw error.code === 'ENOENT'
 				? new NodeOperationError(node, error, {
 						message: `The file "${String(filePath)}" could not be accessed.`,
-						severity: 'warning',
+						level: 'warning',
 				  })
 				: error;
 		}
@@ -2664,7 +3128,7 @@ const getFileSystemHelperFunctions = (node: INode): FileSystemHelperFunctions =>
 			const allowedPaths = getAllowedPaths();
 			const message = allowedPaths.length ? ` Allowed paths: ${allowedPaths.join(', ')}` : '';
 			throw new NodeOperationError(node, `Access to the file is not allowed.${message}`, {
-				severity: 'warning',
+				level: 'warning',
 			});
 		}
 		return createReadStream(filePath);
@@ -2677,7 +3141,7 @@ const getFileSystemHelperFunctions = (node: INode): FileSystemHelperFunctions =>
 	async writeContentToFile(filePath, content, flag) {
 		if (isFilePathBlocked(filePath as string)) {
 			throw new NodeOperationError(node, `The file "${String(filePath)}" is not writable.`, {
-				severity: 'warning',
+				level: 'warning',
 			});
 		}
 		return fsWriteFile(filePath, content, { encoding: 'binary', flag });
@@ -2706,7 +3170,7 @@ const getBinaryHelperFunctions = (
 	setBinaryDataBuffer: async (data, binaryData) =>
 		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.');
 	},
 });
 
@@ -2743,10 +3207,12 @@ export function getExecutePollFunctions(
 		return {
 			...getCommonWorkflowFunctions(workflow, node, additionalData),
 			__emit: (data: INodeExecutionData[][]): void => {
-				throw new Error('Overwrite NodeExecuteFunctions.getExecutePollFunctions.__emit function!');
+				throw new ApplicationError(
+					'Overwrite NodeExecuteFunctions.getExecutePollFunctions.__emit function!',
+				);
 			},
 			__emitError(error: Error) {
-				throw new Error(
+				throw new ApplicationError(
 					'Overwrite NodeExecuteFunctions.getExecutePollFunctions.__emitError function!',
 				);
 			},
@@ -2772,7 +3238,6 @@ export function getExecutePollFunctions(
 					parameterName,
 					itemIndex,
 					mode,
-					additionalData.timezone,
 					getAdditionalKeys(additionalData, mode, runExecutionData),
 					undefined,
 					fallbackValue,
@@ -2804,10 +3269,14 @@ export function getExecuteTriggerFunctions(
 		return {
 			...getCommonWorkflowFunctions(workflow, node, additionalData),
 			emit: (data: INodeExecutionData[][]): void => {
-				throw new Error('Overwrite NodeExecuteFunctions.getExecuteTriggerFunctions.emit function!');
+				throw new ApplicationError(
+					'Overwrite NodeExecuteFunctions.getExecuteTriggerFunctions.emit function!',
+				);
 			},
 			emitError: (error: Error): void => {
-				throw new Error('Overwrite NodeExecuteFunctions.getExecuteTriggerFunctions.emit function!');
+				throw new ApplicationError(
+					'Overwrite NodeExecuteFunctions.getExecuteTriggerFunctions.emit function!',
+				);
 			},
 			getMode: () => mode,
 			getActivationMode: () => activation,
@@ -2831,7 +3300,6 @@ export function getExecuteTriggerFunctions(
 					parameterName,
 					itemIndex,
 					mode,
-					additionalData.timezone,
 					getAdditionalKeys(additionalData, mode, runExecutionData),
 					undefined,
 					fallbackValue,
@@ -2861,10 +3329,13 @@ 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(
@@ -2873,6 +3344,7 @@ export function getExecuteFunctions(
 					type,
 					additionalData,
 					mode,
+					executeData,
 					runExecutionData,
 					runIndex,
 					connectionInputData,
@@ -2890,7 +3362,6 @@ export function getExecuteFunctions(
 					node.name,
 					connectionInputData,
 					mode,
-					additionalData.timezone,
 					getAdditionalKeys(additionalData, mode, runExecutionData),
 					executeData,
 				);
@@ -2904,6 +3375,7 @@ export function getExecuteFunctions(
 						parentWorkflowId: workflow.id?.toString(),
 						inputData,
 						parentWorkflowSettings: workflow.settings,
+						node,
 					})
 					.then(async (result) =>
 						Container.get(BinaryDataService).duplicateBinaryData(
@@ -2913,184 +3385,32 @@ export function getExecuteFunctions(
 						),
 					);
 			},
-			getContext(type: string): IContextObject {
+			getContext(type: ContextType): IContextObject {
 				return NodeHelpers.getContext(runExecutionData, type, node);
 			},
+
 			async getInputConnectionData(
 				inputName: ConnectionTypes,
 				itemIndex: number,
 				// TODO: Not implemented yet, and maybe also not needed
 				inputIndex?: 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 Error(`The node "${node.name}" does not have an input of type "${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 Error(
-								`The node "${connectedNode.name}" does not have a "supplyData" method defined!`,
-							);
-						}
-
-						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,
-								additionalData.timezone,
-								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,
-									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 {
-							return await nodeType.supplyData.call(context, itemIndex);
-						} catch (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 on node "${connectedNode.name}" which is connected via input "${inputName}"`,
-								{
-									itemIndex,
-								},
-							);
-						}
-					});
-
-				// 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);
+				return getInputConnectionData.call(
+					this,
+					workflow,
+					runExecutionData,
+					runIndex,
+					connectionInputData,
+					additionalData,
+					executeData,
+					mode,
+					closeFunctions,
+					inputName,
+					itemIndex,
+					inputIndex,
+				);
 			},
+
 			getNodeOutputs(): INodeOutputConfiguration[] {
 				const nodeType = workflow.nodeTypes.getByNameAndVersion(node.type, node.typeVersion);
 				return NodeHelpers.getNodeOutputs(workflow, node, nodeType.description).map((output) => {
@@ -3110,12 +3430,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[];
@@ -3123,7 +3446,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];
 			},
@@ -3142,7 +3465,6 @@ export function getExecuteFunctions(
 					parameterName,
 					itemIndex,
 					mode,
-					additionalData.timezone,
 					getAdditionalKeys(additionalData, mode, runExecutionData),
 					executeData,
 					fallbackValue,
@@ -3159,7 +3481,6 @@ export function getExecuteFunctions(
 					connectionInputData,
 					{},
 					mode,
-					additionalData.timezone,
 					getAdditionalKeys(additionalData, mode, runExecutionData),
 					executeData,
 				);
@@ -3205,7 +3526,7 @@ export function getExecuteFunctions(
 
 			addInputData(
 				connectionType: ConnectionTypes,
-				data: INodeExecutionData[][] | ExecutionError,
+				data: INodeExecutionData[][] | ExecutionBaseError,
 			): { index: number } {
 				const nodeName = this.getNode().name;
 				let currentNodeRunIndex = 0;
@@ -3236,7 +3557,7 @@ export function getExecuteFunctions(
 			addOutputData(
 				connectionType: ConnectionTypes,
 				currentNodeRunIndex: number,
-				data: INodeExecutionData[][] | ExecutionError,
+				data: INodeExecutionData[][] | ExecutionBaseError,
 			): void {
 				addExecutionDataFunctions(
 					'output',
@@ -3290,10 +3611,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;
@@ -3306,12 +3629,11 @@ 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) =>
@@ -3321,6 +3643,7 @@ export function getExecuteSingleFunctions(
 					type,
 					additionalData,
 					mode,
+					executeData,
 					runExecutionData,
 					runIndex,
 					connectionInputData,
@@ -3334,21 +3657,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];
@@ -3356,7 +3681,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;
 			},
@@ -3377,7 +3702,6 @@ export function getExecuteSingleFunctions(
 					parameterName,
 					itemIndex,
 					mode,
-					additionalData.timezone,
 					getAdditionalKeys(additionalData, mode, runExecutionData),
 					executeData,
 					fallbackValue,
@@ -3394,7 +3718,6 @@ export function getExecuteSingleFunctions(
 					connectionInputData,
 					{},
 					mode,
-					additionalData.timezone,
 					getAdditionalKeys(additionalData, mode, runExecutionData),
 					executeData,
 				);
@@ -3454,9 +3777,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,
@@ -3489,7 +3812,6 @@ export function getLoadOptionsFunctions(
 					parameterName,
 					itemIndex,
 					mode,
-					additionalData.timezone,
 					getAdditionalKeys(additionalData, mode, runExecutionData),
 					undefined,
 					fallbackValue,
@@ -3510,7 +3832,6 @@ export function getExecuteHookFunctions(
 	additionalData: IWorkflowExecuteAdditionalData,
 	mode: WorkflowExecuteMode,
 	activation: WorkflowActivateMode,
-	isTest?: boolean,
 	webhookData?: IWebhookData,
 ): IHookFunctions {
 	return ((workflow: Workflow, node: INode) => {
@@ -3538,7 +3859,6 @@ export function getExecuteHookFunctions(
 					parameterName,
 					itemIndex,
 					mode,
-					additionalData.timezone,
 					getAdditionalKeys(additionalData, mode, runExecutionData),
 					undefined,
 					fallbackValue,
@@ -3552,14 +3872,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;
 			},
@@ -3572,29 +3891,72 @@ 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),
 			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,
+				// TODO: Not implemented yet, and maybe also not needed
+				inputIndex?: 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 getInputConnectionData.call(
+					this,
+					workflow,
+					runExecutionData,
+					runIndex,
+					connectionInputData,
+					additionalData,
+					executeData,
+					mode,
+					closeFunctions,
+					inputName,
+					itemIndex,
+					inputIndex,
+				);
+			},
 			getMode: () => mode,
 			getNodeParameter: (
 				parameterName: string,
@@ -3615,7 +3977,6 @@ export function getExecuteWebhookFunctions(
 					parameterName,
 					itemIndex,
 					mode,
-					additionalData.timezone,
 					getAdditionalKeys(additionalData, mode, null),
 					undefined,
 					fallbackValue,
@@ -3624,25 +3985,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;
 			},
@@ -3653,7 +4014,6 @@ export function getExecuteWebhookFunctions(
 					node,
 					additionalData,
 					mode,
-					additionalData.timezone,
 					getAdditionalKeys(additionalData, mode, null),
 				),
 			getWebhookName: () => webhookData.webhookDescription.name,
diff --git a/packages/core/src/OAuth2Helper.ts b/packages/core/src/OAuth2Helper.ts
deleted file mode 100644
index dacb8d44a0..0000000000
--- a/packages/core/src/OAuth2Helper.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import type { ICredentialDataDecryptedObject } from 'n8n-workflow';
-import type { ClientOAuth2, ClientOAuth2Options, ClientOAuth2Token } from '@n8n/client-oauth2';
-
-export const getClientCredentialsToken = async (
-	oAuth2Client: ClientOAuth2,
-	credentials: ICredentialDataDecryptedObject,
-): Promise<ClientOAuth2Token> => {
-	const options = {};
-	if (credentials.authentication === 'body') {
-		Object.assign(options, {
-			headers: {
-				// eslint-disable-next-line @typescript-eslint/naming-convention
-				Authorization: '',
-			},
-			body: {
-				client_id: credentials.clientId as string,
-				client_secret: credentials.clientSecret as string,
-			},
-		});
-	}
-	return oAuth2Client.credentials.getToken(options as ClientOAuth2Options);
-};
diff --git a/packages/core/src/ObjectStore/ObjectStore.service.ee.ts b/packages/core/src/ObjectStore/ObjectStore.service.ee.ts
index e289cbfbb2..bf2757b655 100644
--- a/packages/core/src/ObjectStore/ObjectStore.service.ee.ts
+++ b/packages/core/src/ObjectStore/ObjectStore.service.ee.ts
@@ -5,19 +5,20 @@ import axios from 'axios';
 import { Service } from 'typedi';
 import { sign } from 'aws4';
 import { isStream, parseXml, writeBlockedMessage } from './utils';
-import { LoggerProxy as Logger } from 'n8n-workflow';
+import { ApplicationError, LoggerProxy as Logger } from 'n8n-workflow';
 
-import type { AxiosRequestConfig, AxiosResponse, Method } from 'axios';
+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 '..';
+import type { BinaryData } from '../BinaryData/types';
 
 @Service()
 export class ObjectStoreService {
@@ -115,19 +116,11 @@ export class ObjectStoreService {
 	 * @doc https://docs.aws.amazon.com/AmazonS3/latest/userguide/UsingMetadata.html
 	 */
 	async getMetadata(fileId: string) {
-		type Response = {
-			headers: {
-				'content-length': string;
-				'content-type'?: string;
-				'x-amz-meta-filename'?: string;
-			} & BinaryData.PreWriteMetadata;
-		};
-
 		const path = `${this.bucket.name}/${fileId}`;
 
-		const response: Response = await this.request('HEAD', this.host, path);
+		const response = await this.request('HEAD', this.host, path);
 
-		return response.headers;
+		return response.headers as MetadataResponseHeaders;
 	}
 
 	/**
@@ -239,10 +232,16 @@ export class ObjectStoreService {
 
 		this.logger.warn(logMessage);
 
-		return { status: 403, statusText: 'Forbidden', data: logMessage, headers: {}, config: {} };
+		return {
+			status: 403,
+			statusText: 'Forbidden',
+			data: logMessage,
+			headers: {},
+			config: {} as InternalAxiosRequestConfig,
+		};
 	}
 
-	private async request(
+	private async request<T>(
 		method: Method,
 		host: string,
 		rawPath = '',
@@ -275,7 +274,7 @@ export class ObjectStoreService {
 		try {
 			this.logger.debug('Sending request to S3', { config });
 
-			return await axios.request<unknown>(config);
+			return await axios.request<T>(config);
 		} catch (e) {
 			const error = e instanceof Error ? e : new Error(`${e}`);
 
@@ -283,7 +282,7 @@ export class ObjectStoreService {
 
 			this.logger.error(message, { config });
 
-			throw new Error(message, { cause: { error, details: 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
index 444630e924..639ae2e6a2 100644
--- a/packages/core/src/ObjectStore/types.ts
+++ b/packages/core/src/ObjectStore/types.ts
@@ -1,4 +1,5 @@
-import type { ResponseType } from 'axios';
+import type { AxiosResponseHeaders, ResponseType } from 'axios';
+import type { BinaryData } from '../BinaryData/types';
 
 export type RawListPage = {
 	listBucketResult: {
@@ -31,4 +32,10 @@ export type RequestOptions = {
 	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/WorkflowExecute.ts b/packages/core/src/WorkflowExecute.ts
index 643fbfeb7e..781aea9fdb 100644
--- a/packages/core/src/WorkflowExecute.ts
+++ b/packages/core/src/WorkflowExecute.ts
@@ -1,14 +1,14 @@
 /* eslint-disable @typescript-eslint/prefer-optional-chain */
-
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
-
 /* 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,
@@ -29,35 +29,30 @@ import type {
 	NodeApiError,
 	NodeOperationError,
 	Workflow,
+	IRunExecutionData,
+	IWorkflowExecuteAdditionalData,
+	WorkflowExecuteMode,
+	CloseFunction,
 } from 'n8n-workflow';
 import {
 	LoggerProxy as Logger,
 	WorkflowOperationError,
-	IRunExecutionData,
-	IWorkflowExecuteAdditionalData,
-	WorkflowExecuteMode,
+	NodeHelpers,
+	NodeConnectionType,
+	ApplicationError,
 } from 'n8n-workflow';
 import get from 'lodash/get';
 import * as NodeExecuteFunctions from './NodeExecuteFunctions';
 
 export class WorkflowExecute {
-	runExecutionData: IRunExecutionData;
+	private status: ExecutionStatus = 'new';
 
-	private additionalData: IWorkflowExecuteAdditionalData;
-
-	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: {},
@@ -70,8 +65,8 @@ export class WorkflowExecute {
 				waitingExecution: {},
 				waitingExecutionSource: {},
 			},
-		};
-	}
+		},
+	) {}
 
 	/**
 	 * Executes the given workflow.
@@ -96,7 +91,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
@@ -209,7 +204,7 @@ export class WorkflowExecute {
 								continue;
 							}
 							const nodeIncomingData =
-								runData[connection.node][runIndex]?.data?.[connection.type][connection.index];
+								runData[connection.node]?.[runIndex]?.data?.[connection.type]?.[connection.index];
 							if (nodeIncomingData) {
 								incomingData.push(nodeIncomingData);
 							}
@@ -274,7 +269,6 @@ export class WorkflowExecute {
 				}
 
 				// Only run the parent nodes and no others
-				// eslint-disable-next-line prefer-const
 				runNodeFilter = workflow
 					.getParentNodes(destinationNode)
 					.filter((parentNodeName) => !workflow.getNode(parentNodeName)?.disabled);
@@ -798,14 +792,14 @@ 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;
@@ -828,11 +822,16 @@ export class WorkflowExecute {
 		let closeFunction: Promise<void> | undefined;
 
 		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);
 			});
 
 			const returnPromise = (async () => {
@@ -841,11 +840,13 @@ export class WorkflowExecute {
 						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
@@ -879,10 +880,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;
 					}
 
@@ -930,7 +931,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 (
@@ -1012,9 +1015,6 @@ export class WorkflowExecute {
 					}
 
 					for (let tryIndex = 0; tryIndex < maxTries; tryIndex++) {
-						if (gotCancel) {
-							return;
-						}
 						try {
 							if (tryIndex !== 0) {
 								// Reset executionError from previous error try
@@ -1042,6 +1042,7 @@ export class WorkflowExecute {
 									node: executionNode.name,
 									workflowId: workflow.id,
 								});
+
 								const runNodeData = await workflow.runNode(
 									executionData,
 									this.runExecutionData,
@@ -1049,9 +1050,118 @@ export class WorkflowExecute {
 									this.additionalData,
 									NodeExecuteFunctions,
 									this.mode,
+									this.abortController.signal,
 								);
 								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;
+											}
+
+											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
 
@@ -1150,10 +1260,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`, {
@@ -1181,7 +1293,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
@@ -1217,11 +1334,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 };
 							}
 						}
@@ -1294,9 +1417,12 @@ 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 (
@@ -1403,7 +1529,6 @@ export class WorkflowExecute {
 										checkNode,
 										requiredInputs,
 										this.mode,
-										this.additionalData.timezone,
 										{ $version: checkNode.typeVersion },
 										undefined,
 										[],
@@ -1531,7 +1656,7 @@ export class WorkflowExecute {
 				return;
 			})()
 				.then(async () => {
-					if (gotCancel && executionError === undefined) {
+					if (this.status === 'canceled' && executionError === undefined) {
 						return this.processSuccessExecution(
 							startedAt,
 							workflow,
@@ -1590,7 +1715,7 @@ export class WorkflowExecute {
 	async processSuccessExecution(
 		startedAt: Date,
 		workflow: Workflow,
-		executionError?: ExecutionError,
+		executionError?: ExecutionBaseError,
 		closeFunction?: Promise<void>,
 	): Promise<IRun> {
 		const fullRunData = this.getFullRunData(startedAt);
@@ -1604,7 +1729,7 @@ export class WorkflowExecute {
 				...executionError,
 				message: executionError.message,
 				stack: executionError.stack,
-			} as ExecutionError;
+			} as ExecutionBaseError;
 			if (executionError.message?.includes('canceled')) {
 				fullRunData.status = 'canceled';
 			}
diff --git a/packages/core/src/decorators/LogCatch.decorator.ts b/packages/core/src/decorators/LogCatch.decorator.ts
deleted file mode 100644
index f43bc71d61..0000000000
--- a/packages/core/src/decorators/LogCatch.decorator.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-/* eslint-disable @typescript-eslint/naming-convention */
-/* eslint-disable @typescript-eslint/no-unsafe-call */
-/* eslint-disable @typescript-eslint/no-unsafe-member-access */
-/* eslint-disable @typescript-eslint/no-unsafe-assignment */
-
-export const LogCatch = (logFn: (error: unknown) => void) => {
-	return (target: unknown, propertyKey: string, descriptor: PropertyDescriptor) => {
-		const originalMethod = descriptor.value;
-
-		descriptor.value = function (...args: unknown[]) {
-			try {
-				const result: unknown = originalMethod.apply(this, args);
-
-				if (result && result instanceof Promise) {
-					return result.catch((error: unknown) => {
-						logFn(error);
-						throw error;
-					});
-				}
-
-				return result;
-			} catch (error) {
-				logFn(error);
-				throw error;
-			}
-		};
-
-		return descriptor;
-	};
-};
diff --git a/packages/core/src/errors.ts b/packages/core/src/errors.ts
deleted file mode 100644
index c425675c89..0000000000
--- 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 0000000000..061e95baf4
--- /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 0000000000..5ee937af68
--- /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 0000000000..4d6ac5684d
--- /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 0000000000..208bb0d354
--- /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 0000000000..c280ecb30d
--- /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 0000000000..972703e0d1
--- /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 0000000000..ecd1f75ca3
--- /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 0000000000..348fbb410d
--- /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 6ec3e0cfde..3a988ecc4d 100644
--- a/packages/core/src/index.ts
+++ b/packages/core/src/index.ts
@@ -1,5 +1,6 @@
 import * as NodeExecuteFunctions from './NodeExecuteFunctions';
 
+export * from './errors';
 export * from './ActiveWorkflows';
 export * from './BinaryData/BinaryData.service';
 export * from './BinaryData/types';
@@ -10,9 +11,6 @@ export * from './Credentials';
 export * from './DirectoryLoader';
 export * from './Interfaces';
 export { InstanceSettings } from './InstanceSettings';
-export * from './LoadMappingOptions';
-export * from './LoadNodeParameterOptions';
-export * from './LoadNodeListSearch';
 export * from './NodeExecuteFunctions';
 export * from './WorkflowExecute';
 export { NodeExecuteFunctions };
@@ -20,3 +18,4 @@ 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 0000000000..bd69795dae
--- /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 0000000000..1b7c0de944
--- /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 542d8eb8b6..aca7787030 100644
--- a/packages/core/test/Credentials.test.ts
+++ b/packages/core/test/Credentials.test.ts
@@ -84,9 +84,7 @@ describe('Credentials', () => {
 				credentials.getData('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".',
-				);
+				expect(e.message).toBe('Node does not have access to credential');
 			}
 
 			// Get the data which will be saved in database
diff --git a/packages/core/test/FileSystem.manager.test.ts b/packages/core/test/FileSystem.manager.test.ts
index 039307a57d..7087242726 100644
--- a/packages/core/test/FileSystem.manager.test.ts
+++ b/packages/core/test/FileSystem.manager.test.ts
@@ -53,6 +53,7 @@ describe('getPath()', () => {
 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);
 
@@ -64,6 +65,7 @@ describe('getAsBuffer()', () => {
 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);
 
@@ -123,6 +125,7 @@ describe('copyByFilePath()', () => {
 		const targetPath = toFullFilePath(otherFileId);
 
 		fsp.cp = jest.fn().mockResolvedValue(undefined);
+		fsp.writeFile = jest.fn().mockResolvedValue(undefined);
 
 		const result = await fsManager.copyByFilePath(
 			workflowId,
@@ -132,6 +135,11 @@ describe('copyByFilePath()', () => {
 		);
 
 		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);
 	});
 });
diff --git a/packages/core/test/Validation.test.ts b/packages/core/test/Validation.test.ts
index 2554abb05b..a19422a090 100644
--- a/packages/core/test/Validation.test.ts
+++ b/packages/core/test/Validation.test.ts
@@ -123,11 +123,9 @@ describe('Validation', () => {
 									{
 										displayName: 'Value',
 										name: 'objectValue',
-										type: 'string',
+										type: 'json',
 										default: '={}',
 										typeOptions: {
-											editor: 'json',
-											editorLanguage: 'json',
 											rows: 2,
 										},
 										displayOptions: {
diff --git a/packages/core/test/WorkflowExecute.test.ts b/packages/core/test/WorkflowExecute.test.ts
index 4583c789ec..8ad953c654 100644
--- a/packages/core/test/WorkflowExecute.test.ts
+++ b/packages/core/test/WorkflowExecute.test.ts
@@ -1,5 +1,5 @@
 import type { IRun, WorkflowTestData } from 'n8n-workflow';
-import { createDeferredPromise, Workflow } from 'n8n-workflow';
+import { ApplicationError, createDeferredPromise, Workflow } from 'n8n-workflow';
 import { WorkflowExecute } from '@/WorkflowExecute';
 
 import * as Helpers from './helpers';
@@ -45,7 +45,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) => {
@@ -108,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) => {
@@ -172,7 +172,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) => {
diff --git a/packages/core/test/WorkflowExecutionMetadata.test.ts b/packages/core/test/WorkflowExecutionMetadata.test.ts
index 8af21444b4..cdb50c9737 100644
--- a/packages/core/test/WorkflowExecutionMetadata.test.ts
+++ b/packages/core/test/WorkflowExecutionMetadata.test.ts
@@ -1,11 +1,11 @@
 import {
-	getAllWorkflowExecutionMetadata,
-	getWorkflowExecutionMetadata,
-	KV_LIMIT,
-	setAllWorkflowExecutionMetadata,
 	setWorkflowExecutionMetadata,
-	ExecutionMetadataValidationError,
-} from '@/WorkflowExecutionMetadata';
+	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', () => {
@@ -52,7 +52,7 @@ describe('Execution Metadata functions', () => {
 		} as IRunExecutionData;
 
 		expect(() => setWorkflowExecutionMetadata(executionData, 'test1', 1234)).not.toThrow(
-			ExecutionMetadataValidationError,
+			InvalidExecutionMetadataError,
 		);
 
 		expect(metadata).toEqual({
@@ -60,7 +60,7 @@ describe('Execution Metadata functions', () => {
 		});
 
 		expect(() => setWorkflowExecutionMetadata(executionData, 'test2', {})).toThrow(
-			ExecutionMetadataValidationError,
+			InvalidExecutionMetadataError,
 		);
 
 		expect(metadata).not.toEqual({
@@ -84,7 +84,7 @@ describe('Execution Metadata functions', () => {
 				test3: 'value3',
 				test4: 'value4',
 			}),
-		).toThrow(ExecutionMetadataValidationError);
+		).toThrow(InvalidExecutionMetadataError);
 
 		expect(metadata).toEqual({
 			test3: 'value3',
@@ -101,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/index.ts b/packages/core/test/helpers/index.ts
index f5d46f34a0..fc0717188b 100644
--- a/packages/core/test/helpers/index.ts
+++ b/packages/core/test/helpers/index.ts
@@ -21,9 +21,10 @@ import type {
 	IWorkflowExecuteAdditionalData,
 	NodeLoadingDetails,
 	WorkflowTestData,
+	INodeTypeData,
 } from 'n8n-workflow';
 
-import { ICredentialsHelper, NodeHelpers, WorkflowHooks, INodeTypeData } from 'n8n-workflow';
+import { ApplicationError, ICredentialsHelper, NodeHelpers, WorkflowHooks } from 'n8n-workflow';
 import { Credentials } from '@/Credentials';
 
 import { predefinedNodesTypes } from './constants';
@@ -135,7 +136,6 @@ export function WorkflowExecuteAdditionalData(
 		executeWorkflow: async (workflowInfo: IExecuteWorkflowInfo) => {},
 		sendDataToUI: (message: string) => {},
 		restApiUrl: '',
-		timezone: 'America/New_York',
 		webhookBaseUrl: 'webhook',
 		webhookWaitingBaseUrl: 'webhook-waiting',
 		webhookTestBaseUrl: 'webhook-test',
@@ -177,11 +177,11 @@ export function getNodeTypes(testData: WorkflowTestData[] | WorkflowTestData) {
 
 	for (const nodeName of nodeNames) {
 		if (!nodeName.startsWith('n8n-nodes-base.')) {
-			throw new Error(`Unknown node type: ${nodeName}`);
+			throw new ApplicationError('Unknown node type', { tags: { nodeType: nodeName } });
 		}
 		const loadInfo = knownNodes[nodeName.replace('n8n-nodes-base.', '')];
 		if (!loadInfo) {
-			throw new Error(`Unknown node type: ${nodeName}`);
+			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);
@@ -218,7 +218,7 @@ export const workflowToTests = (dirname: string, testFolder = 'workflows') => {
 		const description = filePath.replace('.json', '');
 		const workflowData = readJsonFileSync<IWorkflowBase>(filePath);
 		if (workflowData.pinData === undefined) {
-			throw new Error('Workflow data does not contain pinData');
+			throw new ApplicationError('Workflow data does not contain pinData');
 		}
 
 		const nodeData = preparePinData(workflowData.pinData);
diff --git a/packages/core/test/setup-mocks.ts b/packages/core/test/setup-mocks.ts
new file mode 100644
index 0000000000..d2c9bc6e64
--- /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 9dd142ebd5..8895875240 100644
--- a/packages/core/test/utils.ts
+++ b/packages/core/test/utils.ts
@@ -3,9 +3,10 @@ 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: new (...args: unknown[]) => T,
+	constructor: Class<T>,
 	data: DeepPartial<T> | undefined = undefined,
 ) => {
 	const instance = mock<T>(data);
diff --git a/packages/core/test/workflows/error_outputs.json b/packages/core/test/workflows/error_outputs.json
new file mode 100644
index 0000000000..f8e698bd52
--- /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/design-system/.eslintrc.js b/packages/design-system/.eslintrc.js
index a14832cc55..3fc314bc42 100644
--- a/packages/design-system/.eslintrc.js
+++ b/packages/design-system/.eslintrc.js
@@ -9,8 +9,6 @@ module.exports = {
 	...sharedOptions(__dirname, 'frontend'),
 
 	rules: {
-		'n8n-local-rules/dangerously-use-html-string-missing': 'off',
-
 		// TODO: Remove these
 		'import/no-default-export': 'warn',
 		'import/order': 'off',
diff --git a/packages/design-system/.storybook/main.ts b/packages/design-system/.storybook/main.ts
index 4c10fc9207..f719877d39 100644
--- a/packages/design-system/.storybook/main.ts
+++ b/packages/design-system/.storybook/main.ts
@@ -1,17 +1,21 @@
+import { dirname, join } from 'path';
 import type { StorybookConfig } from '@storybook/vue3-vite';
 
+function getAbsolutePath(value: string): string {
+	return dirname(require.resolve(join(value, 'package.json'))).toString();
+}
+
 const config: StorybookConfig = {
 	stories: ['../src/**/*.stories.@(js|jsx|ts|tsx|mdx)'],
 	addons: [
-		'@storybook/addon-styling',
-		'@storybook/addon-links',
-		'@storybook/addon-essentials',
-		'@storybook/addon-a11y',
-		'storybook-dark-mode',
+		getAbsolutePath('@storybook/addon-links'),
+		getAbsolutePath('@storybook/addon-essentials'),
+		getAbsolutePath('@storybook/addon-a11y'),
+		getAbsolutePath('storybook-dark-mode'),
 	],
 	staticDirs: ['../public'],
 	framework: {
-		name: '@storybook/vue3-vite',
+		name: getAbsolutePath('@storybook/vue3-vite') as '@storybook/vue3-vite',
 		options: {},
 	},
 	core: {
diff --git a/packages/design-system/.storybook/preview.js b/packages/design-system/.storybook/preview.js
index 49708b358a..8991fa4a0a 100644
--- a/packages/design-system/.storybook/preview.js
+++ b/packages/design-system/.storybook/preview.js
@@ -45,10 +45,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)',
@@ -66,7 +62,7 @@ export const parameters = {
 	},
 	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/README.md b/packages/design-system/README.md
index 7bc578ba68..ea69f24524 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/package.json b/packages/design-system/package.json
index 7f370217ff..9addb27a53 100644
--- a/packages/design-system/package.json
+++ b/packages/design-system/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-design-system",
-  "version": "1.9.0",
+  "version": "1.18.0",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",
   "author": {
@@ -14,10 +14,11 @@
     "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",
+    "test": "vitest run",
     "test:dev": "vitest",
     "build:storybook": "storybook build",
     "storybook": "storybook dev -p 6006",
@@ -25,50 +26,46 @@
     "lint": "eslint src --ext .js,.ts,.vue --quiet",
     "lintfix": "eslint src --ext .js,.ts,.vue --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",
-    "xss": "^1.0.14"
-  },
   "devDependencies": {
-    "@fortawesome/fontawesome-svg-core": "^1.2.36",
-    "@fortawesome/free-solid-svg-icons": "^5.15.4",
-    "@fortawesome/vue-fontawesome": "^3.0.3",
-    "@storybook/addon-a11y": "^7.1.1",
-    "@storybook/addon-actions": "^7.1.1",
-    "@storybook/addon-docs": "^7.1.1",
-    "@storybook/addon-essentials": "^7.1.1",
-    "@storybook/addon-links": "^7.1.1",
+    "@storybook/addon-a11y": "^7.5.2",
+    "@storybook/addon-actions": "^7.5.2",
+    "@storybook/addon-docs": "^7.5.2",
+    "@storybook/addon-essentials": "^7.5.2",
+    "@storybook/addon-interactions": "^7.5.2",
+    "@storybook/addon-links": "^7.5.2",
     "@storybook/addon-postcss": "3.0.0-alpha.1",
-    "@storybook/addon-styling": "^1.3.4",
-    "@storybook/vue3": "^7.1.1",
-    "@storybook/vue3-vite": "^7.1.1",
-    "@testing-library/jest-dom": "^5.17.0",
-    "@testing-library/user-event": "^14.4.3",
-    "@testing-library/vue": "^7.0.0",
+    "@storybook/blocks": "^7.5.2",
+    "@storybook/testing-library": "^0.2.2",
+    "@storybook/vue3": "^7.5.2",
+    "@storybook/vue3-vite": "^7.5.2",
+    "@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.9.0",
-    "@vitejs/plugin-vue": "^4.2.3",
-    "@vue/test-utils": "^2.4.1",
+    "@vitejs/plugin-vue": "^4.5.2",
+    "@vue/test-utils": "^2.4.3",
+    "@vue/tsconfig": "^0.5.1",
     "autoprefixer": "^10.4.14",
     "core-js": "^3.31.0",
-    "jsdom": "21.1.0",
+    "jsdom": "^23.0.1",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
     "sass": "^1.64.1",
     "sass-loader": "^13.3.2",
-    "storybook": "^7.1.1",
+    "storybook": "^7.5.2",
     "storybook-addon-themes": "^6.1.0",
     "storybook-dark-mode": "^3.0.1"
   },
   "dependencies": {
+    "@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",
diff --git a/packages/design-system/public/.nojekyll b/packages/design-system/public/.nojekyll
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/design-system/src/components/N8nActionBox/ActionBox.vue b/packages/design-system/src/components/N8nActionBox/ActionBox.vue
index d3ec2bb29f..8230d1fbc5 100644
--- a/packages/design-system/src/components/N8nActionBox/ActionBox.vue
+++ b/packages/design-system/src/components/N8nActionBox/ActionBox.vue
@@ -1,37 +1,37 @@
 <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:button', $event)"
 		/>
-		<n8n-callout
+		<N8nCallout
 			v-if="calloutText"
 			:theme="calloutTheme"
 			:icon="calloutIcon"
 			:class="$style.callout"
 		>
-			<n8n-text color="text-base">
+			<N8nText color="text-base">
 				<span size="small" v-html="calloutText"></span>
-			</n8n-text>
-		</n8n-callout>
+			</N8nText>
+		</N8nCallout>
 	</div>
 </template>
 
@@ -43,7 +43,7 @@ import N8nCallout from '../N8nCallout';
 import { defineComponent } from 'vue';
 
 export default defineComponent({
-	name: 'n8n-action-box',
+	name: 'N8nActionBox',
 	components: {
 		N8nButton,
 		N8nHeading,
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 6679585f19..0e8e770f05 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, https://vitest.dev/guide/snapshot.html
 
 exports[`N8NActionBox > should render correctly 1`] = `
-"<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 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 color=\\"text-base\\" bold=\\"false\\" size=\\"medium\\" compact=\\"false\\" tag=\\"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\\" loading=\\"false\\" disabled=\\"false\\" outline=\\"false\\" text=\\"false\\" block=\\"false\\" active=\\"false\\" square=\\"false\\"></n8n-button-stub>
+  <n8n-button-stub label="Do something" type="primary" size="large" loading="false" disabled="false" outline="false" text="false" block="false" active="false" square="false" element="button"></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 8e229231df..30148d3e13 100644
--- a/packages/design-system/src/components/N8nActionDropdown/ActionDropdown.stories.ts
+++ b/packages/design-system/src/components/N8nActionDropdown/ActionDropdown.stories.ts
@@ -71,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 a9c9612a7e..db7487f655 100644
--- a/packages/design-system/src/components/N8nActionDropdown/ActionDropdown.vue
+++ b/packages/design-system/src/components/N8nActionDropdown/ActionDropdown.vue
@@ -1,35 +1,52 @@
 <template>
 	<div :class="['action-dropdown-container', $style.actionDropdownContainer]">
-		<el-dropdown
+		<ElDropdown
+			ref="elementDropdown"
 			:placement="placement"
 			:trigger="trigger"
+			:popper-class="{ [$style.shadow]: true, [$style.hideArrow]: hideArrow }"
 			@command="onSelect"
-			ref="elementDropdown"
+			@visible-change="onVisibleChange"
 		>
-			<div :class="$style.activator" @click.stop.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="`${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>
 
@@ -38,6 +55,8 @@ import type { PropType } from 'vue';
 import { defineComponent } from 'vue';
 import { ElDropdown, ElDropdownMenu, ElDropdownItem } from 'element-plus';
 import N8nIcon from '../N8nIcon';
+import { N8nKeyboardShortcut } from '../N8nKeyboardShortcut';
+import type { KeyboardShortcut } from '../../types';
 
 export interface IActionDropdownItem {
 	id: string;
@@ -45,6 +64,7 @@ export interface IActionDropdownItem {
 	icon?: string;
 	divided?: boolean;
 	disabled?: boolean;
+	shortcut?: KeyboardShortcut;
 	customClass?: string;
 }
 
@@ -55,16 +75,13 @@ export interface IActionDropdownItem {
 // 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',
+	name: 'N8nActionDropdown',
 	components: {
 		ElDropdown,
 		ElDropdownMenu,
 		ElDropdownItem,
 		N8nIcon,
-	},
-	data() {
-		const testIdPrefix = this.$attrs['data-test-id'];
-		return { testIdPrefix };
+		N8nKeyboardShortcut,
 	},
 	props: {
 		items: {
@@ -79,7 +96,11 @@ export default defineComponent({
 		},
 		activatorIcon: {
 			type: String,
-			default: 'ellipsis-v',
+			default: 'ellipsis-h',
+		},
+		activatorSize: {
+			type: String,
+			default: 'medium',
 		},
 		iconSize: {
 			type: String,
@@ -91,11 +112,20 @@ export default defineComponent({
 			default: 'click',
 			validator: (value: string): boolean => ['click', 'hover'].includes(value),
 		},
+		hideArrow: {
+			type: Boolean,
+			default: false,
+		},
+	},
+	data() {
+		const testIdPrefix = this.$attrs['data-test-id'];
+		return { testIdPrefix };
 	},
 	methods: {
 		getItemClasses(item: IActionDropdownItem): Record<string, boolean> {
 			return {
 				[this.$style.itemContainer]: true,
+				[this.$style.disabled]: item.disabled,
 				[this.$style.hasCustomStyling]: item.customClass !== undefined,
 				...(item.customClass !== undefined ? { [item.customClass]: true } : {}),
 			};
@@ -103,46 +133,71 @@ export default defineComponent({
 		onSelect(action: string): void {
 			this.$emit('select', action);
 		},
+		onVisibleChange(open: boolean): void {
+			this.$emit('visibleChange', open);
+		},
 		onButtonBlur(event: FocusEvent): void {
-			const elementDropdown = this.$refs.elementDropdown as InstanceType<ElDropdown>;
+			const elementDropdown = this.$refs.elementDropdown as InstanceType<typeof ElDropdown>;
 
 			// Hide dropdown when clicking outside of current document
 			if (elementDropdown?.handleClose && event.relatedTarget === null) {
 				elementDropdown.handleClose();
 			}
 		},
+		open() {
+			const elementDropdown = this.$refs.elementDropdown as InstanceType<typeof ElDropdown>;
+			elementDropdown.handleOpen();
+		},
+		close() {
+			const elementDropdown = this.$refs.elementDropdown as InstanceType<typeof ElDropdown>;
+			elementDropdown.handleClose();
+		},
 	},
 });
 </script>
 
 <style lang="scss" module>
-.userActionsMenu {
-	min-width: 160px;
+:global(.el-dropdown__list) {
+	.userActionsMenu {
+		min-width: 160px;
+		padding: var(--spacing-4xs) 0;
+	}
+
+	.elementItem {
+		padding: 0;
+	}
+}
+
+:global(.el-popper).hideArrow {
+	:global(.el-popper__arrow) {
+		display: none;
+	}
+}
+
+.shadow {
+	box-shadow: var(--box-shadow-light);
 }
 
 .activator {
-	cursor: pointer;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	width: 30px;
-	height: 30px;
-	margin: 0;
-	border-radius: var(--border-radius-base);
-	line-height: normal !important;
-
-	svg {
-		position: static !important;
-	}
-
 	&:hover {
 		background-color: var(--color-background-base);
-		color: var(--color-primary);
 	}
 }
 
 .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 {
@@ -154,6 +209,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__/__snapshots__/ActionDropdown.spec.ts.snap b/packages/design-system/src/components/N8nActionDropdown/__tests__/__snapshots__/ActionDropdown.spec.ts.snap
index 869a4ed160..e7f1352c52 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,13 +1,13 @@
 // 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\\" effect=\\"light\\" placement=\\"bottom\\" popperoptions=\\"[object Object]\\" size=\\"\\" splitbutton=\\"false\\" hideonclick=\\"true\\" loop=\\"true\\" showtimeout=\\"150\\" hidetimeout=\\"150\\" tabindex=\\"0\\" maxheight=\\"\\" popperclass=\\"\\" disabled=\\"false\\" role=\\"menu\\" teleported=\\"true\\"></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="[object Object]" 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\\" 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=\\"\\" disabled=\\"false\\" role=\\"menu\\" teleported=\\"true\\"></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="[object Object]" disabled="false" role="menu" teleported="true"></el-dropdown-stub>
 </div>"
 `;
diff --git a/packages/design-system/src/components/N8nActionToggle/ActionToggle.vue b/packages/design-system/src/components/N8nActionToggle/ActionToggle.vue
index 29087d9b6a..799f4c09c4 100644
--- a/packages/design-system/src/components/N8nActionToggle/ActionToggle.vue
+++ b/packages/design-system/src/components/N8nActionToggle/ActionToggle.vue
@@ -1,6 +1,6 @@
 <template>
-	<span @click.stop.prevent :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"
@@ -9,7 +9,7 @@
 		>
 			<slot>
 				<span :class="{ [$style.button]: true, [$style[theme]]: !!theme }">
-					<n8n-icon
+					<N8nIcon
 						:icon="iconOrientation === 'horizontal' ? 'ellipsis-h' : 'ellipsis-v'"
 						:size="iconSize"
 					/>
@@ -17,8 +17,8 @@
 			</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"
@@ -27,17 +27,17 @@
 					>
 						{{ 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>
 
@@ -49,7 +49,7 @@ import N8nIcon from '../N8nIcon';
 import type { UserAction } from '@/types';
 
 export default defineComponent({
-	name: 'n8n-action-toggle',
+	name: 'N8nActionToggle',
 	components: {
 		ElDropdown,
 		ElDropdownMenu,
diff --git a/packages/design-system/src/components/N8nAlert/Alert.vue b/packages/design-system/src/components/N8nAlert/Alert.vue
index b48be58892..c2f64a245b 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">
diff --git a/packages/design-system/src/components/N8nAvatar/Avatar.vue b/packages/design-system/src/components/N8nAvatar/Avatar.vue
index 56ff8880e4..5460717d4c 100644
--- a/packages/design-system/src/components/N8nAvatar/Avatar.vue
+++ b/packages/design-system/src/components/N8nAvatar/Avatar.vue
@@ -24,7 +24,10 @@ const sizes: { [size: string]: number } = {
 import { defineComponent } from 'vue';
 
 export default defineComponent({
-	name: 'n8n-avatar',
+	name: 'N8nAvatar',
+	components: {
+		Avatar,
+	},
 	props: {
 		firstName: {
 			type: String,
@@ -48,9 +51,6 @@ export default defineComponent({
 			],
 		},
 	},
-	components: {
-		Avatar,
-	},
 	computed: {
 		initials() {
 			return (
@@ -89,7 +89,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.vue b/packages/design-system/src/components/N8nBadge/Badge.vue
index 7c6aed8b2f..b370b138cb 100644
--- a/packages/design-system/src/components/N8nBadge/Badge.vue
+++ b/packages/design-system/src/components/N8nBadge/Badge.vue
@@ -1,8 +1,8 @@
 <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>
 
@@ -12,6 +12,9 @@ import N8nText from '../N8nText';
 import { defineComponent } from 'vue';
 
 export default defineComponent({
+	components: {
+		N8nText,
+	},
 	props: {
 		theme: {
 			type: String,
@@ -30,9 +33,6 @@ export default defineComponent({
 			default: false,
 		},
 	},
-	components: {
-		N8nText,
-	},
 });
 </script>
 
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 985e4019b9..5bae596523 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, 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></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 bold=\\"false\\" size=\\"medium\\" 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 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 bold=\\"false\\" size=\\"small\\" 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 bold="false" size="small" compact="true" tag="span"></n8n-text-stub></span>"`;
diff --git a/packages/design-system/src/components/N8nBlockUi/BlockUi.vue b/packages/design-system/src/components/N8nBlockUi/BlockUi.vue
index cb117c51e7..a4213c9d7d 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);
diff --git a/packages/design-system/src/components/N8nButton/Button.scss b/packages/design-system/src/components/N8nButton/Button.scss
index 32024e3c7f..7458dc6377 100644
--- a/packages/design-system/src/components/N8nButton/Button.scss
+++ b/packages/design-system/src/components/N8nButton/Button.scss
@@ -26,23 +26,72 @@
 
 	@include utils-user-select(none);
 
-	&:hover {
-		color: $button-hover-color unquote($important);
-		border-color: $button-hover-border-color unquote($important);
-		background-color: $button-hover-background-color unquote($important);
+	// Solution for a inside button
+	& a {
+		color: $button-font-color unquote($important);
 	}
 
-	&:focus {
-		border-color: $button-focus-outline-color unquote($important);
-		outline: $focus-outline-width solid $button-focus-outline-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-color unquote($important);
+		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 {
@@ -65,17 +114,109 @@
 }
 
 @mixin n8n-button-secondary {
-	--button-color: var(--color-primary);
-	--button-border-color: var(--color-primary);
-	--button-background-color: var(--color-background-xlight);
+	--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-active-background-color: var(--color-primary-tint-2);
-	--button-active-color: var(--color-primary);
-	--button-active-border-color: var(--color-primary);
+	--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-hover-background-color: var(--color-primary-tint-3);
-	--button-hover-color: var(--color-primary);
-	--button-hover-border-color: var(--color-primary);
+	--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-outline-color: var(--color-primary-tint-1);
+	--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.vue b/packages/design-system/src/components/N8nButton/Button.vue
index a0bd861e2c..779a7add0f 100644
--- a/packages/design-system/src/components/N8nButton/Button.vue
+++ b/packages/design-system/src/components/N8nButton/Button.vue
@@ -1,26 +1,28 @@
 <template>
-	<button
+	<component
+		:is="element"
 		:class="classes"
 		:disabled="isDisabled"
 		:aria-disabled="ariaDisabled"
 		:aria-busy="ariaBusy"
+		:href="href"
 		aria-live="polite"
 		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 setup lang="ts">
 import N8nIcon from '../N8nIcon';
 import N8nSpinner from '../N8nSpinner';
-import { useCssModule, computed, useAttrs } from 'vue';
+import { useCssModule, computed, useAttrs, watchEffect } from 'vue';
 
 const $style = useCssModule();
 const $attrs = useAttrs();
@@ -72,6 +74,21 @@ const props = defineProps({
 		type: Boolean,
 		default: false,
 	},
+	element: {
+		type: String,
+		default: 'button',
+		validator: (value: string) => ['button', 'a'].includes(value),
+	},
+	href: {
+		type: String,
+		required: false,
+	},
+});
+
+watchEffect(() => {
+	if (props.element === 'a' && !props.href) {
+		console.error('n8n-button:href is required for link buttons');
+	}
 });
 
 const ariaBusy = computed(() => (props.loading ? 'true' : undefined));
@@ -136,84 +153,19 @@ $loading-overlay-background-color: rgba(255, 255, 255, 0);
 }
 
 .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;
 }
 
 /**
@@ -285,85 +237,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 {
@@ -384,7 +349,6 @@ $loading-overlay-background-color: rgba(255, 255, 255, 0);
 		right: -1px;
 		bottom: -1px;
 		border-radius: inherit;
-		background-color: $loading-overlay-background-color;
 	}
 }
 
@@ -395,9 +359,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;
 	}
 }
 
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 162da77b5d..7b23d39ad8 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,17 +1,17 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
-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 > 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 > 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 > 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 class=\\"button button primary medium square\\" aria-live=\\"polite\\">
+"<button class="button button primary medium square" aria-live="polite">
   <!--v-if--><span>48</span>
 </button>"
 `;
 
 exports[`components > N8nButton > should render correctly 1`] = `
-"<button class=\\"button button primary medium\\" aria-live=\\"polite\\">
+"<button class="button button primary medium" aria-live="polite">
   <!--v-if--><span>Button</span>
 </button>"
 `;
diff --git a/packages/design-system/src/components/N8nCallout/Callout.vue b/packages/design-system/src/components/N8nCallout/Callout.vue
index 639380773f..3c93e3bfac 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.messageSection">
-			<div :class="$style.icon" v-if="!iconless">
-				<n8n-icon :icon="getIcon" :size="getIconSize" />
+			<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>
@@ -28,7 +28,7 @@ const CALLOUT_DEFAULT_ICONS: { [key: string]: string } = {
 };
 
 export default defineComponent({
-	name: 'n8n-callout',
+	name: 'N8nCallout',
 	components: {
 		N8nText,
 		N8nIcon,
@@ -93,6 +93,9 @@ export default defineComponent({
 	border: var(--border-width-base) var(--border-style-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);
@@ -111,27 +114,43 @@ export default defineComponent({
 
 .info,
 .custom {
-	border-color: var(--color-foreground-base);
-	background-color: var(--color-foreground-xlight);
-	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 {
@@ -142,8 +161,12 @@ export default defineComponent({
 .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__/__snapshots__/Callout.spec.ts.snap b/packages/design-system/src/components/N8nCallout/__tests__/__snapshots__/Callout.spec.ts.snap
index a2f82a3ef9..0ba2bec217 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,79 +1,79 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`components > N8nCallout > should render additional slots correctly 1`] = `
-"<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 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 bold=\\"false\\" size=\\"small\\" compact=\\"false\\" tag=\\"span\\"></n8n-text-stub> &nbsp; <n8n-link-stub size=\\"small\\"></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\\"></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 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 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 bold=\\"false\\" size=\\"small\\" compact=\\"false\\" tag=\\"span\\"></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 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 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 bold=\\"false\\" size=\\"small\\" compact=\\"false\\" tag=\\"span\\"></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 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 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 bold=\\"false\\" size=\\"small\\" compact=\\"false\\" tag=\\"span\\"></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 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 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 bold=\\"false\\" size=\\"small\\" compact=\\"false\\" tag=\\"span\\"></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 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 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 bold=\\"false\\" size=\\"small\\" compact=\\"false\\" tag=\\"span\\"></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 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 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 bold=\\"false\\" size=\\"small\\" compact=\\"false\\" tag=\\"span\\"></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/N8nCard/Card.vue b/packages/design-system/src/components/N8nCard/Card.vue
index a922f78228..b85fabb105 100644
--- a/packages/design-system/src/components/N8nCard/Card.vue
+++ b/packages/design-system/src/components/N8nCard/Card.vue
@@ -1,16 +1,16 @@
 <template>
 	<div :class="classes" v-bind="$attrs">
-		<div :class="$style.icon" v-if="$slots.prepend">
+		<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>
@@ -24,7 +24,7 @@
 import { defineComponent } from 'vue';
 
 export default defineComponent({
-	name: 'n8n-card',
+	name: 'N8nCard',
 	inheritAttrs: true,
 	props: {
 		hoverable: {
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 05cb131a79..c093867f14 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,11 +1,11 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`components > N8nCard > should render correctly 1`] = `
-"<div class=\\"card\\">
+"<div class="card">
   <!--v-if-->
-  <div class=\\"content\\">
+  <div class="content">
     <!--v-if-->
-    <div class=\\"body\\">This is a card.</div>
+    <div class="body">This is a card.</div>
     <!--v-if-->
   </div>
   <!--v-if-->
@@ -13,12 +13,12 @@ exports[`components > N8nCard > should render correctly 1`] = `
 `;
 
 exports[`components > N8nCard > should render correctly with header and footer 1`] = `
-"<div class=\\"card\\">
+"<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 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.vue b/packages/design-system/src/components/N8nCheckbox/Checkbox.vue
index 0c0f32ee96..186c45669a 100644
--- a/packages/design-system/src/components/N8nCheckbox/Checkbox.vue
+++ b/packages/design-system/src/components/N8nCheckbox/Checkbox.vue
@@ -1,23 +1,23 @@
 <template>
-	<el-checkbox
+	<ElCheckbox
 		v-bind="$props"
 		ref="checkbox"
 		:class="['n8n-checkbox', $style.n8nCheckbox]"
 		:disabled="disabled"
 		:indeterminate="indeterminate"
-		:modelValue="modelValue"
+		:model-value="modelValue"
 		@update:modelValue="onUpdateModelValue"
 	>
 		<slot></slot>
-		<n8n-input-label
+		<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">
@@ -26,7 +26,7 @@ import { ElCheckbox } from 'element-plus';
 import N8nInputLabel from '../N8nInputLabel';
 
 export default defineComponent({
-	name: 'n8n-checkbox',
+	name: 'N8nCheckbox',
 	components: {
 		ElCheckbox,
 		N8nInputLabel,
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
index 1f208ed67d..3cee7831f8 100644
--- 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
@@ -1,8 +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>
+"<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/N8nColorPicker/ColorPicker.vue b/packages/design-system/src/components/N8nColorPicker/ColorPicker.vue
index e6682a8568..712e2ac972 100644
--- a/packages/design-system/src/components/N8nColorPicker/ColorPicker.vue
+++ b/packages/design-system/src/components/N8nColorPicker/ColorPicker.vue
@@ -64,21 +64,21 @@ const onActiveChange = (value: string) => {
 </script>
 <template>
 	<span :class="['n8n-color-picker', $style.component]">
-		<el-color-picker
+		<ElColorPicker
 			v-model="model"
 			v-bind="colorPickerProps"
 			@change="onChange"
 			@active-change="onActiveChange"
 		/>
-		<n8n-input
+		<N8nInput
 			v-if="showInput"
 			:class="$style.input"
 			:disabled="props.disabled"
 			:size="props.size"
-			:modelValue="color"
+			:model-value="color"
 			:name="name"
-			@update:modelValue="onInput"
 			type="text"
+			@update:modelValue="onInput"
 		/>
 	</span>
 </template>
diff --git a/packages/design-system/src/components/N8nDatatable/Datatable.vue b/packages/design-system/src/components/N8nDatatable/Datatable.vue
index b776cc759e..e3d3afbd17 100644
--- a/packages/design-system/src/components/N8nDatatable/Datatable.vue
+++ b/packages/design-system/src/components/N8nDatatable/Datatable.vue
@@ -3,19 +3,18 @@ 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 { useI18n } from '../../composables/useI18n';
 import N8nSelect from '../N8nSelect';
 import N8nOption from '../N8nOption';
 import N8nPagination from '../N8nPagination';
 
 export default defineComponent({
-	name: 'n8n-datatable',
+	name: 'N8nDatatable',
 	components: {
 		N8nSelect,
 		N8nOption,
 		N8nPagination,
 	},
-	emits: ['update:currentPage', 'update:rowsPerPage'],
 	props: {
 		columns: {
 			type: Array as PropType<DatatableColumn[]>,
@@ -38,6 +37,7 @@ export default defineComponent({
 			default: 10,
 		},
 	},
+	emits: ['update:currentPage', 'update:rowsPerPage'],
 	setup(props, { emit }) {
 		const { t } = useI18n();
 		const rowsPerPageOptions = ref([10, 25, 50, 100]);
@@ -130,10 +130,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,33 +143,33 @@ 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"
+				:current-page="currentPage"
 				@update:currentPage="onUpdateCurrentPage"
 			/>
 
 			<div :class="$style.pageSizeSelector">
-				<n8n-select
+				<N8nSelect
 					size="mini"
-					:modelValue="rowsPerPage"
-					@update:modelValue="onRowsPerPageChange"
+					:model-value="rowsPerPage"
 					teleported
+					@update:modelValue="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>
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 6d712ddeec..1670619393 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,103 +1,103 @@
 // 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 class=\\"\\">ID</th>
-        <th class=\\"\\">Name</th>
-        <th class=\\"\\">Age</th>
-        <th class=\\"\\">Action</th>
+        <th class="">ID</th>
+        <th class="">Name</th>
+        <th class="">Age</th>
+        <th class="">Action</th>
       </tr>
     </thead>
     <tbody>
       <tr>
-        <td class=\\"\\"><span>1</span></td>
-        <td class=\\"\\"><span>Richard Hendricks</span></td>
-        <td class=\\"\\"><span>29</span></td>
-        <td class=\\"\\"><button class=\\"button button primary medium\\" aria-live=\\"polite\\" column=\\"[object Object]\\">
+        <td class=""><span>1</span></td>
+        <td class=""><span>Richard Hendricks</span></td>
+        <td class=""><span>29</span></td>
+        <td class=""><button class="button button primary medium" aria-live="polite" column="[object Object]">
             <!--v-if--><span>Button 1</span>
           </button></td>
       </tr>
       <tr>
-        <td class=\\"\\"><span>2</span></td>
-        <td class=\\"\\"><span>Bertram Gilfoyle</span></td>
-        <td class=\\"\\"><span>44</span></td>
-        <td class=\\"\\"><button class=\\"button button primary medium\\" aria-live=\\"polite\\" column=\\"[object Object]\\">
+        <td class=""><span>2</span></td>
+        <td class=""><span>Bertram Gilfoyle</span></td>
+        <td class=""><span>44</span></td>
+        <td class=""><button class="button button primary medium" aria-live="polite" column="[object Object]">
             <!--v-if--><span>Button 2</span>
           </button></td>
       </tr>
       <tr>
-        <td class=\\"\\"><span>3</span></td>
-        <td class=\\"\\"><span>Dinesh Chugtai</span></td>
-        <td class=\\"\\"><span>31</span></td>
-        <td class=\\"\\"><button class=\\"button button primary medium\\" aria-live=\\"polite\\" column=\\"[object Object]\\">
+        <td class=""><span>3</span></td>
+        <td class=""><span>Dinesh Chugtai</span></td>
+        <td class=""><span>31</span></td>
+        <td class=""><button class="button button primary medium" aria-live="polite" column="[object Object]">
             <!--v-if--><span>Button 3</span>
           </button></td>
       </tr>
       <tr>
-        <td class=\\"\\"><span>4</span></td>
-        <td class=\\"\\"><span>Jared Dunn </span></td>
-        <td class=\\"\\"><span>38</span></td>
-        <td class=\\"\\"><button class=\\"button button primary medium\\" aria-live=\\"polite\\" column=\\"[object Object]\\">
+        <td class=""><span>4</span></td>
+        <td class=""><span>Jared Dunn </span></td>
+        <td class=""><span>38</span></td>
+        <td class=""><button class="button button primary medium" aria-live="polite" column="[object Object]">
             <!--v-if--><span>Button 4</span>
           </button></td>
       </tr>
       <tr>
-        <td class=\\"\\"><span>5</span></td>
-        <td class=\\"\\"><span>Richard Hendricks</span></td>
-        <td class=\\"\\"><span>29</span></td>
-        <td class=\\"\\"><button class=\\"button button primary medium\\" aria-live=\\"polite\\" column=\\"[object Object]\\">
+        <td class=""><span>5</span></td>
+        <td class=""><span>Richard Hendricks</span></td>
+        <td class=""><span>29</span></td>
+        <td class=""><button class="button button primary medium" aria-live="polite" column="[object Object]">
             <!--v-if--><span>Button 5</span>
           </button></td>
       </tr>
       <tr>
-        <td class=\\"\\"><span>6</span></td>
-        <td class=\\"\\"><span>Bertram Gilfoyle</span></td>
-        <td class=\\"\\"><span>44</span></td>
-        <td class=\\"\\"><button class=\\"button button primary medium\\" aria-live=\\"polite\\" column=\\"[object Object]\\">
+        <td class=""><span>6</span></td>
+        <td class=""><span>Bertram Gilfoyle</span></td>
+        <td class=""><span>44</span></td>
+        <td class=""><button class="button button primary medium" aria-live="polite" column="[object Object]">
             <!--v-if--><span>Button 6</span>
           </button></td>
       </tr>
       <tr>
-        <td class=\\"\\"><span>7</span></td>
-        <td class=\\"\\"><span>Dinesh Chugtai</span></td>
-        <td class=\\"\\"><span>31</span></td>
-        <td class=\\"\\"><button class=\\"button button primary medium\\" aria-live=\\"polite\\" column=\\"[object Object]\\">
+        <td class=""><span>7</span></td>
+        <td class=""><span>Dinesh Chugtai</span></td>
+        <td class=""><span>31</span></td>
+        <td class=""><button class="button button primary medium" aria-live="polite" column="[object Object]">
             <!--v-if--><span>Button 7</span>
           </button></td>
       </tr>
       <tr>
-        <td class=\\"\\"><span>8</span></td>
-        <td class=\\"\\"><span>Jared Dunn </span></td>
-        <td class=\\"\\"><span>38</span></td>
-        <td class=\\"\\"><button class=\\"button button primary medium\\" aria-live=\\"polite\\" column=\\"[object Object]\\">
+        <td class=""><span>8</span></td>
+        <td class=""><span>Jared Dunn </span></td>
+        <td class=""><span>38</span></td>
+        <td class=""><button class="button button primary medium" aria-live="polite" column="[object Object]">
             <!--v-if--><span>Button 8</span>
           </button></td>
       </tr>
       <tr>
-        <td class=\\"\\"><span>9</span></td>
-        <td class=\\"\\"><span>Richard Hendricks</span></td>
-        <td class=\\"\\"><span>29</span></td>
-        <td class=\\"\\"><button class=\\"button button primary medium\\" aria-live=\\"polite\\" column=\\"[object Object]\\">
+        <td class=""><span>9</span></td>
+        <td class=""><span>Richard Hendricks</span></td>
+        <td class=""><span>29</span></td>
+        <td class=""><button class="button button primary medium" aria-live="polite" column="[object Object]">
             <!--v-if--><span>Button 9</span>
           </button></td>
       </tr>
       <tr>
-        <td class=\\"\\"><span>10</span></td>
-        <td class=\\"\\"><span>Bertram Gilfoyle</span></td>
-        <td class=\\"\\"><span>44</span></td>
-        <td class=\\"\\"><button class=\\"button button primary medium\\" aria-live=\\"polite\\" column=\\"[object Object]\\">
+        <td class=""><span>10</span></td>
+        <td class=""><span>Bertram Gilfoyle</span></td>
+        <td class=""><span>44</span></td>
+        <td class=""><button class="button button primary medium" aria-live="polite" column="[object Object]">
             <!--v-if--><span>Button 10</span>
           </button></td>
       </tr>
     </tbody>
   </table>
-  <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 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 a9b2c5aa7e..508e225b0d 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.vue b/packages/design-system/src/components/N8nFormBox/FormBox.vue
index 3098d53eee..f36a2dee0e 100644
--- a/packages/design-system/src/components/N8nFormBox/FormBox.vue
+++ b/packages/design-system/src/components/N8nFormBox/FormBox.vue
@@ -1,37 +1,38 @@
 <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"
+				:event-bus="formBus"
+				:column-view="true"
 				@update="onUpdateModelValue"
 				@submit="onSubmit"
 			/>
 		</div>
-		<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>
@@ -46,7 +47,7 @@ import N8nButton from '../N8nButton';
 import { createEventBus } from '../../utils';
 
 export default defineComponent({
-	name: 'n8n-form-box',
+	name: 'N8nFormBox',
 	components: {
 		N8nHeading,
 		N8nFormInputs,
diff --git a/packages/design-system/src/components/N8nFormInput/FormInput.vue b/packages/design-system/src/components/N8nFormInput/FormInput.vue
index 19701c13d0..89bf61b57b 100644
--- a/packages/design-system/src/components/N8nFormInput/FormInput.vue
+++ b/packages/design-system/src/components/N8nFormInput/FormInput.vue
@@ -1,90 +1,91 @@
 <template>
-	<n8n-checkbox
+	<N8nCheckbox
 		v-if="type === 'checkbox'"
 		v-bind="$props"
+		ref="inputRef"
 		@update:modelValue="onUpdateModelValue"
 		@focus="onFocus"
-		ref="inputRef"
 	/>
-	<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
-			:modelValue="modelValue"
+		<ElSwitch
+			:model-value="modelValue"
 			:active-color="activeColor"
 			:inactive-color="inactiveColor"
 			@update:modelValue="onUpdateModelValue"
-		></el-switch>
-	</n8n-input-label>
-	<n8n-input-label
+		></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
-				:class="{ [$style.multiSelectSmallTags]: tagSize === 'small' }"
+			<N8nSelect
 				v-else-if="type === 'select' || type === 'multi-select'"
-				:modelValue="modelValue"
+				:class="{ [$style.multiSelectSmallTags]: tagSize === 'small' }"
+				:model-value="modelValue"
 				:placeholder="placeholder"
 				:multiple="type === 'multi-select'"
+				ref="inputRef"
 				:disabled="disabled"
+				:name="name"
+				:teleported="teleported"
 				@update:modelValue="onUpdateModelValue"
 				@focus="onFocus"
 				@blur="onBlur"
-				:name="name"
-				:teleported="teleported"
-				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
 				:name="name"
+				ref="inputRef"
 				:type="type"
 				:placeholder="placeholder"
-				:modelValue="modelValue"
+				:model-value="modelValue"
 				:maxlength="maxlength"
 				:autocomplete="autocomplete"
 				:disabled="disabled"
 				@update:modelValue="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>
@@ -118,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;
diff --git a/packages/design-system/src/components/N8nFormInputs/FormInputs.vue b/packages/design-system/src/components/N8nFormInputs/FormInputs.vue
index 2f41b59008..14c3c8927b 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,16 +17,16 @@
 					>
 						{{ input.properties.label }}
 					</n8n-text>
-					<n8n-form-input
+					<N8nFormInput
 						v-else
 						v-bind="input.properties"
 						:name="input.name"
 						:label="input.properties.label || ''"
-						:modelValue="values[input.name]"
+						:model-value="values[input.name]"
 						:data-test-id="input.name"
-						:showValidationWarnings="showValidationWarnings"
+						:show-validation-warnings="showValidationWarnings"
 						:teleported="teleported"
-						:tagSize="tagSize"
+						:tag-size="tagSize"
 						@update:modelValue="(value) => onUpdateModelValue(input.name, value)"
 						@validate="(value) => onValidate(input.name, value)"
 						@enter="onSubmit"
@@ -47,7 +47,7 @@ import type { EventBus } from '../../utils';
 import { createEventBus } from '../../utils';
 
 export default defineComponent({
-	name: 'n8n-form-inputs',
+	name: 'N8nFormInputs',
 	components: {
 		N8nFormInput,
 		ResizeObserver,
@@ -87,20 +87,6 @@ export default defineComponent({
 			validity: {} as { [key: string]: boolean },
 		};
 	},
-	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());
-		}
-	},
 	computed: {
 		filteredInputs(): IFormInput[] {
 			return this.inputs.filter((input) =>
@@ -117,6 +103,25 @@ 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: {
 		onUpdateModelValue(name: string, value: unknown) {
 			this.values = {
@@ -124,6 +129,7 @@ export default defineComponent({
 				[name]: value,
 			};
 			this.$emit('update', { name, value });
+			this.$emit('update:modelValue', this.values);
 		},
 		onValidate(name: string, valid: boolean) {
 			this.validity = {
@@ -145,11 +151,6 @@ export default defineComponent({
 			}
 		},
 	},
-	watch: {
-		isReadyToSubmit(ready: boolean) {
-			this.$emit('ready', ready);
-		},
-	},
 });
 </script>
 
diff --git a/packages/design-system/src/components/N8nHeading/Heading.vue b/packages/design-system/src/components/N8nHeading/Heading.vue
index 24ad2c2a09..5a4a0c2783 100644
--- a/packages/design-system/src/components/N8nHeading/Heading.vue
+++ b/packages/design-system/src/components/N8nHeading/Heading.vue
@@ -8,7 +8,7 @@
 import { defineComponent } from 'vue';
 
 export default defineComponent({
-	name: 'n8n-heading',
+	name: 'N8nHeading',
 	props: {
 		tag: {
 			type: String,
diff --git a/packages/design-system/src/components/N8nIcon/Icon.vue b/packages/design-system/src/components/N8nIcon/Icon.vue
index 9b2d2204f3..07224f7d80 100644
--- a/packages/design-system/src/components/N8nIcon/Icon.vue
+++ b/packages/design-system/src/components/N8nIcon/Icon.vue
@@ -1,7 +1,7 @@
 <template>
-	<n8n-text :size="size" :color="color" :compact="true" class="n8n-icon" v-bind="$attrs">
-		<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">
@@ -11,7 +11,7 @@ import N8nText from '../N8nText';
 import { defineComponent } from 'vue';
 
 export default defineComponent({
-	name: 'n8n-icon',
+	name: 'N8nIcon',
 	components: {
 		FontAwesomeIcon,
 		N8nText,
diff --git a/packages/design-system/src/components/N8nIconButton/IconButton.vue b/packages/design-system/src/components/N8nIconButton/IconButton.vue
index 249ee4ff0f..7d2798a4e7 100644
--- a/packages/design-system/src/components/N8nIconButton/IconButton.vue
+++ b/packages/design-system/src/components/N8nIconButton/IconButton.vue
@@ -1,5 +1,5 @@
 <template>
-	<n8n-button square v-bind="{ ...$attrs, ...$props }" />
+	<N8nButton square v-bind="{ ...$attrs, ...$props }" />
 </template>
 
 <script lang="ts">
@@ -8,7 +8,7 @@ import N8nButton from '../N8nButton';
 import { defineComponent } from 'vue';
 
 export default defineComponent({
-	name: 'n8n-icon-button',
+	name: 'N8nIconButton',
 	components: {
 		N8nButton,
 	},
diff --git a/packages/design-system/src/components/N8nInfoAccordion/InfoAccordion.vue b/packages/design-system/src/components/N8nInfoAccordion/InfoAccordion.vue
index ee3b292d5a..740ad5ef2f 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,16 +23,16 @@
 				<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>
@@ -55,7 +55,7 @@ export interface IAccordionItem {
 }
 
 export default defineComponent({
-	name: 'n8n-info-accordion',
+	name: 'N8nInfoAccordion',
 	components: {
 		N8nText,
 		N8nIcon,
@@ -84,17 +84,17 @@ export default defineComponent({
 			default: () => createEventBus(),
 		},
 	},
+	data() {
+		return {
+			expanded: false,
+		};
+	},
 	mounted() {
 		this.eventBus.on('expand', () => {
 			this.expanded = true;
 		});
 		this.expanded = this.initiallyExpanded;
 	},
-	data() {
-		return {
-			expanded: false,
-		};
-	},
 	methods: {
 		toggle() {
 			this.expanded = !this.expanded;
diff --git a/packages/design-system/src/components/N8nInfoTip/InfoTip.vue b/packages/design-system/src/components/N8nInfoTip/InfoTip.vue
index 7a81cbb0fd..c69a6959f3 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>
@@ -38,7 +39,7 @@ import N8nTooltip from '../N8nTooltip';
 import { defineComponent } from 'vue';
 
 export default defineComponent({
-	name: 'n8n-info-tip',
+	name: 'N8nInfoTip',
 	components: {
 		N8nIcon,
 		N8nTooltip,
@@ -48,7 +49,7 @@ export default defineComponent({
 			type: String,
 			default: 'info',
 			validator: (value: string): boolean =>
-				['info', 'info-light', 'warning', 'danger'].includes(value),
+				['info', 'info-light', 'warning', 'danger', 'success'].includes(value),
 		},
 		type: {
 			type: String,
@@ -64,10 +65,50 @@ export default defineComponent({
 			default: 'top',
 		},
 	},
+	computed: {
+		iconData(): { icon: string; color: string } {
+			switch (this.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 +133,7 @@ export default defineComponent({
 	}
 }
 
-.tooltip {
+.tooltipPopper {
 	composes: base;
 	display: inline-flex;
 }
@@ -101,20 +142,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__/__snapshots__/InfoTip.spec.ts.snap b/packages/design-system/src/components/N8nInfoTip/__tests__/__snapshots__/InfoTip.spec.ts.snap
index b4d194cdab..3a49e215d5 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, 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-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 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 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 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.vue b/packages/design-system/src/components/N8nInput/Input.vue
index efe1f7b3e1..6b2d140ce6 100644
--- a/packages/design-system/src/components/N8nInput/Input.vue
+++ b/packages/design-system/src/components/N8nInput/Input.vue
@@ -1,25 +1,25 @@
 <template>
-	<el-input
+	<ElInput
+		ref="innerInput"
 		:size="computedSize"
 		:class="['n8n-input', ...classes]"
-		:autoComplete="autocomplete"
+		:autocomplete="autocomplete"
 		:name="name"
-		ref="innerInput"
 		v-bind="{ ...$props, ...$attrs }"
 	>
-		<template #prepend v-if="$slots.prepend">
+		<template v-if="$slots.prepend" #prepend>
 			<slot name="prepend" />
 		</template>
-		<template #append v-if="$slots.append">
+		<template v-if="$slots.append" #append>
 			<slot name="append" />
 		</template>
-		<template #prefix v-if="$slots.prefix">
+		<template v-if="$slots.prefix" #prefix>
 			<slot name="prefix" />
 		</template>
-		<template #suffix v-if="$slots.suffix">
+		<template v-if="$slots.suffix" #suffix>
 			<slot name="suffix" />
 		</template>
-	</el-input>
+	</ElInput>
 </template>
 
 <script lang="ts">
@@ -31,7 +31,7 @@ import { uid } from '../../utils';
 type InputRef = InstanceType<typeof ElInput>;
 
 export default defineComponent({
-	name: 'n8n-input',
+	name: 'N8nInput',
 	components: {
 		ElInput,
 	},
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 d0ad14e3fb..c31cd8185e 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,13 +1,13 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`N8nInput > should render correctly 1`] = `
-"<div class=\\"el-input el-input--large n8n-input\\">
+"<div class="el-input el-input--large n8n-input">
   <!-- input -->
   <!-- prepend slot -->
   <!--v-if-->
-  <div class=\\"el-input__wrapper\\">
+  <div class="el-input__wrapper">
     <!-- prefix slot -->
-    <!--v-if--><input class=\\"el-input__inner\\" autocomplete=\\"off\\" name=\\"input\\" rows=\\"2\\" maxlength=\\"Infinity\\" title=\\"\\" type=\\"text\\" tabindex=\\"0\\" placeholder=\\"\\"><!-- suffix 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-->
diff --git a/packages/design-system/src/components/N8nInputLabel/InputLabel.vue b/packages/design-system/src/components/N8nInputLabel/InputLabel.vue
index f029f16722..3445ba29fc 100644
--- a/packages/design-system/src/components/N8nInputLabel/InputLabel.vue
+++ b/packages/design-system/src/components/N8nInputLabel/InputLabel.vue
@@ -12,22 +12,22 @@
 				[$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"
@@ -55,7 +55,7 @@ import { addTargetBlank } from '../utils/helpers';
 import { defineComponent } from 'vue';
 
 export default defineComponent({
-	name: 'n8n-input-label',
+	name: 'N8nInputLabel',
 	components: {
 		N8nText,
 		N8nIcon,
@@ -190,21 +190,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.vue b/packages/design-system/src/components/N8nInputNumber/InputNumber.vue
index 4c1b3bd60a..fa659ab598 100644
--- a/packages/design-system/src/components/N8nInputNumber/InputNumber.vue
+++ b/packages/design-system/src/components/N8nInputNumber/InputNumber.vue
@@ -4,15 +4,15 @@ import { defineComponent } from 'vue';
 
 export default defineComponent({
 	name: 'N8nInputNumber',
-	props: {
-		...ElInputNumber.props,
-	},
 	components: {
 		ElInputNumber,
 	},
+	props: {
+		...ElInputNumber.props,
+	},
 });
 </script>
 
 <template>
-	<el-input-number v-bind="{ ...$props, ...$attrs }" />
+	<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 0000000000..d45f1a0a09
--- /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 0000000000..5ca8d64b8a
--- /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 0000000000..f8f4107231
--- /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.vue b/packages/design-system/src/components/N8nLink/Link.vue
index 998fd63190..84989f9e79 100644
--- a/packages/design-system/src/components/N8nLink/Link.vue
+++ b/packages/design-system/src/components/N8nLink/Link.vue
@@ -1,11 +1,11 @@
 <template>
-	<n8n-route :to="to" :newWindow="newWindow" v-bind="$attrs" 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">
@@ -14,7 +14,11 @@ import N8nText from '../N8nText';
 import N8nRoute from '../N8nRoute';
 
 export default defineComponent({
-	name: 'n8n-link',
+	name: 'N8nLink',
+	components: {
+		N8nText,
+		N8nRoute,
+	},
 	props: {
 		size: {
 			type: String,
@@ -41,21 +45,18 @@ export default defineComponent({
 				['primary', 'danger', 'text', 'secondary'].includes(value),
 		},
 	},
-	components: {
-		N8nText,
-		N8nRoute,
-	},
 });
 </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 +64,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 +76,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.vue b/packages/design-system/src/components/N8nLoading/Loading.vue
index 29b62cba92..843a6d05ac 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,15 +24,15 @@
 						[$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 />
+			<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">
@@ -40,7 +40,7 @@ import { ElSkeleton, ElSkeletonItem } from 'element-plus';
 import { defineComponent } from 'vue';
 
 export default defineComponent({
-	name: 'n8n-loading',
+	name: 'N8nLoading',
 	components: {
 		ElSkeleton,
 		ElSkeletonItem,
diff --git a/packages/design-system/src/components/N8nMarkdown/Markdown.vue b/packages/design-system/src/components/N8nMarkdown/Markdown.vue
index 09be174724..8d2363bc5b 100644
--- a/packages/design-system/src/components/N8nMarkdown/Markdown.vue
+++ b/packages/design-system/src/components/N8nMarkdown/Markdown.vue
@@ -4,12 +4,12 @@
 			v-if="!loading"
 			ref="editor"
 			: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" />
+				<N8nLoading :loading="loading" :rows="loadingRows" animated variant="p" />
 				<div :class="$style.spacer" />
 			</div>
 		</div>
@@ -62,10 +62,10 @@ export interface Options {
 }
 
 export default defineComponent({
+	name: 'N8nMarkdown',
 	components: {
 		N8nLoading,
 	},
-	name: 'n8n-markdown',
 	props: {
 		content: {
 			type: String,
@@ -141,7 +141,8 @@ export default defineComponent({
 					if (tag === 'img' && name === 'src') {
 						if (value.match(fileIdRegex)) {
 							const id = value.split('fileId:')[1];
-							return `src=${friendlyAttrValue(imageUrls[id])}` || '';
+							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;
@@ -246,10 +247,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);
 	}
 
@@ -261,7 +259,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,
@@ -308,15 +315,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 {
@@ -327,6 +334,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.vue b/packages/design-system/src/components/N8nMenu/Menu.vue
index b5ed60260a..36e7dfbc98 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,33 +15,33 @@
 				<div v-if="$slots.menuPrefix" :class="$style.menuPrefix">
 					<slot name="menuPrefix"></slot>
 				</div>
-				<el-menu :defaultActive="defaultActive" :collapse="collapsed">
-					<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"
+						:active-tab="activeTab"
 						:handle-select="onSelect"
 					/>
-				</el-menu>
+				</ElMenu>
 			</div>
 			<div :class="[$style.lowerContent, 'pb-2xs']">
 				<slot name="beforeLowerMenu"></slot>
-				<el-menu :defaultActive="defaultActive" :collapse="collapsed">
-					<n8n-menu-item
+				<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"
+						:active-tab="activeTab"
 						:handle-select="onSelect"
 					/>
-				</el-menu>
+				</ElMenu>
 				<div v-if="$slots.menuSuffix" :class="$style.menuSuffix">
 					<slot name="menuSuffix"></slot>
 				</div>
@@ -60,16 +61,11 @@ import { defineComponent } from 'vue';
 import type { IMenuItem, RouteObject } from '../../types';
 
 export default defineComponent({
-	name: 'n8n-menu',
+	name: 'N8nMenu',
 	components: {
 		ElMenu,
 		N8nMenuItem,
 	},
-	data() {
-		return {
-			activeTab: this.value,
-		};
-	},
 	props: {
 		type: {
 			type: String,
@@ -83,6 +79,10 @@ export default defineComponent({
 			type: Boolean,
 			default: false,
 		},
+		transparentBackground: {
+			type: Boolean,
+			default: false,
+		},
 		mode: {
 			type: String,
 			default: 'router',
@@ -101,22 +101,10 @@ export default defineComponent({
 			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('update:modelValue', this.activeTab);
+	data() {
+		return {
+			activeTab: this.value,
+		};
 	},
 	computed: {
 		upperMenuItems(): IMenuItem[] {
@@ -138,6 +126,23 @@ export default defineComponent({
 			);
 		},
 	},
+	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('update:modelValue', this.activeTab);
+	},
 	methods: {
 		onSelect(item: IMenuItem): void {
 			if (item && item.type === 'link' && item.properties) {
@@ -202,4 +207,8 @@ export default defineComponent({
 		display: none !important;
 	}
 }
+
+.transparentBackground {
+	background-color: transparent;
+}
 </style>
diff --git a/packages/design-system/src/components/N8nMenuItem/MenuItem.vue b/packages/design-system/src/components/N8nMenuItem/MenuItem.vue
index 2e9cfe8581..290b363b3d 100644
--- a/packages/design-system/src/components/N8nMenuItem/MenuItem.vue
+++ b/packages/design-system/src/components/N8nMenuItem/MenuItem.vue
@@ -1,6 +1,6 @@
 <template>
 	<div :class="['n8n-menu-item', $style.item]">
-		<el-sub-menu
+		<ElSubMenu
 			v-if="item.children?.length"
 			:id="item.id"
 			:class="{
@@ -13,7 +13,7 @@
 			:popper-class="submenuPopperClass"
 		>
 			<template #title>
-				<n8n-icon
+				<N8nIcon
 					v-if="item.icon"
 					:class="$style.icon"
 					:icon="item.icon"
@@ -26,21 +26,21 @@
 				:key="child.id"
 				:item="child"
 				:compact="false"
-				:tooltipDelay="tooltipDelay"
-				:popperClass="popperClass"
+				:tooltip-delay="tooltipDelay"
+				:popper-class="popperClass"
 				:mode="mode"
-				:activeTab="activeTab"
+				:active-tab="activeTab"
 				:handle-select="handleSelect"
 			/>
-		</el-sub-menu>
-		<n8n-tooltip
+		</ElSubMenu>
+		<N8nTooltip
 			v-else
 			placement="right"
 			:content="item.label"
 			:disabled="!compact"
 			:show-after="tooltipDelay"
 		>
-			<el-menu-item
+			<ElMenuItem
 				:id="item.id"
 				:class="{
 					[$style.menuItem]: true,
@@ -53,14 +53,14 @@
 				:index="item.id"
 				@click="handleSelect(item)"
 			>
-				<n8n-icon
+				<N8nIcon
 					v-if="item.icon"
 					:class="$style.icon"
 					:icon="item.icon"
 					:size="item.customIconSize || 'large'"
 				/>
 				<span :class="$style.label">{{ item.label }}</span>
-				<n8n-tooltip
+				<N8nTooltip
 					v-if="item.secondaryIcon"
 					:class="$style.secondaryIcon"
 					:placement="item.secondaryIcon?.tooltip?.placement || 'right'"
@@ -68,10 +68,10 @@
 					:disabled="compact || !item.secondaryIcon?.tooltip?.content"
 					:show-after="tooltipDelay"
 				>
-					<n8n-icon :icon="item.secondaryIcon.name" :size="item.secondaryIcon.size || 'small'" />
-				</n8n-tooltip>
-			</el-menu-item>
-		</n8n-tooltip>
+					<N8nIcon :icon="item.secondaryIcon.name" :size="item.secondaryIcon.size || 'small'" />
+				</N8nTooltip>
+			</ElMenuItem>
+		</N8nTooltip>
 	</div>
 </template>
 
@@ -84,7 +84,7 @@ import { defineComponent } from 'vue';
 import type { IMenuItem, RouteObject } from '../../types';
 
 export default defineComponent({
-	name: 'n8n-menu-item',
+	name: 'N8nMenuItem',
 	components: {
 		ElSubMenu,
 		ElMenuItem,
diff --git a/packages/design-system/src/components/N8nNodeCreatorNode/NodeCreatorNode.vue b/packages/design-system/src/components/N8nNodeCreatorNode/NodeCreatorNode.vue
index cb7e4a0dfe..da24b0ff5b 100644
--- a/packages/design-system/src/components/N8nNodeCreatorNode/NodeCreatorNode.vue
+++ b/packages/design-system/src/components/N8nNodeCreatorNode/NodeCreatorNode.vue
@@ -1,13 +1,15 @@
 <script setup lang="ts">
-import { useI18n } from '@/composables';
+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;
 }
@@ -34,15 +36,18 @@ const i18n = useI18n();
 		</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"
+				<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="i18n.baseText('nodeCreator.nodeItem.triggerIconTitle')"
 					:class="$style.triggerIcon"
 				/>
-				<n8n-tooltip
+				<N8nTooltip
 					v-if="!!$slots.tooltip"
 					placement="top"
 					data-test-id="node-creator-item-tooltip"
@@ -51,13 +56,18 @@ const i18n = useI18n();
 						<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>
@@ -77,7 +87,9 @@ const i18n = useI18n();
 .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;
diff --git a/packages/design-system/src/components/N8nNodeIcon/NodeIcon.stories.ts b/packages/design-system/src/components/N8nNodeIcon/NodeIcon.stories.ts
index 75a7d18496..2d5f085e95 100644
--- a/packages/design-system/src/components/N8nNodeIcon/NodeIcon.stories.ts
+++ b/packages/design-system/src/components/N8nNodeIcon/NodeIcon.stories.ts
@@ -38,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 43a82e334a..db7a4a3729 100644
--- a/packages/design-system/src/components/N8nNodeIcon/NodeIcon.vue
+++ b/packages/design-system/src/components/N8nNodeIcon/NodeIcon.vue
@@ -9,25 +9,26 @@
 			:style="iconStyleData"
 		>
 			<!-- 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" :class="$style.iconFa" :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>
@@ -35,12 +36,12 @@
 </template>
 
 <script lang="ts">
-import { defineComponent } from 'vue';
-import N8nTooltip from '../N8nTooltip';
 import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome';
+import { defineComponent, type PropType } from 'vue';
+import N8nTooltip from '../N8nTooltip';
 
 export default defineComponent({
-	name: 'n8n-node-icon',
+	name: 'N8nNodeIcon',
 	components: {
 		N8nTooltip,
 		FontAwesomeIcon,
@@ -75,6 +76,11 @@ export default defineComponent({
 		showTooltip: {
 			type: Boolean,
 		},
+		tooltipPosition: {
+			type: String,
+			default: 'top',
+		},
+		badge: { type: Object as PropType<{ src: string; type: string }> },
 	},
 	computed: {
 		iconStyleData(): Record<string, string> {
@@ -92,6 +98,25 @@ export default defineComponent({
 				'line-height': `${this.size}px`,
 			};
 		},
+		badgeSize(): number {
+			switch (this.size) {
+				case 40:
+					return 18;
+				case 24:
+					return 10;
+				case 18:
+				default:
+					return 8;
+			}
+		},
+		badgeStyleData(): Record<string, string> {
+			const size = this.badgeSize;
+			return {
+				padding: `${Math.floor(size / 4)}px`,
+				right: `-${Math.floor(size / 2)}px`,
+				bottom: `-${Math.floor(size / 2)}px`,
+			};
+		},
 		fontStyleData(): Record<string, string> {
 			if (!this.size) {
 				return {};
@@ -113,7 +138,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;
@@ -125,6 +149,7 @@ export default defineComponent({
 	display: flex;
 	justify-content: center;
 	align-items: center;
+	position: relative;
 
 	svg {
 		max-width: 100%;
@@ -145,6 +170,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.vue b/packages/design-system/src/components/N8nNotice/Notice.vue
index 105280a103..7cb20334f2 100644
--- a/packages/design-system/src/components/N8nNotice/Notice.vue
+++ b/packages/design-system/src/components/N8nNotice/Notice.vue
@@ -1,16 +1,16 @@
 <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)"
 					/>
 				</slot>
-			</n8n-text>
+			</N8nText>
 		</div>
 	</div>
 </template>
@@ -23,8 +23,11 @@ import Locale from '../../mixins/locale';
 import { uid } from '../../utils';
 
 export default defineComponent({
-	name: 'n8n-notice',
+	name: 'N8nNotice',
 	directives: {},
+	components: {
+		N8nText,
+	},
 	mixins: [Locale],
 	props: {
 		id: {
@@ -44,9 +47,6 @@ export default defineComponent({
 			default: '',
 		},
 	},
-	components: {
-		N8nText,
-	},
 	data() {
 		return {
 			showFullContent: false,
@@ -66,7 +66,16 @@ export default defineComponent({
 		},
 		sanitizeHtml(text: string): string {
 			return sanitizeHtml(text, {
-				allowedAttributes: { a: ['data-key', 'href', 'target'] },
+				allowedAttributes: {
+					a: [
+						'data-key',
+						'href',
+						'target',
+						'data-action',
+						'data-action-parameter-connectiontype',
+						'data-action-parameter-creatorview',
+					],
+				},
 			});
 		},
 		onClick(event: MouseEvent) {
@@ -95,7 +104,7 @@ export default defineComponent({
 .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 +120,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__/__snapshots__/Notice.spec.ts.snap b/packages/design-system/src/components/N8nNotice/__tests__/__snapshots__/Notice.spec.ts.snap
index 461fcac742..4a15f3a480 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,31 +1,31 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`components > N8nNotice > props > content > should render HTML 1`] = `
-"<div id=\\"notice\\" class=\\"notice notice warning\\" role=\\"alert\\">
-  <div class=\\"notice-content\\"><span class=\\"n8n-text compact size-small regular\\"><span class=\\"truncated\\" id=\\"notice-content\\" role=\\"region\\"><strong>Hello world!</strong> This is a notice.</span></span></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\\" 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 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\\" 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 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\\" 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 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 de11bf11e3..6dd193b341 100644
--- a/packages/design-system/src/components/N8nOption/Option.vue
+++ b/packages/design-system/src/components/N8nOption/Option.vue
@@ -3,15 +3,15 @@ import { ElOption } from 'element-plus';
 import { defineComponent } from 'vue';
 
 export default defineComponent({
-	props: {
-		...ElOption.props,
-	},
 	components: {
 		ElOption,
 	},
+	props: {
+		...ElOption.props,
+	},
 });
 </script>
 
 <template>
-	<el-option v-bind="{ ...$props, ...$attrs }"><slot /></el-option>
+	<ElOption v-bind="{ ...$props, ...$attrs }"><slot /></ElOption>
 </template>
diff --git a/packages/design-system/src/components/N8nPagination/Pagination.vue b/packages/design-system/src/components/N8nPagination/Pagination.vue
index 7394a4eb31..6a50bee508 100644
--- a/packages/design-system/src/components/N8nPagination/Pagination.vue
+++ b/packages/design-system/src/components/N8nPagination/Pagination.vue
@@ -3,17 +3,17 @@ import { defineComponent } from 'vue';
 import { ElPagination } from 'element-plus';
 
 export default defineComponent({
-	props: {
-		...ElPagination.props,
-	},
 	components: {
 		ElPagination,
 	},
+	props: {
+		...ElPagination.props,
+	},
 });
 </script>
 
 <template>
-	<el-pagination
+	<ElPagination
 		class="is-background"
 		layout="prev, pager, next"
 		v-bind="{ ...$props, ...$attrs }"
diff --git a/packages/design-system/src/components/N8nPopover/Popover.vue b/packages/design-system/src/components/N8nPopover/Popover.vue
index c853e7ab80..533d42fbf4 100644
--- a/packages/design-system/src/components/N8nPopover/Popover.vue
+++ b/packages/design-system/src/components/N8nPopover/Popover.vue
@@ -4,22 +4,22 @@ import { defineComponent } from 'vue';
 
 export default defineComponent({
 	name: 'N8nPopover',
-	props: {
-		...ElPopover.props,
-	},
 	components: {
 		ElPopover,
 	},
+	props: {
+		...ElPopover.props,
+	},
 });
 </script>
 
 <template>
 	<span>
-		<el-popover v-bind="{ ...$props, ...$attrs }">
+		<ElPopover v-bind="{ ...$props, ...$attrs }">
 			<template #reference>
 				<slot name="reference" />
 			</template>
 			<slot />
-		</el-popover>
+		</ElPopover>
 	</span>
 </template>
diff --git a/packages/design-system/src/components/N8nPulse/Pulse.vue b/packages/design-system/src/components/N8nPulse/Pulse.vue
index 3e3f2daf2e..625c538d93 100644
--- a/packages/design-system/src/components/N8nPulse/Pulse.vue
+++ b/packages/design-system/src/components/N8nPulse/Pulse.vue
@@ -12,7 +12,7 @@
 import { defineComponent } from 'vue';
 
 export default defineComponent({
-	name: 'n8n-pulse',
+	name: 'N8nPulse',
 });
 </script>
 
diff --git a/packages/design-system/src/components/N8nRadioButtons/RadioButton.vue b/packages/design-system/src/components/N8nRadioButtons/RadioButton.vue
index 8d4ea4fca8..0ebe128de4 100644
--- a/packages/design-system/src/components/N8nRadioButtons/RadioButton.vue
+++ b/packages/design-system/src/components/N8nRadioButtons/RadioButton.vue
@@ -27,7 +27,7 @@
 import { defineComponent } from 'vue';
 
 export default defineComponent({
-	name: 'n8n-radio-button',
+	name: 'N8nRadioButton',
 	props: {
 		label: {
 			type: String,
diff --git a/packages/design-system/src/components/N8nRadioButtons/RadioButtons.vue b/packages/design-system/src/components/N8nRadioButtons/RadioButtons.vue
index 4ff7d63e91..b4cdb732b5 100644
--- a/packages/design-system/src/components/N8nRadioButtons/RadioButtons.vue
+++ b/packages/design-system/src/components/N8nRadioButtons/RadioButtons.vue
@@ -28,7 +28,10 @@ export interface RadioOption {
 }
 
 export default defineComponent({
-	name: 'n8n-radio-buttons',
+	name: 'N8nRadioButtons',
+	components: {
+		RadioButton,
+	},
 	props: {
 		modelValue: {
 			type: String,
@@ -44,9 +47,6 @@ export default defineComponent({
 			type: Boolean,
 		},
 	},
-	components: {
-		RadioButton,
-	},
 	methods: {
 		onClick(option: { label: string; value: string; disabled?: boolean }) {
 			if (this.disabled || option.disabled) {
diff --git a/packages/design-system/src/components/N8nRecycleScroller/RecycleScroller.vue b/packages/design-system/src/components/N8nRecycleScroller/RecycleScroller.vue
index abd34dae17..ee5a50c4c3 100644
--- a/packages/design-system/src/components/N8nRecycleScroller/RecycleScroller.vue
+++ b/packages/design-system/src/components/N8nRecycleScroller/RecycleScroller.vue
@@ -5,7 +5,7 @@ import type { PropType, ComponentPublicInstance } from 'vue';
 import { computed, defineComponent, onMounted, onBeforeMount, ref, nextTick, watch } from 'vue';
 
 export default defineComponent({
-	name: 'n8n-recycle-scroller',
+	name: 'N8nRecycleScroller',
 	props: {
 		itemSize: {
 			type: Number,
@@ -223,19 +223,22 @@ export default defineComponent({
 </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"
 					: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 +266,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__/__snapshots__/RecycleScroller.spec.ts.snap b/packages/design-system/src/components/N8nRecycleScroller/__tests__/__snapshots__/RecycleScroller.spec.ts.snap
index 09da3dec0c..661ee68ca6 100644
--- 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
@@ -1,13 +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 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.vue b/packages/design-system/src/components/N8nResizeWrapper/ResizeWrapper.vue
index d9259431da..0cf4c941fb 100644
--- a/packages/design-system/src/components/N8nResizeWrapper/ResizeWrapper.vue
+++ b/packages/design-system/src/components/N8nResizeWrapper/ResizeWrapper.vue
@@ -47,7 +47,7 @@ const directionsCursorMaps: { [key: string]: string } = {
 };
 
 export default defineComponent({
-	name: 'n8n-resize',
+	name: 'N8nResize',
 	props: {
 		isResizingEnabled: {
 			type: Boolean,
diff --git a/packages/design-system/src/components/N8nRoute/Route.vue b/packages/design-system/src/components/N8nRoute/Route.vue
index 4352d70cdc..fc786cd0d1 100644
--- a/packages/design-system/src/components/N8nRoute/Route.vue
+++ b/packages/design-system/src/components/N8nRoute/Route.vue
@@ -11,7 +11,7 @@
 import { defineComponent } from 'vue';
 
 export default defineComponent({
-	name: 'n8n-route',
+	name: 'N8nRoute',
 	props: {
 		to: {
 			type: String || Object,
diff --git a/packages/design-system/src/components/N8nSelect/Select.vue b/packages/design-system/src/components/N8nSelect/Select.vue
index 1fcd5ba7ce..6961d7ebfa 100644
--- a/packages/design-system/src/components/N8nSelect/Select.vue
+++ b/packages/design-system/src/components/N8nSelect/Select.vue
@@ -9,22 +9,22 @@
 		<div v-if="$slots.prepend" :class="$style.prepend">
 			<slot name="prepend" />
 		</div>
-		<el-select
+		<ElSelect
 			v-bind="{ ...$props, ...listeners }"
-			:modelValue="modelValue"
+			ref="innerSelect"
+			:model-value="modelValue"
 			:size="computedSize"
 			:class="$style[classes]"
 			:popper-class="popperClass"
-			ref="innerSelect"
 		>
-			<template #prefix v-if="$slots.prefix">
+			<template v-if="$slots.prefix" #prefix>
 				<slot name="prefix" />
 			</template>
-			<template #suffix v-if="$slots.suffix">
+			<template v-if="$slots.suffix" #suffix>
 				<slot name="suffix" />
 			</template>
 			<slot></slot>
-		</el-select>
+		</ElSelect>
 	</div>
 </template>
 
@@ -41,7 +41,7 @@ export interface IProps {
 }
 
 export default defineComponent({
-	name: 'n8n-select',
+	name: 'N8nSelect',
 	components: {
 		ElSelect,
 	},
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 26d1fa5275..b17c51b700 100644
--- a/packages/design-system/src/components/N8nSelect/__tests__/Select.spec.ts
+++ b/packages/design-system/src/components/N8nSelect/__tests__/Select.spec.ts
@@ -26,11 +26,6 @@ describe('components', () => {
 
 		it('should select an option', async () => {
 			const n8nSelectTestComponent = defineComponent({
-				template: `
-					<n8n-select v-model="selected">
-						<n8n-option v-for="o in options" :key="o" :value="o" :label="o" />
-					</n8n-select>
-				`,
 				setup() {
 					const options = ref(['1', '2', '3']);
 					const selected = ref('');
@@ -40,6 +35,11 @@ describe('components', () => {
 						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, {
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 3e6ae5470f..7277454cf3 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,20 +1,20 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`components > N8nSelect > should render correctly 1`] = `
-"<div class=\\"n8n-select container\\">
+"<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\\">
+  <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\\">
+      <div class="el-input el-input--large el-input--suffix">
         <!-- input -->
         <!-- prepend slot -->
         <!--v-if-->
-        <div class=\\"el-input__wrapper\\">
+        <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>
+          <!--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>
diff --git a/packages/design-system/src/components/N8nSpinner/Spinner.vue b/packages/design-system/src/components/N8nSpinner/Spinner.vue
index a3f4559cc2..ff8fa6e327 100644
--- a/packages/design-system/src/components/N8nSpinner/Spinner.vue
+++ b/packages/design-system/src/components/N8nSpinner/Spinner.vue
@@ -6,7 +6,7 @@
 			<div></div>
 			<div></div>
 		</div>
-		<n8n-icon v-else icon="spinner" :size="size" spin />
+		<N8nIcon v-else icon="spinner" :size="size" spin />
 	</span>
 </template>
 
@@ -16,7 +16,7 @@ import N8nIcon from '../N8nIcon';
 import { defineComponent } from 'vue';
 
 export default defineComponent({
-	name: 'n8n-spinner',
+	name: 'N8nSpinner',
 	components: {
 		N8nIcon,
 	},
diff --git a/packages/design-system/src/components/N8nSticky/Sticky.vue b/packages/design-system/src/components/N8nSticky/Sticky.vue
index 16bb7082e3..478df80dda 100644
--- a/packages/design-system/src/components/N8nSticky/Sticky.vue
+++ b/packages/design-system/src/components/N8nSticky/Sticky.vue
@@ -1,54 +1,59 @@
 <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"
 		>
 			<div v-show="!editMode" :class="$style.wrapper" @dblclick.stop="onDoubleClick">
-				<n8n-markdown
+				<N8nMarkdown
 					theme="sticky"
 					:content="modelValue"
-					:withMultiBreaks="true"
+					: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
-				@wheel.stop
-				:class="{ 'full-height': !shouldShowFooter, 'sticky-textarea': true }"
 			>
-				<n8n-input
-					:modelValue="modelValue"
+				<N8nInput
+					ref="input"
+					:model-value="modelValue"
 					type="textarea"
 					:rows="5"
 					@blur="onInputBlur"
 					@update:modelValue="onUpdateModelValue"
-					ref="input"
+					@wheel="onInputScroll"
 				/>
 			</div>
 			<div v-if="editMode && shouldShowFooter" :class="$style.footer">
-				<n8n-text size="xsmall" aligh="right">
+				<N8nText size="xsmall" aligh="right">
 					<span v-html="t('sticky.markdownHint')"></span>
-				</n8n-text>
+				</N8nText>
 			</div>
-		</n8n-resize-wrapper>
+		</N8nResizeWrapper>
 	</div>
 </template>
 
@@ -61,7 +66,13 @@ import Locale from '../../mixins/locale';
 import { defineComponent } from 'vue';
 
 export default defineComponent({
-	name: 'n8n-sticky',
+	name: 'N8nSticky',
+	components: {
+		N8nInput,
+		N8nMarkdown,
+		N8nResizeWrapper,
+		N8nText,
+	},
 	mixins: [Locale],
 	props: {
 		modelValue: {
@@ -106,12 +117,10 @@ export default defineComponent({
 			type: Boolean,
 			default: false,
 		},
-	},
-	components: {
-		N8nInput,
-		N8nMarkdown,
-		N8nResizeWrapper,
-		N8nText,
+		backgroundColor: {
+			value: [Number, String],
+			default: 1,
+		},
 	},
 	data() {
 		return {
@@ -132,15 +141,30 @@ export default defineComponent({
 			return this.width;
 		},
 		styles(): { height: string; width: string } {
-			return {
+			const styles: { height: string; width: string } = {
 				height: `${this.resHeight}px`,
 				width: `${this.resWidth}px`,
 			};
+
+			return styles;
 		},
 		shouldShowFooter(): boolean {
 			return this.resHeight > 100 && this.resWidth > 155;
 		},
 	},
+	watch: {
+		editMode(newMode, prevMode) {
+			setTimeout(() => {
+				if (newMode && !prevMode && this.$refs.input) {
+					const textarea = this.$refs.input as HTMLTextAreaElement;
+					if (this.defaultText === this.modelValue) {
+						textarea.select();
+					}
+					textarea.focus();
+				}
+			}, 100);
+		},
+	},
 	methods: {
 		onDoubleClick() {
 			if (!this.readOnly) {
@@ -169,18 +193,11 @@ export default defineComponent({
 			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.modelValue) {
-						textarea.select();
-					}
-					textarea.focus();
-				}
-			}, 100);
+		onInputScroll(event: WheelEvent) {
+			// Pass through zoom events but hold regular scrolling
+			if (!event.ctrlKey && !event.metaKey) {
+				event.stopPropagation();
+			}
 		},
 	},
 });
@@ -189,9 +206,19 @@ export default defineComponent({
 <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 {
@@ -212,12 +239,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);
 	}
 }
@@ -227,6 +248,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/N8nTabs/Tabs.vue b/packages/design-system/src/components/N8nTabs/Tabs.vue
index 5425e9e1e3..41faefcfdd 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,7 +27,7 @@
 						<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>
@@ -35,9 +35,10 @@
 					<div
 						v-else
 						: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>
@@ -65,6 +66,23 @@ export default defineComponent({
 	components: {
 		N8nIcon,
 	},
+	props: {
+		modelValue: {
+			type: String,
+			default: '',
+		},
+		options: {
+			type: Array as PropType<N8nTabOptions[]>,
+			default: (): N8nTabOptions[] => [],
+		},
+	},
+	data() {
+		return {
+			scrollPosition: 0,
+			canScrollRight: false,
+			resizeObserver: null as ResizeObserver | null,
+		};
+	},
 	mounted() {
 		const container = this.$refs.tabs as HTMLDivElement | undefined;
 		if (container) {
@@ -93,23 +111,6 @@ export default defineComponent({
 			this.resizeObserver.disconnect();
 		}
 	},
-	data() {
-		return {
-			scrollPosition: 0,
-			canScrollRight: false,
-			resizeObserver: null as ResizeObserver | null,
-		};
-	},
-	props: {
-		modelValue: {
-			type: String,
-			default: '',
-		},
-		options: {
-			type: Array as PropType<N8nTabOptions[]>,
-			default: (): N8nTabOptions[] => [],
-		},
-	},
 	methods: {
 		handleTooltipClick(tab: string, event: MouseEvent) {
 			this.$emit('tooltipClick', tab, event);
diff --git a/packages/design-system/src/components/N8nTag/Tag.vue b/packages/design-system/src/components/N8nTag/Tag.vue
index 95ba1f7dfc..95b2982673 100644
--- a/packages/design-system/src/components/N8nTag/Tag.vue
+++ b/packages/design-system/src/components/N8nTag/Tag.vue
@@ -8,7 +8,7 @@
 import { defineComponent } from 'vue';
 
 export default defineComponent({
-	name: 'n8n-tag',
+	name: 'N8nTag',
 	props: {
 		text: {
 			type: String,
@@ -29,11 +29,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.vue b/packages/design-system/src/components/N8nTags/Tags.vue
index 96012f44f0..3bf8ec56ba 100644
--- a/packages/design-system/src/components/N8nTags/Tags.vue
+++ b/packages/design-system/src/components/N8nTags/Tags.vue
@@ -1,12 +1,12 @@
 <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', tag.id, $event)"
 		/>
-		<n8n-link
+		<N8nLink
 			v-if="truncate && !showAll && hiddenTagsLength > 0"
 			theme="text"
 			underline
@@ -14,7 +14,7 @@
 			@click.stop.prevent="onExpand"
 		>
 			{{ t('tags.showMore', `${hiddenTagsLength}`) }}
-		</n8n-link>
+		</N8nLink>
 	</div>
 </template>
 
@@ -31,17 +31,12 @@ export interface ITag {
 }
 
 export default defineComponent({
-	name: 'n8n-tags',
-	mixins: [Locale],
+	name: 'N8nTags',
 	components: {
 		N8nTag,
 		N8nLink,
 	},
-	data() {
-		return {
-			showAll: false,
-		};
-	},
+	mixins: [Locale],
 	props: {
 		tags: {
 			type: Array as PropType<ITag[]>,
@@ -56,6 +51,11 @@ export default defineComponent({
 			default: 3,
 		},
 	},
+	data() {
+		return {
+			showAll: false,
+		};
+	},
 	computed: {
 		visibleTags(): ITag[] {
 			if (this.truncate && !this.showAll && this.tags.length > this.truncateAt) {
diff --git a/packages/design-system/src/components/N8nText/Text.vue b/packages/design-system/src/components/N8nText/Text.vue
index ab5e949bbe..2415675138 100644
--- a/packages/design-system/src/components/N8nText/Text.vue
+++ b/packages/design-system/src/components/N8nText/Text.vue
@@ -7,7 +7,7 @@
 <script lang="ts">
 import { defineComponent } from 'vue';
 export default defineComponent({
-	name: 'n8n-text',
+	name: 'N8nText',
 	props: {
 		bold: {
 			type: Boolean,
@@ -129,7 +129,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.vue b/packages/design-system/src/components/N8nTooltip/Tooltip.vue
index ee8c53683a..a338ea8744 100644
--- a/packages/design-system/src/components/N8nTooltip/Tooltip.vue
+++ b/packages/design-system/src/components/N8nTooltip/Tooltip.vue
@@ -1,5 +1,5 @@
 <template>
-	<el-tooltip v-bind="{ ...$props, ...$attrs }" popper-class="n8n-tooltip">
+	<ElTooltip v-bind="{ ...$props, ...$attrs }" :popper-class="$props.popperClass ?? 'n8n-tooltip'">
 		<slot />
 		<template #content>
 			<slot name="content">
@@ -10,14 +10,14 @@
 				:class="$style.buttons"
 				:style="{ justifyContent: justifyButtons }"
 			>
-				<n8n-button
+				<N8nButton
 					v-for="button in buttons"
 					:key="button.attrs.label"
 					v-bind="{ ...button.attrs, ...button.listeners }"
 				/>
 			</div>
 		</template>
-	</el-tooltip>
+	</ElTooltip>
 </template>
 
 <script lang="ts">
@@ -28,12 +28,12 @@ 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: {
diff --git a/packages/design-system/src/components/N8nTree/Tree.vue b/packages/design-system/src/components/N8nTree/Tree.vue
index 743fb609e8..16ffbf1daf 100644
--- a/packages/design-system/src/components/N8nTree/Tree.vue
+++ b/packages/design-system/src/components/N8nTree/Tree.vue
@@ -1,21 +1,21 @@
 <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="$slots.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="$slots.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="$slots.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 $slots" #[name]="data">
 						<slot :name="name" v-bind="data"></slot>
@@ -31,7 +31,7 @@ import type { PropType } from 'vue';
 import { defineComponent } from 'vue';
 
 export default defineComponent({
-	name: 'n8n-tree',
+	name: 'N8nTree',
 	components: {},
 	props: {
 		value: {
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 d0c0ef1346..96acff7327 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, 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.vue b/packages/design-system/src/components/N8nUserInfo/UserInfo.vue
index 747a4b5f93..553e822766 100644
--- a/packages/design-system/src/components/N8nUserInfo/UserInfo.vue
+++ b/packages/design-system/src/components/N8nUserInfo/UserInfo.vue
@@ -1,25 +1,25 @@
 <template>
 	<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>
+				<N8nText data-test-id="user-email" size="small" color="text-light">{{ email }}</N8nText>
 			</div>
 		</div>
 	</div>
@@ -33,13 +33,13 @@ import Locale from '../../mixins/locale';
 import { defineComponent } from 'vue';
 
 export default defineComponent({
-	name: 'n8n-users-info',
-	mixins: [Locale],
+	name: 'N8nUsersInfo',
 	components: {
 		N8nAvatar,
 		N8nText,
 		N8nBadge,
 	},
+	mixins: [Locale],
 	props: {
 		firstName: {
 			type: String,
diff --git a/packages/design-system/src/components/N8nUserSelect/UserSelect.vue b/packages/design-system/src/components/N8nUserSelect/UserSelect.vue
index 0d76566831..0106633d8c 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
+	<N8nSelect
+		data-test-id="user-select-trigger"
 		v-bind="$attrs"
-		:modelValue="modelValue"
+		:model-value="modelValue"
 		:filterable="true"
-		:filterMethod="setFilter"
+		:filter-method="setFilter"
 		:placeholder="placeholder"
 		:default-first-option="true"
 		teleported
 		:popper-class="$style.limitPopperWidth"
-		:noDataText="t('nds.userSelect.noMatchingUsers')"
+		:no-data-text="t('nds.userSelect.noMatchingUsers')"
 		:size="size"
 		@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,9 +25,9 @@
 			: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">
@@ -40,13 +41,13 @@ import type { PropType } from 'vue';
 import { defineComponent } from 'vue';
 
 export default defineComponent({
-	name: 'n8n-user-select',
-	mixins: [Locale],
+	name: 'N8nUserSelect',
 	components: {
 		N8nUserInfo,
 		N8nSelect,
 		N8nOption,
 	},
+	mixins: [Locale],
 	props: {
 		users: {
 			type: Array as PropType<IUser[]>,
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 0000000000..b19bbe3e67
--- /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 0000000000..cffc641730
--- /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 0000000000..ff3ac1b897
--- /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 0000000000..8b8266be89
--- /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.vue b/packages/design-system/src/components/N8nUsersList/UsersList.vue
index 64d3f13d58..a3e2000a96 100644
--- a/packages/design-system/src/components/N8nUsersList/UsersList.vue
+++ b/packages/design-system/src/components/N8nUsersList/UsersList.vue
@@ -6,17 +6,17 @@
 			:class="i === sortedUsers.length - 1 ? $style.itemContainer : $style.itemWithBorder"
 			:data-test-id="`user-list-item-${user.email}`"
 		>
-			<n8n-user-info
+			<N8nUserInfo
 				v-bind="user"
-				:isCurrentUser="currentUserId === user.id"
-				:isSamlLoginEnabled="isSamlLoginEnabled"
+				: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' &&
@@ -44,13 +44,13 @@ import type { PropType } from 'vue';
 import { defineComponent } from 'vue';
 
 export default defineComponent({
-	name: 'n8n-users-list',
-	mixins: [Locale],
+	name: 'N8nUsersList',
 	components: {
 		N8nActionToggle,
 		N8nBadge,
 		N8nUserInfo,
 	},
+	mixins: [Locale],
 	props: {
 		readonly: {
 			type: Boolean,
diff --git a/packages/design-system/src/components/ResizeObserver/ResizeObserver.vue b/packages/design-system/src/components/ResizeObserver/ResizeObserver.vue
index 8262bcf577..9f07369f77 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);
 	},
 	beforeUnmount() {
 		if (this.enabled) {
 			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 9e9cbd616e..d917339b5e 100644
--- a/packages/design-system/src/components/index.ts
+++ b/packages/design-system/src/components/index.ts
@@ -46,6 +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 N8nResizeObserver } from './ResizeObserver';
+export { N8nKeyboardShortcut } from './N8nKeyboardShortcut';
diff --git a/packages/design-system/src/composables/index.ts b/packages/design-system/src/composables/index.ts
deleted file mode 100644
index 19ab1d994e..0000000000
--- 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 0000000000..167053c679
--- /dev/null
+++ b/packages/design-system/src/composables/useDeviceSupport.test.ts
@@ -0,0 +1,80 @@
+import { useDeviceSupport } from '@/composables/useDeviceSupport';
+
+describe('useDeviceSupport()', () => {
+	beforeEach(() => {
+		global.window = Object.create(window);
+		global.navigator = { userAgent: 'test-agent', maxTouchPoints: 0 };
+	});
+
+	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);
+		});
+
+		it('should return true for touch device on MouseEvent', () => {
+			Object.defineProperty(window, 'ontouchstart', { value: {} });
+			const { isCtrlKeyPressed } = useDeviceSupport();
+			const mockEvent = new MouseEvent('click');
+			expect(isCtrlKeyPressed(mockEvent)).toEqual(true);
+		});
+	});
+});
diff --git a/packages/editor-ui/src/composables/useDeviceSupport.ts b/packages/design-system/src/composables/useDeviceSupport.ts
similarity index 63%
rename from packages/editor-ui/src/composables/useDeviceSupport.ts
rename to packages/design-system/src/composables/useDeviceSupport.ts
index 1c7e5083ee..01d52b890b 100644
--- a/packages/editor-ui/src/composables/useDeviceSupport.ts
+++ b/packages/design-system/src/composables/useDeviceSupport.ts
@@ -1,14 +1,7 @@
 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);
+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') ||
@@ -19,7 +12,7 @@ export default function useDeviceSupportHelpers(): DeviceSupportHelpers {
 	const controlKeyCode = ref(isMacOs.value ? 'Meta' : 'Control');
 
 	function isCtrlKeyPressed(e: MouseEvent | KeyboardEvent): boolean {
-		if (isTouchDevice.value === true && e instanceof MouseEvent) {
+		if (isTouchDevice.value && e instanceof MouseEvent) {
 			return true;
 		}
 		if (isMacOs.value) {
diff --git a/packages/design-system/src/css/_primitives.scss b/packages/design-system/src/css/_primitives.scss
new file mode 100644
index 0000000000..d45b578530
--- /dev/null
+++ b/packages/design-system/src/css/_primitives.scss
@@ -0,0 +1,422 @@
+// 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-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-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-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 671eeead71..83705187de 100644
--- a/packages/design-system/src/css/_tokens.dark.scss
+++ b/packages/design-system/src/css/_tokens.dark.scss
@@ -1,334 +1,202 @@
 @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));
+	// Primary tokens
 
-	--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)
+	// 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-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
+	--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-expression-editor-background: var(--prim-gray-800);
+	--color-expression-syntax-example: var(--prim-gray-670);
+
+	// 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(--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-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);
+
+	// Notification
+	--color-notification-background: var(--prim-gray-740);
+
+	// NDV
+	--color-run-data-background: var(--prim-gray-800);
+	--color-ndv-droppable-parameter: var(--prim-color-primary);
+	--color-ndv-back-font: var(--prim-gray-0);
+	--color-ndv-ouptut-error-font: 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-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-toggle: var(--prim-gray-40);
+
+	// Action Dropdown
+	--color-action-dropdown-item-active-background: var(--color-background-xlight);
+
+	// 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);
+}
 
-	--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;
-	--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-background-readonly: #323230;
-	--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)
-			);
-		}
-	}
+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 1e8762c851..113add69ee 100644
--- a/packages/design-system/src/css/_tokens.scss
+++ b/packages/design-system/src/css/_tokens.scss
@@ -1,403 +1,270 @@
 @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-h: var(--prim-color-primary-h);
+	--color-primary-s: var(--prim-color-primary-s);
+	--color-primary-l: 68%;
 
-	--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)
-	);
+	// Primary tokens
 
-	--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)
-	);
+	// 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);
 
-	--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)
-	);
+	// 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);
 
-	--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)
-	);
+	// 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);
 
-	--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)
-	);
+	// 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);
 
-	--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)
-	);
+	// 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);
 
-	--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)
-	);
+	// 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);
 
-	--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)
-	);
+	// 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);
 
-	--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)
-	);
+	// 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);
 
-	--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)
-	);
+	// Secondary tokens
 
-	--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)
-	);
+	// 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);
 
-	--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)
-	);
+	// Canvas
+	--color-canvas-background: var(--prim-gray-10);
+	--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);
 
-	--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));
+	// 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-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-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);
 
-	--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)
-	);
+	// Expressions
+	--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-expression-editor-background: var(--prim-gray-0);
+	--color-expression-syntax-example: var(--prim-gray-40);
 
-	--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)
-	);
+	// 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);
+	--color-autocomplete-selected-background: var(--prim-color-alt-e);
+	--color-autocomplete-selected-font: var(--prim-gray-0);
 
-	--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));
+	// Variables
+	--color-variables-usage-font: var(--color-success);
+	--color-variables-usage-syntax-bg: var(--color-success-tint-2);
 
-	--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)
-	);
+	// 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);
 
-	--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)
-	);
+	// 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);
 
-	--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));
+	// 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);
 
-	--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)
-	);
+	// Text button
+	--color-text-button-secondary-font: var(--prim-gray-670);
 
-	--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));
+	// 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);
 
-	--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));
+	// 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-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));
+	// Notification
+	--color-notification-background: var(--color-background-xlight);
 
-	--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)
-	);
+	// 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);
 
-	--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));
+	// NDV
+	--color-run-data-background: var(--color-background-base);
+	--color-ndv-droppable-parameter: var(--color-secondary);
+	--color-ndv-back-font: var(--prim-gray-0);
+	--color-ndv-ouptut-error-font: var(--prim-color-alt-c);
 
-	--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)
-	);
+	// 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);
 
-	--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)
-	);
+	// 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);
 
-	--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)
-	);
+	// Dialogs and overlays
+	--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);
 
-	--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)
-	);
+	// Avatar
+	--color-avatar-font: var(--color-text-xlight);
 
-	--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)
-	);
+	// Value Survey
+	--color-value-survey-background: var(--prim-gray-740);
+	--color-value-survey-font: var(--prim-gray-0);
 
-	--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)
-	);
+	// 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-toggle: var(--prim-gray-0);
 
-	--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)
-	);
+	// Feature Request
+	--color-feature-request-font: var(--prim-gray-0);
 
-	--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-background-readonly: #f5f2f0;
-	--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;
+	// 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
@@ -434,6 +301,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/common/transition.scss b/packages/design-system/src/css/common/transition.scss
index a7090e0bfe..efdae0e9e5 100644
--- a/packages/design-system/src/css/common/transition.scss
+++ b/packages/design-system/src/css/common/transition.scss
@@ -45,6 +45,10 @@
 	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-from,
 .el-zoom-in-top-leave-active {
diff --git a/packages/design-system/src/css/common/var.scss b/packages/design-system/src/css/common/var.scss
index 24ea1e8cad..cc0687266c 100644
--- a/packages/design-system/src/css/common/var.scss
+++ b/packages/design-system/src/css/common/var.scss
@@ -21,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-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-primary-shade-1: function.lightness(
-	--color-primary-h,
-	--color-primary-s,
-	--color-primary-l,
-	-(10)
-);
+$color-success-light-1: var(--color-success);
+$color-success-light: var(--color-success-light);
+$color-success-lighter: var(--color-success-tint-1);
 
-$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: 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-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-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
@@ -184,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
 -------------------------- */
@@ -200,15 +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
 -------------------------- */
@@ -234,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
 -------------------------- */
@@ -264,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);
@@ -310,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);
 
@@ -327,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;
@@ -347,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);
 
@@ -373,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);
@@ -395,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;
@@ -468,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);
@@ -528,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
@@ -540,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));
@@ -585,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
 -------------------------- */
@@ -599,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);
@@ -612,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
@@ -644,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));
 
-$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));
-$button-active-background-color: var(
-	--button-active-background-color,
-	var(--color-primary-shade-1)
+// 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-focus-outline-color: var(--button-focus-outline-color, var(--color-primary-tint-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-button-primary-hover-active-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));
+// 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)
+);
+
+// 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)
+);
+
+// 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
@@ -715,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;
@@ -749,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);
@@ -780,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;
 
@@ -804,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;
@@ -844,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
 -------------------------- */
@@ -934,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
@@ -948,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;
 
@@ -1074,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
@@ -1087,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 e7bc062106..2ddb2bfcde 100644
--- a/packages/design-system/src/css/dialog.scss
+++ b/packages/design-system/src/css/dialog.scss
@@ -18,7 +18,8 @@
 	height: 100%;
 	display: flex;
 	flex-direction: column;
-	align-items: inherit;
+	align-items: center;
+	justify-content: center;
 	overflow-x: hidden;
 	overflow-y: auto;
 }
@@ -60,7 +61,6 @@
 
 	@include mixins.e(header) {
 		padding: var.$dialog-padding-primary;
-		padding-bottom: 0px;
 	}
 
 	@include mixins.e(headerbtn) {
@@ -95,6 +95,7 @@
 
 	@include mixins.e(body) {
 		padding: var.$dialog-padding-primary;
+		padding-top: 0;
 		color: var(--color-text-base);
 	}
 
diff --git a/packages/design-system/src/css/dropdown.scss b/packages/design-system/src/css/dropdown.scss
index 0147cb5cfb..a15d17f026 100644
--- a/packages/design-system/src/css/dropdown.scss
+++ b/packages/design-system/src/css/dropdown.scss
@@ -81,7 +81,6 @@
 	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;
 
@@ -92,7 +91,7 @@
 		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;
@@ -117,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;
 		}
 	}
@@ -143,7 +141,6 @@
 
 				&:before {
 					height: $divided-offset;
-					margin: 0 -17px;
 				}
 			}
 		}
@@ -163,7 +160,6 @@
 
 				&:before {
 					height: $divided-offset;
-					margin: 0 -15px;
 				}
 			}
 		}
@@ -183,7 +179,6 @@
 
 				&:before {
 					height: $divided-offset;
-					margin: 0 -10px;
 				}
 			}
 		}
diff --git a/packages/design-system/src/css/index.scss b/packages/design-system/src/css/index.scss
index ab30109386..c37709df1b 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';
diff --git a/packages/design-system/src/css/input.scss b/packages/design-system/src/css/input.scss
index cab4d87b28..d388969e41 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,7 +113,13 @@
 		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;
@@ -145,6 +156,7 @@
 	}
 
 	@include mixins.e(suffix-inner) {
+		display: inline-flex;
 		pointer-events: all;
 	}
 
@@ -286,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 d13db8be39..93fa9df373 100644
--- a/packages/design-system/src/css/loading.scss
+++ b/packages/design-system/src/css/loading.scss
@@ -27,6 +27,7 @@
 
 		.el-loading-spinner {
 			transform: translateY(-50%);
+			display: block;
 
 			.circular {
 				height: var.$loading-fullscreen-spinner-size;
@@ -42,6 +43,10 @@
 	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;
diff --git a/packages/design-system/src/css/notification.scss b/packages/design-system/src/css/notification.scss
index d2dc68dd65..9ddd12ef9e 100644
--- a/packages/design-system/src/css/notification.scss
+++ b/packages/design-system/src/css/notification.scss
@@ -9,7 +9,7 @@
 	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,
diff --git a/packages/design-system/src/css/popper.scss b/packages/design-system/src/css/popper.scss
index 61651dd027..bbc1d6d144 100644
--- a/packages/design-system/src/css/popper.scss
+++ b/packages/design-system/src/css/popper.scss
@@ -54,7 +54,7 @@
 	&[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;
 
@@ -69,7 +69,7 @@
 	&[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;
 
@@ -84,7 +84,7 @@
 	&[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;
 
@@ -99,7 +99,7 @@
 	&[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;
 
diff --git a/packages/design-system/src/css/radio-button.scss b/packages/design-system/src/css/radio-button.scss
index 8cf3b3ae5f..c90cc7473e 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 a0a442c027..0a7323c8de 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-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);
+}
+
 article,
 aside,
 details,
diff --git a/packages/design-system/src/css/select.scss b/packages/design-system/src/css/select.scss
index 7cc8696c1a..f5b6f17d31 100644
--- a/packages/design-system/src/css/select.scss
+++ b/packages/design-system/src/css/select.scss
@@ -80,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 {
diff --git a/packages/design-system/src/css/skeleton.scss b/packages/design-system/src/css/skeleton.scss
index d0dda993f5..3a0266e92c 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 23bb3ef6c4..c88660fa23 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 {
@@ -77,7 +80,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;
 		}
 	}
 
diff --git a/packages/design-system/src/css/table.scss b/packages/design-system/src/css/table.scss
index b3cde7744c..ba3efdaf9c 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/tag.scss b/packages/design-system/src/css/tag.scss
index 47d740fd4e..a1634b5d4a 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 {
diff --git a/packages/design-system/src/css/upload.scss b/packages/design-system/src/css/upload.scss
index 89bc1c997f..0479771400 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/main.ts b/packages/design-system/src/main.ts
index cf75163855..54934d6f1c 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/plugin.ts b/packages/design-system/src/plugin.ts
index 2f0bea9017..493fde38ec 100644
--- a/packages/design-system/src/plugin.ts
+++ b/packages/design-system/src/plugin.ts
@@ -1,111 +1,12 @@
-/* eslint-disable @typescript-eslint/naming-convention */
-import type { Plugin } from 'vue';
-import {
-	N8nActionBox,
-	N8nActionDropdown,
-	N8nActionToggle,
-	N8nAlert,
-	N8nAvatar,
-	N8nBadge,
-	N8nBlockUi,
-	N8nButton,
-	N8nCallout,
-	N8nCard,
-	N8nCheckbox,
-	N8nCircleLoader,
-	N8nColorPicker,
-	N8nDatatable,
-	N8nFormBox,
-	N8nFormInputs,
-	N8nFormInput,
-	N8nHeading,
-	N8nIcon,
-	N8nIconButton,
-	N8nInfoAccordion,
-	N8nInfoTip,
-	N8nInput,
-	N8nInputLabel,
-	N8nInputNumber,
-	N8nLink,
-	N8nLoading,
-	N8nMarkdown,
-	N8nMenu,
-	N8nMenuItem,
-	N8nNodeCreatorNode,
-	N8nNodeIcon,
-	N8nNotice,
-	N8nOption,
-	N8nPopover,
-	N8nPulse,
-	N8nRadioButtons,
-	N8nRecycleScroller,
-	N8nResizeWrapper,
-	N8nSelect,
-	N8nSpinner,
-	N8nSticky,
-	N8nTabs,
-	N8nTag,
-	N8nTags,
-	N8nText,
-	N8nTooltip,
-	N8nTree,
-	N8nUserInfo,
-	N8nUserSelect,
-	N8nUsersList,
-} from './components';
+import type { Component, Plugin } from 'vue';
+import * as components from './components';
 
-export const N8nPlugin: Plugin<{}> = {
+export interface N8nPluginOptions {}
+
+export const N8nPlugin: Plugin<N8nPluginOptions> = {
 	install: (app) => {
-		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('n8n-callout', N8nCallout);
-		app.component('n8n-card', N8nCard);
-		app.component('n8n-checkbox', N8nCheckbox);
-		app.component('n8n-circle-loader', N8nCircleLoader);
-		app.component('n8n-color-picker', N8nColorPicker);
-		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-heading', N8nHeading);
-		app.component('n8n-icon', N8nIcon);
-		app.component('n8n-icon-button', N8nIconButton);
-		app.component('n8n-info-accordion', N8nInfoAccordion);
-		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-link', N8nLink);
-		app.component('n8n-loading', N8nLoading);
-		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-radio-buttons', N8nRadioButtons);
-		app.component('n8n-recycle-scroller', N8nRecycleScroller);
-		app.component('n8n-resize-wrapper', N8nResizeWrapper);
-		app.component('n8n-select', N8nSelect);
-		app.component('n8n-spinner', N8nSpinner);
-		app.component('n8n-sticky', N8nSticky);
-		app.component('n8n-tabs', N8nTabs);
-		app.component('n8n-tag', N8nTag);
-		app.component('n8n-tags', N8nTags);
-		app.component('n8n-text', N8nText);
-		app.component('n8n-tooltip', N8nTooltip);
-		app.component('n8n-tree', N8nTree);
-		app.component('n8n-user-info', N8nUserInfo);
-		app.component('n8n-users-list', N8nUsersList);
-		app.component('n8n-user-select', N8nUserSelect);
+		for (const [name, component] of Object.entries(components)) {
+			app.component(name, component as unknown as Component);
+		}
 	},
 };
diff --git a/packages/design-system/src/styleguide/ColorCircles.vue b/packages/design-system/src/styleguide/ColorCircles.vue
index 5901e5366b..0643883ac4 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,19 +53,19 @@ 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) => {
@@ -87,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 a22de96cd3..da638f1088 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) => {
diff --git a/packages/design-system/src/styleguide/VariableTable.vue b/packages/design-system/src/styleguide/VariableTable.vue
index 5548a2f481..7fba9432d6 100644
--- a/packages/design-system/src/styleguide/VariableTable.vue
+++ b/packages/design-system/src/styleguide/VariableTable.vue
@@ -20,13 +20,7 @@ import type { PropType } from 'vue';
 import { defineComponent } from 'vue';
 
 export default defineComponent({
-	name: 'variable-table',
-	data() {
-		return {
-			observer: null as null | MutationObserver,
-			values: {} as Record<string, string>,
-		};
-	},
+	name: 'VariableTable',
 	props: {
 		variables: {
 			type: Array as PropType<string[]>,
@@ -37,6 +31,12 @@ export default defineComponent({
 			default: '',
 		},
 	},
+	data() {
+		return {
+			observer: null as null | MutationObserver,
+			values: {} as Record<string, string>,
+		};
+	},
 	created() {
 		const setValues = () => {
 			this.variables.forEach((variable) => {
diff --git a/packages/design-system/src/styleguide/colors.stories.mdx b/packages/design-system/src/styleguide/colors.stories.mdx
index 131a6950c0..506f23f308 100644
--- a/packages/design-system/src/styleguide/colors.stories.mdx
+++ b/packages/design-system/src/styleguide/colors.stories.mdx
@@ -2,7 +2,7 @@ import { Meta, Story, Canvas } from '@storybook/addon-docs';
 import ColorCircles from './ColorCircles.vue';
 
 <Meta
-	title="Styleguide/Colors"
+	title="Styleguide/Colors Tokens"
 	parameters={{
 		design: {
 			type: 'figma',
@@ -31,7 +31,7 @@ import ColorCircles from './ColorCircles.vue';
 <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']" />`,
+			template: `<color-circles :colors="['--color-secondary-shade-1', '--color-secondary', '--color-secondary-tint-1', '--color-secondary-tint-3']" />`,
 			components: {
 				ColorCircles,
 			},
@@ -44,7 +44,7 @@ import ColorCircles from './ColorCircles.vue';
 <Canvas>
 	<Story name="success">
 		{{
-			template: `<color-circles :colors="['--color-success', '--color-success-tint-1', '--color-success-tint-2', '--color-success-light']" />`,
+			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']" />`,
 			components: {
 				ColorCircles,
 			},
@@ -57,7 +57,7 @@ import ColorCircles from './ColorCircles.vue';
 <Canvas>
 	<Story name="warning">
 		{{
-			template: `<color-circles :colors="['--color-warning', '--color-warning-tint-1', '--color-warning-tint-2']" />`,
+			template: `<color-circles :colors="['--color-warning-shade-1', '--color-warning', '--color-warning-tint-1', '--color-warning-tint-2']" />`,
 			components: {
 				ColorCircles,
 			},
@@ -70,33 +70,7 @@ import ColorCircles from './ColorCircles.vue';
 <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']" />`,
+			template: `<color-circles :colors="['--color-danger-shade-1', '--color-danger', '--color-danger-tint-1', '--color-danger-tint-2']" />`,
 			components: {
 				ColorCircles,
 			},
@@ -109,7 +83,7 @@ import ColorCircles from './ColorCircles.vue';
 <Canvas>
 	<Story name="text">
 		{{
-			template: `<color-circles :colors="['--color-text-dark', '--color-text-base', '--color-text-light', '--color-text-lighter', '--color-text-xlight']" />`,
+			template: `<color-circles :colors="['--color-text-dark', '--color-text-base', '--color-text-light', '--color-text-lighter', '--color-text-xlight', '--color-text-danger']" />`,
 			components: {
 				ColorCircles,
 			},
@@ -135,55 +109,7 @@ import ColorCircles from './ColorCircles.vue';
 <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']" />`,
+			template: `<color-circles :colors="['--color-background-dark', '--color-background-medium', '--color-background-base', '--color-background-light', '--color-background-xlight']" />`,
 			components: {
 				ColorCircles,
 			},
diff --git a/packages/design-system/src/styleguide/colorsprimitives.stories.mdx b/packages/design-system/src/styleguide/colorsprimitives.stories.mdx
new file mode 100644
index 0000000000..b23631aa63
--- /dev/null
+++ b/packages/design-system/src/styleguide/colorsprimitives.stories.mdx
@@ -0,0 +1,183 @@
+import { Meta, Story, Canvas } from '@storybook/addon-docs';
+import ColorCircles from './ColorCircles.vue';
+
+<Meta
+	title="Styleguide/Colors Primitives"
+	parameters={{
+		design: {
+			type: 'figma',
+			url: 'https://www.figma.com/file/DxLbnIyMK8X0uLkUguFV4n/n8n-design-system_v1?node-id=2%3A23',
+		},
+	}}
+/>
+
+# Colors Primitives
+
+## Gray
+
+<Canvas>
+	<Story name="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']" />`,
+			components: {
+				ColorCircles,
+			},
+		}}
+	</Story>
+</Canvas>
+
+## Primary
+
+<Canvas>
+	<Story name="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']" />`,
+			components: {
+				ColorCircles,
+			},
+		}}
+	</Story>
+</Canvas>
+
+## Secondary
+
+<Canvas>
+	<Story name="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']" />`,
+			components: {
+				ColorCircles,
+			},
+		}}
+	</Story>
+</Canvas>
+
+## Alternate A
+
+<Canvas>
+	<Story name="alternate-a">
+		{{
+			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']" />`,
+			components: {
+				ColorCircles,
+			},
+		}}
+	</Story>
+</Canvas>
+
+## Alternate B
+
+<Canvas>
+	<Story name="alternate-b">
+		{{
+			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']" />`,
+			components: {
+				ColorCircles,
+			},
+		}}
+	</Story>
+</Canvas>
+
+## Alternate C
+
+<Canvas>
+	<Story name="alternate-c">
+		{{
+			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']" />`,
+			components: {
+				ColorCircles,
+			},
+		}}
+	</Story>
+</Canvas>
+
+## Alternate D
+
+<Canvas>
+	<Story name="alternate-d">
+		{{
+			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']" />`,
+			components: {
+				ColorCircles,
+			},
+		}}
+	</Story>
+</Canvas>
+
+## Alternate E
+
+<Canvas>
+	<Story name="alternate-e">
+		{{
+			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']" />`,
+			components: {
+				ColorCircles,
+			},
+		}}
+	</Story>
+</Canvas>
+
+## Alternate F
+
+<Canvas>
+	<Story name="alternate-f">
+		{{
+			template: `<color-circles :colors="['--prim-color-alt-f', '--prim-color-alt-f-tint-150']" />`,
+			components: {
+				ColorCircles,
+			},
+		}}
+	</Story>
+</Canvas>
+
+## Alternate G
+
+<Canvas>
+	<Story name="alternate-g">
+		{{
+			template: `<color-circles :colors="['--prim-color-alt-g', '--prim-color-alt-g-tint-150']" />`,
+			components: {
+				ColorCircles,
+			},
+		}}
+	</Story>
+</Canvas>
+
+## Alternate H
+
+<Canvas>
+	<Story name="alternate-h">
+		{{
+			template: `<color-circles :colors="['--prim-color-alt-h']" />`,
+			components: {
+				ColorCircles,
+			},
+		}}
+	</Story>
+</Canvas>
+
+## Alternate I
+
+<Canvas>
+	<Story name="alternate-i">
+		{{
+			template: `<color-circles :colors="['--prim-color-alt-i']" />`,
+			components: {
+				ColorCircles,
+			},
+		}}
+	</Story>
+</Canvas>
+
+## Alternate J
+
+<Canvas>
+	<Story name="alternate-j">
+		{{
+			template: `<color-circles :colors="['--prim-color-alt-j']" />`,
+			components: {
+				ColorCircles,
+			},
+		}}
+	</Story>
+</Canvas>
diff --git a/packages/design-system/src/styleguide/components/SpacingPreview.vue b/packages/design-system/src/styleguide/components/SpacingPreview.vue
index e9b9eb7626..4fe2e25046 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>
diff --git a/packages/design-system/src/types/form.ts b/packages/design-system/src/types/form.ts
index 40012fecfa..1ef1096235 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'
diff --git a/packages/design-system/src/types/index.ts b/packages/design-system/src/types/index.ts
index 931028279e..cc01a22e9b 100644
--- a/packages/design-system/src/types/index.ts
+++ b/packages/design-system/src/types/index.ts
@@ -5,3 +5,4 @@ export * from './i18n';
 export * from './menu';
 export * from './router';
 export * from './user';
+export * from './keyboardshortcut';
diff --git a/packages/design-system/src/types/keyboardshortcut.ts b/packages/design-system/src/types/keyboardshortcut.ts
new file mode 100644
index 0000000000..c917c6c55c
--- /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/user.ts b/packages/design-system/src/types/user.ts
index d67cdc2151..b5b7f512cf 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/vite.config.ts b/packages/design-system/vite.config.mts
similarity index 62%
rename from packages/design-system/vite.config.ts
rename to packages/design-system/vite.config.mts
index 0f62568a14..7bebfbeec8 100644
--- a/packages/design-system/vite.config.ts
+++ b/packages/design-system/vite.config.mts
@@ -1,9 +1,32 @@
 import vue from '@vitejs/plugin-vue';
 import { resolve } from 'path';
 import { defineConfig, mergeConfig } from 'vite';
+import { type UserConfig } from 'vitest';
 import { defineConfig as defineVitestConfig } from 'vitest/config';
 
-const { coverageReporters } = require('../../jest.config.js');
+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;
 
 export default mergeConfig(
 	defineConfig({
@@ -35,21 +58,5 @@ export default mergeConfig(
 			},
 		},
 	}),
-	defineVitestConfig({
-		test: {
-			globals: true,
-			environment: 'jsdom',
-			setupFiles: ['./src/__tests__/setup.ts'],
-			coverage: {
-				provider: 'v8',
-				reporter: coverageReporters,
-				all: true,
-			},
-			css: {
-				modules: {
-					classNameStrategy: 'non-scoped',
-				},
-			},
-		},
-	}),
+	vitestConfig,
 );
diff --git a/packages/editor-ui/.eslintrc.js b/packages/editor-ui/.eslintrc.js
index 45e532bdee..35ff091cef 100644
--- a/packages/editor-ui/.eslintrc.js
+++ b/packages/editor-ui/.eslintrc.js
@@ -9,11 +9,12 @@ module.exports = {
 	...sharedOptions(__dirname, 'frontend'),
 
 	rules: {
+		'n8n-local-rules/dangerously-use-html-string-missing': 'error',
+
 		// TODO: Remove these
 		'id-denylist': 'warn',
 		'import/extensions': 'warn',
 		'import/no-default-export': 'warn',
-		'import/no-extraneous-dependencies': 'warn',
 		'import/order': 'off',
 		'import/no-cycle': 'warn',
 		'import/no-duplicates': 'warn',
@@ -30,24 +31,15 @@ module.exports = {
 		'@typescript-eslint/no-this-alias': 'warn',
 		'@typescript-eslint/no-unnecessary-boolean-literal-compare': 'warn',
 		'@typescript-eslint/no-unnecessary-type-assertion': 'warn',
-		'@typescript-eslint/no-unsafe-argument': 'warn',
-		'@typescript-eslint/no-unsafe-assignment': 'warn',
-		'@typescript-eslint/no-unsafe-call': 'warn',
-		'@typescript-eslint/no-unsafe-member-access': 'warn',
-		'@typescript-eslint/no-unsafe-return': 'warn',
 		'@typescript-eslint/no-unused-expressions': 'warn',
 		'@typescript-eslint/no-unused-vars': 'warn',
-		'@typescript-eslint/no-use-before-define': '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/restrict-template-expressions': 'warn',
-		'@typescript-eslint/unbound-method': '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-explicit-any': 'warn',
 		'@typescript-eslint/no-unsafe-enum-comparison': 'warn',
 	},
 };
diff --git a/packages/editor-ui/README.md b/packages/editor-ui/README.md
index c378326a7d..c8583ffbbd 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 e00204c67b..7ea5b2b8c4 100644
--- a/packages/editor-ui/package.json
+++ b/packages/editor-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-editor-ui",
-  "version": "1.14.0",
+  "version": "1.24.0",
   "description": "Workflow Editor UI for n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",
@@ -16,43 +16,41 @@
   "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 --emitDeclarationOnly",
+    "typecheck": "vue-tsc",
     "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 --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/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.2",
-    "@codemirror/language": "^6.2.1",
-    "@codemirror/lint": "^6.0.0",
-    "@codemirror/state": "^6.1.4",
-    "@codemirror/view": "^6.5.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": "^3.0.3",
     "@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",
-    "@vueuse/components": "^10.2.0",
-    "@vueuse/core": "^10.2.0",
-    "axios": "^0.21.1",
+    "@n8n/permissions": "workspace:*",
+    "@vueuse/components": "^10.5.0",
+    "@vueuse/core": "^10.5.0",
+    "axios": "^1.6.2",
+    "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",
     "dateformat": "^3.0.3",
     "esprima-next": "5.8.4",
     "fast-json-stable-stringify": "^2.1.0",
@@ -65,7 +63,7 @@
     "n8n-design-system": "workspace:*",
     "n8n-workflow": "workspace:*",
     "pinia": "^2.1.6",
-    "prettier": "^3.0.3",
+    "prettier": "^3.1.0",
     "qrcode.vue": "^3.3.4",
     "stream-browserify": "^3.0.0",
     "timeago.js": "^4.0.2",
@@ -73,6 +71,7 @@
     "v3-infinite-loading": "^1.2.2",
     "vue": "^3.3.4",
     "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",
@@ -91,6 +90,13 @@
     "@types/lodash-es": "^4.17.6",
     "@types/luxon": "^3.2.0",
     "@types/uuid": "^8.3.2",
-    "miragejs": "^0.1.47"
+    "miragejs": "^0.1.47",
+    "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/google-auth/disabled.dark.png b/packages/editor-ui/public/google-auth/disabled.dark.png
new file mode 100644
index 0000000000..485757f374
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 0000000000..369a6ca24d
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 0000000000..f27bb24330
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 0000000000..4cb85e9b55
Binary files /dev/null and b/packages/editor-ui/public/google-auth/pressed.dark.png differ
diff --git a/packages/editor-ui/public/n8n-beta-logo-dark-mode.svg b/packages/editor-ui/public/n8n-beta-logo-dark-mode.svg
new file mode 100644
index 0000000000..7253fbe02b
--- /dev/null
+++ b/packages/editor-ui/public/n8n-beta-logo-dark-mode.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/n8n-beta-logo.svg b/packages/editor-ui/public/n8n-beta-logo.svg
index 47e8f6f96e..d4fb970c62 100644
--- a/packages/editor-ui/public/n8n-beta-logo.svg
+++ b/packages/editor-ui/public/n8n-beta-logo.svg
@@ -1,15 +1 @@
-<svg width="201" height="40" viewBox="0 0 201 40" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_15_2918)">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M78.9736 8C78.9736 12.4183 75.3919 16 70.9736 16C67.246 16 64.1138 13.4505 63.2257 10H52.0564C50.101 10 48.4323 11.4137 48.1108 13.3424L47.782 15.3152C47.4698 17.1883 46.5223 18.8185 45.1824 20C46.5223 21.1815 47.4698 22.8117 47.782 24.6848L48.1108 26.6576C48.4323 28.5863 50.101 30 52.0564 30H55.2257C56.1138 26.5495 59.246 24 62.9736 24C67.3919 24 70.9736 27.5817 70.9736 32C70.9736 36.4183 67.3919 40 62.9736 40C59.246 40 56.1138 37.4505 55.2257 34H52.0564C48.1457 34 44.8082 31.1727 44.1653 27.3152L43.8364 25.3424C43.515 23.4137 41.8462 22 39.8909 22H36.628C35.6294 25.2801 32.5802 27.6667 28.9736 27.6667C25.367 27.6667 22.3179 25.2801 21.3193 22H16.628C15.6294 25.2801 12.5802 27.6667 8.97363 27.6667C4.55536 27.6667 0.973633 24.0849 0.973633 19.6667C0.973633 15.2484 4.55536 11.6667 8.97363 11.6667C12.8204 11.6667 16.033 14.3817 16.7998 18H21.1475C21.9143 14.3817 25.1269 11.6667 28.9736 11.6667C32.8204 11.6667 36.033 14.3817 36.7998 18H39.8909C41.8462 18 43.515 16.5863 43.8364 14.6576L44.1653 12.6848C44.8082 8.8273 48.1457 6 52.0564 6H63.2257C64.1138 2.54955 67.246 0 70.9736 0C75.3919 0 78.9736 3.58172 78.9736 8ZM74.9736 8C74.9736 10.2091 73.1828 12 70.9736 12C68.7645 12 66.9736 10.2091 66.9736 8C66.9736 5.79086 68.7645 4 70.9736 4C73.1828 4 74.9736 5.79086 74.9736 8ZM8.97363 23.6667C11.1828 23.6667 12.9736 21.8758 12.9736 19.6667C12.9736 17.4575 11.1828 15.6667 8.97363 15.6667C6.76449 15.6667 4.97363 17.4575 4.97363 19.6667C4.97363 21.8758 6.76449 23.6667 8.97363 23.6667ZM28.9736 23.6667C31.1828 23.6667 32.9736 21.8758 32.9736 19.6667C32.9736 17.4575 31.1828 15.6667 28.9736 15.6667C26.7645 15.6667 24.9736 17.4575 24.9736 19.6667C24.9736 21.8758 26.7645 23.6667 28.9736 23.6667ZM62.9736 36C65.1828 36 66.9736 34.2091 66.9736 32C66.9736 29.7909 65.1828 28 62.9736 28C60.7645 28 58.9736 29.7909 58.9736 32C58.9736 34.2091 60.7645 36 62.9736 36Z" fill="#EA4B71"/>
-<path d="M86.9785 30.001H91.1554V21.1578C91.1554 18.2536 92.9175 16.981 94.908 16.981C96.8659 16.981 98.3996 18.2862 98.3996 20.962V30.001H102.576V20.1136C102.576 15.8389 100.096 13.3589 96.2133 13.3589C93.7659 13.3589 92.3954 14.3378 91.4164 15.6104H91.1554L90.7964 13.6852H86.9785V30.001Z" fill="#101330"/>
-<path d="M118.563 19.0041V18.8083C119.999 18.0904 121.435 16.8504 121.435 14.4031C121.435 10.8789 118.53 8.75781 114.517 8.75781C110.405 8.75781 107.468 11.0094 107.468 14.4683C107.468 16.8178 108.839 18.0904 110.34 18.8083V19.0041C108.676 19.5915 106.685 21.3536 106.685 24.2904C106.685 27.8473 109.622 30.3273 114.484 30.3273C119.346 30.3273 122.185 27.8473 122.185 24.2904C122.185 21.3536 120.227 19.6241 118.563 19.0041ZM114.484 11.7599C116.116 11.7599 117.323 12.8041 117.323 14.5662C117.323 16.3283 116.083 17.3726 114.484 17.3726C112.885 17.3726 111.547 16.3283 111.547 14.5662C111.547 12.7715 112.82 11.7599 114.484 11.7599ZM114.484 27.1947C112.591 27.1947 111.058 25.9873 111.058 23.9315C111.058 22.0715 112.33 20.6683 114.451 20.6683C116.54 20.6683 117.813 22.0389 117.813 23.9968C117.813 25.9873 116.344 27.1947 114.484 27.1947Z" fill="#101330"/>
-<path d="M126.428 30.001H130.605V21.1578C130.605 18.2536 132.367 16.981 134.358 16.981C136.316 16.981 137.849 18.2862 137.849 20.962V30.001H142.026V20.1136C142.026 15.8389 139.546 13.3589 135.663 13.3589C133.216 13.3589 131.845 14.3378 130.866 15.6104H130.605L130.246 13.6852H126.428V30.001Z" fill="#101330"/>
-</g>
-<rect x="154" y="12.5" width="47" height="19" rx="3" fill="#EA4B71"/>
-<path d="M164.496 21.334C165.196 21.586 166.134 22.272 166.134 23.784C166.134 25.506 164.944 26.5 162.97 26.5H158.966V16.7H162.998C164.93 16.7 165.854 17.708 165.854 19.15C165.854 20.326 165.21 20.914 164.496 21.25V21.334ZM160.772 18.184V20.718H162.718C163.558 20.718 164.006 20.214 164.006 19.444C164.006 18.66 163.502 18.184 162.746 18.184H160.772ZM162.802 25.016C163.754 25.016 164.244 24.442 164.244 23.644C164.244 22.818 163.712 22.202 162.802 22.202H160.772V25.016H162.802ZM170.963 24.89H175.863V26.5H169.157V16.7H175.723V18.31H170.963V20.746H175.065V22.314H170.963V24.89ZM185.606 16.7V18.352H182.834V26.5H180.986V18.352H178.214V16.7H185.606ZM193.795 26.5L192.997 24.134H189.329L188.531 26.5H186.557L190.057 16.7H192.283L195.769 26.5H193.795ZM189.833 22.608H192.493L191.219 18.828H191.107L189.833 22.608Z" fill="white"/>
-<defs>
-<clipPath id="clip0_15_2918">
-<rect width="143" height="40" fill="white"/>
-</clipPath>
-</defs>
-</svg>
+<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/n8n-dev-logo-dark-mode.svg b/packages/editor-ui/public/n8n-dev-logo-dark-mode.svg
new file mode 100644
index 0000000000..23c8b05711
--- /dev/null
+++ b/packages/editor-ui/public/n8n-dev-logo-dark-mode.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/n8n-dev-logo.svg b/packages/editor-ui/public/n8n-dev-logo.svg
index 4752c9ca1b..f8f2b2d437 100644
--- a/packages/editor-ui/public/n8n-dev-logo.svg
+++ b/packages/editor-ui/public/n8n-dev-logo.svg
@@ -1,2 +1 @@
-<svg width="240" height="40" viewBox="0 0 240 40" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#a)"><path fill-rule="evenodd" clip-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.983 7.983 0 0 1-2.6 4.685 7.983 7.983 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 0zm-66 15.667a4 4 0 1 0 0-8 4 4 0 0 0 0 8zm20 0a4 4 0 1 0 0-8 4 4 0 0 0 0 8zm34 12.333a4 4 0 1 0 0-8 4 4 0 0 0 0 8z" fill="#838383"/><path 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.542 5.542 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.286zm-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.806zm0 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.198zm11.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" fill="#101330"/></g><rect x="155.216" y="6.657" width="70.5" height="28.5" rx="4.5" fill="#858585"/><defs><clipPath id="a"><path fill="#fff" d="M0 0h143v40H0z"/></clipPath></defs><path 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.735.48-1.243.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" fill="#fff"/></svg>
+<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/n8n-logo-collapsed.svg b/packages/editor-ui/public/n8n-logo-collapsed.svg
index 62e0c21bb7..f65407694a 100644
--- a/packages/editor-ui/public/n8n-logo-collapsed.svg
+++ b/packages/editor-ui/public/n8n-logo-collapsed.svg
@@ -1,3 +1 @@
-<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>
+<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/n8n-logo-expanded-dark-mode.svg b/packages/editor-ui/public/n8n-logo-expanded-dark-mode.svg
new file mode 100644
index 0000000000..d9a71faffe
--- /dev/null
+++ b/packages/editor-ui/public/n8n-logo-expanded-dark-mode.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/n8n-logo-expanded.svg b/packages/editor-ui/public/n8n-logo-expanded.svg
index 29dbf38f91..337b52be1c 100644
--- a/packages/editor-ui/public/n8n-logo-expanded.svg
+++ b/packages/editor-ui/public/n8n-logo-expanded.svg
@@ -1,6 +1 @@
-<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>
+<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/n8n-logo.svg b/packages/editor-ui/public/n8n-logo.svg
index b4db9b921b..068a738690 100644
--- a/packages/editor-ui/public/n8n-logo.svg
+++ b/packages/editor-ui/public/n8n-logo.svg
@@ -1,34 +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 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>
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" viewBox="0 0 369 105"><path d="M183.9.2c-9.8 0-18 6.7-20.3 15.8h-29.2c-11.5 0-20.8 9.3-20.8 20.8 0 5.7-4.7 10.4-10.4 10.4H99c-2.3-9.1-10.5-15.8-20.3-15.8s-18 6.7-20.3 15.8H41.7c-2.3-9.1-10.5-15.8-20.3-15.8-11.6 0-21 9.4-21 21s9.4 21 21 21c9.8 0 18-6.7 20.3-15.8h16.7c2.3 9.1 10.5 15.8 20.3 15.8 9.7 0 17.9-6.6 20.3-15.6h4.2c5.7 0 10.4 4.7 10.4 10.4 0 11.5 9.3 20.8 20.8 20.8h6.8c2.3 9.1 10.5 15.8 20.3 15.8 11.6 0 21-9.4 21-21s-9.4-21-21-21c-9.8 0-18 6.7-20.3 15.8h-6.8c-5.7 0-10.4-4.7-10.4-10.4 0-6.3-2.8-11.9-7.2-15.7 4.4-3.8 7.2-9.4 7.2-15.7 0-5.7 4.7-10.4 10.4-10.4h29.2c2.3 9.1 10.5 15.8 20.3 15.8 11.6 0 21-9.4 21-21s-9.4-21-21-21M21.4 63c-5.8 0-10.6-4.8-10.6-10.6s4.8-10.6 10.6-10.6S32 46.6 32 52.4 27.3 63 21.4 63m57.3 0c-5.8 0-10.6-4.8-10.6-10.6s4.8-10.6 10.6-10.6 10.6 4.8 10.6 10.6S84.6 63 78.7 63m82.8 10.2c5.8 0 10.6 4.8 10.6 10.6s-4.8 10.6-10.6 10.6-10.6-4.8-10.6-10.6c0-5.9 4.8-10.6 10.6-10.6m22.4-41.4c-5.8 0-10.6-4.8-10.6-10.6s4.8-10.6 10.6-10.6 10.6 4.8 10.6 10.6-4.7 10.6-10.6 10.6" style="fill:#ff6d5a"/><path d="M219.4 47.4c0-1.3-.7-1.8-1.8-1.8h-3.5v-7h7.8c3.6 0 5.4 1.6 5.4 4.7v1.6c0 1.3-.2 2.4-.2 2.4h.2c1.7-3.7 6.7-9.8 16-9.8 10.1 0 14.6 5.5 14.6 16.3v18.4c0 1.3.7 1.8 1.8 1.8h3.5v7h-8.1c-3.8 0-5.4-1.6-5.4-5.4v-20c0-6-1.2-10.7-8-10.7-6.6 0-11.8 4.3-13.5 10.4-.6 1.7-.8 3.6-.8 5.7v19.9h-8.2zm60.9 1.5v-.2s-7.3-3.9-7.3-12.1 6.6-15.9 18.5-15.9c11.4 0 18.6 6.8 18.6 16.1 0 8.8-7.2 14.1-7.2 14.1v.2c5.4 3.1 8.8 7.2 8.8 13.6 0 9.3-8.4 17.4-20.5 17.4-11.2 0-20.7-7-20.7-18 .1-9.8 9.8-15.2 9.8-15.2m11 25.6c6.2 0 12-4.1 12-10 0-5.2-4.5-7.5-10-9.8-2.3-.9-5.5-2.2-6.1-2.2-2.1 0-8.1 4.9-8.1 11.2 0 6.6 5.7 10.8 12.2 10.8m4.3-27c2 0 6.3-5 6.3-10.3 0-5.5-4.4-8.9-10.4-8.9-6.5 0-10.3 3.7-10.3 8.4 0 5.2 4.5 7.2 9.8 9.3 1.2.6 3.6 1.5 4.6 1.5m29.1-.1c0-1.3-.7-1.8-1.8-1.8h-3.5v-7h7.8c3.6 0 5.4 1.6 5.4 4.7v1.6c0 1.3-.2 2.4-.2 2.4h.2c1.7-3.7 6.7-9.8 16-9.8 10.1 0 14.6 5.5 14.6 16.3v18.4c0 1.3.7 1.8 1.8 1.8h3.5v7h-8.1c-3.8 0-5.4-1.6-5.4-5.4v-20c0-6-1.2-10.7-8-10.7-6.6 0-11.8 4.3-13.5 10.4-.6 1.7-.8 3.6-.8 5.7v19.9h-8.2z" style="fill:#384d5b"/></svg>
\ No newline at end of file
diff --git a/packages/editor-ui/public/n8n-nightly-logo-dark-mode.svg b/packages/editor-ui/public/n8n-nightly-logo-dark-mode.svg
new file mode 100644
index 0000000000..a1b5661dcb
--- /dev/null
+++ b/packages/editor-ui/public/n8n-nightly-logo-dark-mode.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/n8n-nightly-logo.svg b/packages/editor-ui/public/n8n-nightly-logo.svg
index 7df119fe5f..bb4746df56 100644
--- a/packages/editor-ui/public/n8n-nightly-logo.svg
+++ b/packages/editor-ui/public/n8n-nightly-logo.svg
@@ -1,2 +1 @@
-<svg width="230" height="40" viewBox="0 0 230 40" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#a)"><path fill-rule="evenodd" clip-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.983 7.983 0 0 1-2.6 4.685 7.983 7.983 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 0zm-66 15.667a4 4 0 1 0 0-8 4 4 0 0 0 0 8zm20 0a4 4 0 1 0 0-8 4 4 0 0 0 0 8zm34 12.333a4 4 0 1 0 0-8 4 4 0 0 0 0 8z" fill="#ea4b71"/><path 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.542 5.542 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.286zm-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.806zm0 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.198zm11.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" fill="#101330"/></g><rect x="154" y="12.5" width="65.001" height="19" rx="4.149" fill="#ea4b71"/><defs><clipPath id="a"><path fill="#fff" d="M0 0h143v40H0z"/></clipPath></defs><path 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.661-.116-1.012-.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" fill="#fff"/></svg>
+<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/form-grey.svg b/packages/editor-ui/public/static/form-grey.svg
index 20e6d2dc26..ce5111a648 100644
--- a/packages/editor-ui/public/static/form-grey.svg
+++ b/packages/editor-ui/public/static/form-grey.svg
@@ -1,40 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   width="50"
-   height="50"
-   viewBox="0 0 50 50"
-   fill="none"
-   version="1.1"
-   id="svg1"
-   sodipodi:docname="form-trigger-icon.svg"
-   inkscape:version="1.3 (0e150ed6c4, 2023-07-21)"
-   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="defs1" />
-  <sodipodi:namedview
-     id="namedview1"
-     pagecolor="#ffffff"
-     bordercolor="#000000"
-     borderopacity="0.25"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     inkscape:zoom="16.44"
-     inkscape:cx="25"
-     inkscape:cy="25"
-     inkscape:window-width="1920"
-     inkscape:window-height="1023"
-     inkscape:window-x="0"
-     inkscape:window-y="29"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg1" />
-  <path
-     d="M47.2666 22.5544C47.2646 22.8648 47.1413 23.162 46.9229 23.3826L40.1183 30.1792C39.9013 30.4029 39.6017 30.5272 39.2901 30.523C38.9789 30.5254 38.6801 30.4012 38.462 30.1792C38.2444 29.9585 38.1225 29.661 38.1225 29.3511C38.1225 29.0412 38.2444 28.7437 38.462 28.523L44.4387 22.5542L43.1262 21.2417L41.7434 22.6558L28.595 35.7808L23.9779 36.5621L24.7592 31.945L25.0951 31.609L27.6576 34.1637C27.8725 34.3906 28.1734 34.5154 28.4857 34.5075C28.7974 34.5125 29.0974 34.3882 29.3139 34.1637C29.5315 33.943 29.6534 33.6455 29.6534 33.3356C29.6534 33.0257 29.5315 32.7282 29.3139 32.5075L26.7514 29.945L35.0014 21.6716L39.2905 17.3825L43.0484 21.0934L44.6655 19.4762L46.9234 21.734C47.1413 21.9517 47.2648 22.2464 47.2671 22.5544L47.2666 22.5544ZM29.9854 37.7028L33.0166 34.6715V42.9682C33.0166 43.3826 32.8521 43.78 32.5589 44.073C32.266 44.3662 31.8685 44.5307 31.4541 44.5307H4.29785C3.88347 44.5307 3.48602 44.3661 3.19302 44.073C2.89989 43.7801 2.73535 43.3826 2.73535 42.9682V14.8432C2.73486 14.4382 2.89177 14.0489 3.17285 13.7573L9.47744 7.22602V12.5698H6.25085C5.83223 12.5698 5.44535 12.7931 5.23606 13.1557C5.02659 13.5183 5.02659 13.9649 5.23606 14.3276C5.44537 14.6902 5.83227 14.9135 6.25085 14.9135H10.6804C10.9913 14.9135 11.2893 14.7899 11.5091 14.5702C11.7288 14.3505 11.8523 14.0525 11.8523 13.7416V5.46826H31.454C31.8684 5.46826 32.2658 5.63281 32.5588 5.92593C32.852 6.21889 33.0165 6.61635 33.0165 7.03076V20.312L22.8602 30.4683C22.691 30.6424 22.5769 30.8625 22.5321 31.1011L21.4305 37.7103C21.3705 38.0843 21.4924 38.4643 21.7587 38.7337C21.9782 38.9536 22.2761 39.0771 22.5868 39.0774H22.7821L29.3838 37.9758C29.6064 37.9448 29.8154 37.8497 29.9853 37.7024L29.9854 37.7028ZM8.98535 21.7028C8.98747 22.013 9.11149 22.3099 9.33089 22.5291C9.55013 22.7485 9.84702 22.8725 10.1572 22.8746H25.4231C25.8417 22.8746 26.2286 22.6513 26.4379 22.2887C26.6473 21.9261 26.6473 21.4795 26.4379 21.1169C26.2285 20.7542 25.8416 20.5309 25.4231 20.5309H10.1572C9.84636 20.5309 9.54835 20.6545 9.3286 20.8742C9.10888 21.0939 8.98534 21.392 8.98534 21.7028L8.98535 21.7028ZM19.6962 36.4686C19.6962 36.1577 19.5727 35.8597 19.3529 35.64C19.1332 35.4203 18.8352 35.2967 18.5243 35.2967H10.1572C9.73859 35.2967 9.35171 35.52 9.14242 35.8826C8.93295 36.2453 8.93295 36.6919 9.14242 37.0545C9.35173 37.4171 9.73863 37.6404 10.1572 37.6404H18.5243C18.8352 37.6404 19.1332 37.5169 19.3529 37.2972C19.5726 37.0774 19.6962 36.7794 19.6962 36.4685V36.4686ZM20.5556 29.0778C20.5556 28.7669 20.432 28.4689 20.2123 28.2491C19.9926 28.0294 19.6945 27.9059 19.3837 27.9059H10.157C9.73838 27.9059 9.35151 28.1292 9.14222 28.4918C8.93274 28.8544 8.93274 29.3011 9.14222 29.6637C9.35152 30.0263 9.73842 30.2496 10.157 30.2496H19.3837C19.695 30.2517 19.9943 30.1288 20.2145 29.9086C20.4348 29.6884 20.5576 29.3891 20.5555 29.0777L20.5556 29.0778ZM45.751 18.6169C46.042 18.3241 46.2054 17.9281 46.2054 17.5154C46.2054 17.1026 46.042 16.7066 45.751 16.4138L44.1104 14.7731C43.8176 14.4821 43.4216 14.3187 43.0088 14.3187C42.596 14.3187 42.2 14.4821 41.9072 14.7731L40.9775 15.7028L44.8291 19.5309L45.751 18.6169Z"
-     fill="#00B7BC"
-     id="path1"
-     style="fill:#7d7d87;fill-opacity:1" />
-</svg>
+<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/webhook-icon.svg b/packages/editor-ui/public/static/webhook-icon.svg
index 87c4107180..f2c5a0eaf1 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+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PjYixq965YMAAQLrKTCqquofU0rjtyt8+/bt299RluXx9RzI3gQIECBAgAABAgQIECBAgECzBBSwmnWe0hAgQIAAAQIECBAgQIAAgTUVuOiii+5w4sSJR6SUxq9w9UMppbus6QA2I0CAwEkK5JyPppT+dlzIioi3z87Ovj8ixm9j6IMAAQIECBAgQIAAAQIECBAgcEoCClinxOYmAgQIECBAgAABAgQIECDQToGyLKcXFxcfnnP+oXHhKiLu304JqQkQaJDAx3POf5JSestoNHr7/Pz80QZlE4UAAQIEJl5g/KM6PeCJPyYDEiBAgAABAgRuRUAByyNCgAABAgQIECBAgAABAgQI3KLAvn37vnlpaelRKaUnjD8jYgcyAgQINFRgKef83qIo3phSeuPMzMylDc0pFgECBAgQIECAAAECBAgQILCCAgpYK4hpKQIECBAgQIAAAQIECBAg0ASBnTt3Tp177rkPiIjHVFU1Ll09LCJ8D6EJhysDAQInJZBzvmL8NoUppTcdO3bsbYcOHbr+pBZwMQECBAgQIECAAAECBAgQINAKAd88bcUxC0mAAAECBAgQIECAAAECBG5ZoNvtnpFSGr+l4I9FxA9GxFnMCBAgQOC/BXLOR3POby+K4s1TU1N/vH///s/yIUCAAAECBAgQIECAAAECBAiMBRSwPAcECBAgQIAAAQIECBAgQKClAhdeeOE3FUXxwymlnSmlH4iITS2lEJsAAQInK1BVVfWBqampN6WU/mhmZuYjJ7uA609WYPyt7HyyN7meAAECBAgQIECAAAECBAisiYAC1pow24QAAQIECBAgQIAAAQIECEyGQL/fPyfn/ISIeHxEPCoipidjMlMQIECgvgI3vFXhuIx1ZDAYvFtTqL5naXICBAgQIECAAAECBAgQIHAqAgpYp6LmHgIECBAgQIAAAQIECBAgUB+BtG/fvocuLS39j6Ioxm8veJ/6jG5SAgQI1FLg4znn10fE66+88sp3HDlyZFTLFIYmQIAAAQIECBAgQIAAAQIEli2ggLVsKhcSIECAAAECBAgQIECAAIHaCKRut/td47cWjIgnRcRdazO5QQkQINAsgS9ExBsi4jVbtmz587Isl5oVTxoCBAgQIECAAAECBAgQIEBgLKCA5TkgQIAAAQIECBAgQIAAAQINEej1evcdl65yzk+LiHs2JJYY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Z7WUQWwCBAgQIEDgvwVO5JxffuLEiRccPHjwU2AIECBAgAABAgQIECBAgMCkCShgTdqJmGcdBcb/d8jruL+tCRAgQIAAAQIECLRboCzLrQsLC8+OiH5EnN1uDekJECBAgACBmxE4nnN+xfT0dLl///7/IESAAAECBAgQIECAAAECBCZFQAFrUk7CHAQIECBAgAABAgQIEGipQFmWGxcXF3+6qqoypXTHljKITYAAAQIECCxTIOd8NCIumZ6e3r9///7PLvM2lxEgQIAAAQIECBAgQIAAgVUTUMBaNVoLEyBAgAABAgQIECBAgMAtCZRlOb24uPjMnPOvRsS30CJAgAABAgQInKTAl1NKB3POBweDwZdO8l6XEyBAgAABAgQIECBAgACBFRNQwFoxSgsRIECAAAECBAgQIECAwDIFUrfb/YmU0osi4l7LvMdlBAgQIECAAIFvJPDFiJjbsmXLi8uyPIaJAAECBAgQIECAAAECBAistYAC1lqL248AAQIECBAgQIAAAQItFuh0OuenlAYppfNbzCA6AQIECBAgsDoCn04p/drmzZt/tyzLpdXZwqoECBAgQIAAAQIECBAgQODrBRSwPBUECBAgQIAAAQIECBAgsOoCe/fuvd/U1NSvRMTOVd/MBgQIECBAgECrBaqq+khE/Mrc3NxrIyK3GkN4AgQIECBAgAABAgQIEFgTAQWsNWG2CQECBAgQIECAAAECBNopcOGFF95tamrqopTSsyKiaKeC1AQIECBAgMA6Cbw3IrqDweAd67S/bQkQIECAAAECBAgQIECgJQIKWC05aDEJECBAgAABAgQIECCwlgKdTufsoijGr3g1Ll5tWMu97UWAAAECBAgQuInA64ui2DczMzN+ZSwfBAgQIECAAAECBAgQIEBgxQUUsFac1IIECBAgQIAAAQIECBBor0BZlhsXFhZ+NiJeEBG3aa+E5AQIECBAgMCECVQ551dFRH84HH56wmYzDgECBAgQIECAAAECBAjUXEABq+YHaHwCBAgQIECAAAECBAhMiEDq9XpPiYiZiLjrhMxkDAIECBAgQIDATQWORcRvbNmyZVCW5XV4CBAgQIAAAQIECBAgQIDASggoYK2EojUIECBAgAABAgQIECDQYoFut/vQ8Q8yU0rnt5hBdAIECBAgQKBGAjnn/yiKorz88ssvOXLkyKhGoxuV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CEywQKfTeWRRFK+LiNtN8JhGI0CAAAECBAgQIFB7gZTSqzZv3vyssiwXax9GAAIECBAgQIAAAQIECCxDQAFrGUguIUCAAAECBAgQIECg3gKdTueni6J4WURsrHcS0xMgQIAAAQIECBCojcDf5Zx/fDgcfro2ExuUAAECBAgQIECAAAECpyiggHWKcG4jQIAAAQIECBAgQKAWAqnf7/9qzvlXazGtIQkQIECAAAECBAg0S+DTVVU9YW5u7v3NiiUNAQIECBAgQIAAAQIEvlZAAcsTQYAAAQIECBAgQIBAIwXKstx87Nix300pPaWRAYUiQIAAAQIECBAgUA+B6yLiqYPB4I31GNeUBAgQIECAAAECBAgQOHkBBayTN3MHAQIECBAgQIAAAQITLnDRRRfd8cSJE28oiuIhEz6q8QgQIECAAAECBAi0QWCUc/6F4XD44jaElZEAAQIECBAgQIAAgfYJKGC178wlJkCAAAECBAgQINBogV6vd/+U0htzzndrdFDhCBAgQIAAAQIECNRMIOd8eOvWrc8ty3KpZqMblwABAgQIECBAgAABArcooIDlASFAgAABAgQIECBAoDECvV7vcRHxmoi4TWNCCUKAAAECBAgQIECgWQJ/euzYsf956NChLzcrljQECBAgQIAAAQIECLRZQAGrzacvOwECBAgQIECAAIEGCfT7/V0559+KiOkGxRKFAAECBAgQIECAQBMFPhgRjx8MBh9vYjiZCBAgQIAAAQIECBBon4ACVvvOXGICBAgQIECAAAECjRLYuXPn1N3vfvffLIriuY0KJgwBAgQIECBAgACBZgt8qqqqH52bm3t/s2NKR4AAAQIECBAgQIBAGwQUsNpwyjISIECAAAECBAgQaKjAnj17tmzcuPFVEfHjDY0oFgECBAgQIECAAIEmC1wXEU8eDAZvbnJI2QgQIECAAAECBAgQaL6AAlbzz1hCAgQIECBAgAABAo0U2LNnz1kbNmx4fUrpexsZUCgCBAgQIECAAAEC7RAYRcRzB4PBy9oRV0oCBAgQIECAAAECBJoooIDVxFOViQABAgQIECBAgEDDBfr9/t1Ho9Fbi6K4d8OjikeAAAECBAgQIECgFQI558FwOOy3IqyQBAgQIECAAAECBAg0TkABq3FHKhABAgQIECBAgACBZgvs3bv326empt4SEXdqdlLpCBAg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VpIAAQIECBAgQIAAgVoL5Jw/UhTFL3S73etrXVS5sRYwgDXWx9PccHv27LntysrKh1JK92muguYECBAgQIAAAQIECFRMYPho87nFxcV+xXKLS4AAAQINEuh0Oj+ac353RPxwg2qrSoAAAQIECBAgQIBAfQX+uSzLHf1+/wv1rahZFQQMYFXhlBqacfhJvMFgcHFE/HhDCdQmQIAAAQIECBAgQKA6Amsppbler3egOpElJUCAAIGmCXQ6nYflnC+IiNs0rbu+BAgQIECAAAECBAjUUuCyycnJB+zfv/8ztWynVKUEDGBV6riaF/arT8L6YErpJ5vXXmMCBAgQIECAAAECBCoiMMg5n97v9xcrkldMAgQIEGigQLvd3hsRfxwRkw2srzIBAgQIECBAgAABAvUTuGJtbe0BBw8e/ET9qmlURQEDWFU8tYZlHg5hra6ufiAifqph1dUlQIAAAQIECBAgQGD8BXzt4PifkYQECBBotMCOHTsmf/AHf/CPcs6/0WgI5QkQIECAAAECBAgQqJPA1ZOTkw/cv3//v9eplC7VFjCAVe3za0x6Q1iNOWpFCRAgQIAAAQIECFRJYHViYuK0hYWFd1YptKwECBAg0ByBubm5E8qyfHtE7GhOa00JECBAgAABAgQIEKi5wBfLsnxwv9//3zXvqV7FBAxgVezAmhzXEFaTT193AgQIECBAgAABAmMnsFKW5WkHDhx419glE4gAAQIECETE7OzsySmlD0fEKUAIECBAgAABAgQIECBQE4Fri6J42MLCwkdq0keNGgkYwKrRYTahyleHsP4sIn66CX11JECAAAECBAgQIEBgLAVWcs6/0u/3/3Qs0wlFgAABAgQiYmZmZmJqauq8lNIeIAQIECBAgAABAgQIEKiBwA0R8fBer3eoBl1UqKGAAawaHmrdKxnCqvsJ60eAAAECBAgQIEBgrAWGT756woEDBy4c65TCESBAgACB/xJI7Xb79RHxFCAECBAgQIAAAQIECBCosMCNg8HgEQcOHPjzCncQveYCBrBqfsB1rTczM3ObqampD3gSVl1PWC8CBAgQIECAAAEC4yeQUlrOOT9hcXHxPeOXTiICBAgQIPBdBYZDWOdExFMZESBAgAABAgQIECBAoIICKymlx3a73fdVMLvIDRIwgNWgw65b1VardVxK6f2GsOp2svoQIECAAAEC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"/>
-</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+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PjYixq965YMAAQLrKTCqquofU0rjtyt8+/bt299RluXx9RzI3gQIECBAgAABAgQIECBAgECzBBSwmnWe0hAgQIAAAQIECBAgQIAAgTUVuOiii+5w4sSJR6SUxq9w9UMppbus6QA2I0CAwEkK5JyPppT+dlzIioi3z87Ovj8ixm9j6IMAAQIECBAgQIAAAQIECBAgcEoCClinxOYmAgQIECBAgAABAgQIECDQToGyLKcXFxcfnnP+oXHhKiLu304JqQkQaJDAx3POf5JSestoNHr7/Pz80QZlE4UAAQIEJl5g/KM6PeCJPyYDEiBAgAABAgRuRUAByyNCgAABAgQIECBAgAABAgQI3KLAvn37vnlpaelRKaUnjD8jYgcyAgQINFRgKef83qIo3phSeuPMzMylDc0pFgECBAgQIECAAAECBAgQILCCAgpYK4hpKQIECBAgQIAAAQIECBAg0ASBnTt3Tp177rkPiIjHVFU1Ll09LCJ8D6EJhysDAQInJZBzvmL8NoUppTcdO3bsbYcOHbr+pBZwMQECBAgQIECAAAECBAgQINAKAd88bcUxC0mAAAECBAgQIECAAAECBG5ZoNvtnpFSGr+l4I9FxA9GxFnMCBAgQOC/BXLOR3POby+K4s1TU1N/vH///s/yIUCAAAECBAgQIECAAAECBAiMBRSwPAcECBAgQIAAAQIECBAgQKClAhdeeOE3FUXxwymlnSmlH4iITS2lEJsAAQInK1BVVfWBqampN6WU/mhmZuYjJ7uA609WYPyt7HyyN7meAAECBAgQIECAAAECBAisiYAC1pow24QAAQIECBAgQIAAAQIECEyGQL/fPyfn/ISIeHxEPCoipidjMlMQIECgvgI3vFXhuIx1ZDAYvFtTqL5naXICBAgQIECAAAECBAgQIHAqAgpYp6LmHgIECBAgQIAAAQIECBAgUB+BtG/fvocuLS39j6Ioxm8veJ/6jG5SAgQI1FLg4znn10fE66+88sp3HDlyZFTLFIYmQIAAAQIECBAgQIAAAQIEli2ggLVsKhcSIECAAAECBAgQIECAAIHaCKRut/td47cWjIgnRcRdazO5QQkQINAsgS9ExBsi4jVbtmz587Isl5oVTxoCBAgQIECAAAECBAgQIEBgLKCA5TkgQIAAAQIECBAgQIAAAQINEej1evcdl65yzk+LiHs2JJYY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Z7WUQWwCBAgQIEDgvwVO5JxffuLEiRccPHjwU2AIECBAgAABAgQIECBAgMCkCShgTdqJmGcdBcb/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/t1Ho9Fbi6K4d8OjikeAAAECBAgQIECgFQI558FwOOy3IqyQBAgQIECAAAECBAg0TkABq3FHKhABAgQIECBAgACBZgvs3bv326empt4SEXdqdlLpCBAg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VpIAAQIECBAgQIAAgVoL5Jw/UhTFL3S73etrXVS5sRYwgDXWx9PccHv27LntysrKh1JK92muguYECBAgQIAAAQIECFRMYPho87nFxcV+xXKLS4AAAQINEuh0Oj+ac353RPxwg2qrSoAAAQIECBAgQIBAfQX+uSzLHf1+/wv1rahZFQQMYFXhlBqacfhJvMFgcHFE/HhDCdQmQIAAAQIECBAgQKA6Amsppbler3egOpElJUCAAIGmCXQ6nYflnC+IiNs0rbu+BAgQIECAAAECBAjUUuCyycnJB+zfv/8ztWynVKUEDGBV6riaF/arT8L6YErpJ5vXXmMCBAgQIECAAAECBCoiMMg5n97v9xcrkldMAgQIEGigQLvd3hsRfxwRkw2srzIBAgQIECBAgAABAvUTuGJtbe0BBw8e/ET9qmlURQEDWFU8tYZlHg5hra6ufiAifqph1dUlQIAAAQIECBAgQGD8BXzt4PifkYQECBBotMCOHTsmf/AHf/CPcs6/0WgI5QkQIECAAAECBAgQqJPA1ZOTkw/cv3//v9eplC7VFjCAVe3za0x6Q1iNOWpFCRAgQIAAAQIECFRJYHViYuK0hYWFd1YptKwECBAg0ByBubm5E8qyfHtE7GhOa00JECBAgAABAgQIEKi5wBfLsnxwv9//3zXvqV7FBAxgVezAmhzXEFaTT193AgQIECBAgAABAmMnsFKW5WkHDhx419glE4gAAQIECETE7OzsySmlD0fEKUAIECBAgAABAgQIECBQE4Fri6J42MLCwkdq0keNGgkYwKrRYTahyleHsP4sIn66CX11JECAAAECBAgQIEBgLAVWcs6/0u/3/3Qs0wlFgAABAgQiYmZmZmJqauq8lNIeIAQIECBAgAABAgQIEKiBwA0R8fBer3eoBl1UqKGAAawaHmrdKxnCqvsJ60eAAAECBAgQIEBgrAWGT756woEDBy4c65TCESBAgACB/xJI7Xb79RHxFCAECBAgQIAAAQIECBCosMCNg8HgEQcOHPjzCncQveYCBrBqfsB1rTczM3ObqampD3gSVl1PWC8CBAgQIECAAAEC4yeQUlrOOT9hcXHxPeOXTiICBAgQIPBdBYZDWOdExFMZESBAgAABAgQIECBAoIICKymlx3a73fdVMLvIDRIwgNWgw65b1VardVxK6f2GsOp2svoQIECAAAEC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" 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 35e2170513..ef2a3738ea 100644
--- a/packages/editor-ui/src/App.vue
+++ b/packages/editor-ui/src/App.vue
@@ -10,19 +10,20 @@
 			}"
 		>
 			<div id="banners" :class="$style.banners">
-				<banner-stack v-if="!isDemoMode" />
+				<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">
 				<router-view v-slot="{ Component }">
-					<keep-alive include="NodeView" :max="1">
+					<keep-alive v-if="$route.meta.keepWorkflowAlive" include="NodeView" :max="1">
 						<component :is="Component" />
 					</keep-alive>
+					<component :is="Component" v-else />
 				</router-view>
 			</div>
 			<Modals />
@@ -39,26 +40,25 @@ 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, LOCAL_STORAGE_THEME, VIEWS } from '@/constants';
+import { HIRING_BANNER, VIEWS } from '@/constants';
 
 import { userHelpers } from '@/mixins/userHelpers';
 import { loadLanguage } from '@/plugins/i18n';
-import { useGlobalLinkActions, useTitleChange, useToast, useExternalHooks } from '@/composables';
-import {
-	useUIStore,
-	useSettingsStore,
-	useUsersStore,
-	useRootStore,
-	useTemplatesStore,
-	useNodeTypesStore,
-	useCloudPlanStore,
-	useSourceControlStore,
-	useUsageStore,
-} from '@/stores';
+import useGlobalLinkActions from '@/composables/useGlobalLinkActions';
+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';
-import { ExpressionEvaluatorProxy } from 'n8n-workflow';
+import { initializeAuthenticatedFeatures } from '@/init';
 
 export default defineComponent({
 	name: 'App',
@@ -68,15 +68,13 @@ export default defineComponent({
 		Telemetry,
 		Modals,
 	},
-	mixins: [newVersions, userHelpers],
-	setup(props) {
+	mixins: [userHelpers],
+	setup() {
 		return {
 			...useGlobalLinkActions(),
 			...useHistoryHelper(useRoute()),
 			...useToast(),
 			externalHooks: useExternalHooks(),
-			// eslint-disable-next-line @typescript-eslint/no-misused-promises
-			...newVersions.setup?.(props),
 		};
 	},
 	computed: {
@@ -100,172 +98,35 @@ export default defineComponent({
 	},
 	data() {
 		return {
-			postAuthenticateDone: false,
-			settingsInitialized: false,
+			onAfterAuthenticateInitialized: false,
 			loading: true,
 		};
 	},
+	watch: {
+		// eslint-disable-next-line @typescript-eslint/naming-convention
+		async 'usersStore.currentUser'(currentValue, previousValue) {
+			if (currentValue && !previousValue) {
+				await initializeAuthenticatedFeatures();
+			}
+		},
+		defaultLocale(newLocale) {
+			void loadLanguage(newLocale);
+		},
+	},
+	async mounted() {
+		this.logHiringBanner();
+
+		void initializeAuthenticatedFeatures();
+
+		void useExternalHooks().run('app.mount');
+		this.loading = false;
+	},
 	methods: {
-		async initSettings(): Promise<void> {
-			// The settings should only be initialized once
-			if (this.settingsInitialized) return;
-
-			try {
-				await this.settingsStore.getSettings();
-				this.settingsInitialized = true;
-				// Re-compute title since settings are now available
-				useTitleChange().titleReset();
-			} catch (e) {
-				this.showToast({
-					title: this.$locale.baseText('startupError'),
-					message: this.$locale.baseText('startupError.message'),
-					type: 'error',
-					duration: 0,
-					dangerouslyUseHTMLString: true,
-				});
-
-				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.isDemoMode) {
 				console.log(HIRING_BANNER);
 			}
 		},
-		async checkForCloudData() {
-			await this.cloudPlanStore.checkForCloudPlanData();
-			await this.cloudPlanStore.fetchUserCloudAccount();
-		},
-		async initialize(): Promise<void> {
-			await this.initSettings();
-			ExpressionEvaluatorProxy.setEvaluator(useSettingsStore().settings.expressions.evaluator);
-			await Promise.all([this.loginWithCookie(), this.initTemplates()]);
-		},
-		trackPage(): void {
-			this.uiStore.currentView = this.$route.name || '';
-			if (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);
-		},
-		async authenticate() {
-			// redirect to setup page. user should be redirected to this only once
-			if (this.settingsStore.showSetupPage) {
-				if (this.$route.name === VIEWS.SETUP) {
-					return;
-				}
-
-				return this.$router.replace({ name: VIEWS.SETUP });
-			}
-
-			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}`);
-				return this.$router.replace({ name: VIEWS.SIGNIN, query: { redirect } });
-			}
-
-			// 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
-					return this.$router.replace(redirect);
-				}
-			}
-
-			// if cannot access page and is logged in
-			return this.$router.replace({ name: VIEWS.HOMEPAGE });
-		},
-		async redirectIfNecessary() {
-			const redirect =
-				this.$route.meta &&
-				typeof this.$route.meta.getRedirect === 'function' &&
-				this.$route.meta.getRedirect();
-
-			if (redirect) {
-				return this.$router.replace(redirect);
-			}
-			return;
-		},
-		setTheme() {
-			const theme = window.localStorage.getItem(LOCAL_STORAGE_THEME);
-			if (theme) {
-				window.document.body.classList.add(`theme-${theme}`);
-			}
-		},
-		async postAuthenticate() {
-			if (this.postAuthenticateDone) {
-				return;
-			}
-
-			if (!this.usersStore.currentUser) {
-				return;
-			}
-
-			if (this.sourceControlStore.isEnterpriseSourceControlEnabled) {
-				await this.sourceControlStore.getPreferences();
-			}
-
-			this.postAuthenticateDone = true;
-		},
-	},
-	async created() {
-		this.setTheme();
-		await this.initialize();
-		this.logHiringBanner();
-		await this.authenticate();
-		await this.redirectIfNecessary();
-		void this.checkForNewVersions();
-		await this.checkForCloudData();
-		void this.postAuthenticate();
-
-		this.loading = false;
-
-		this.trackPage();
-		void this.externalHooks.run('app.mount');
-
-		if (this.defaultLocale !== 'en') {
-			await this.nodeTypesStore.getNodeTranslationHeaders();
-		}
-	},
-	watch: {
-		'usersStore.currentUser'(currentValue, previousValue) {
-			if (currentValue && !previousValue) {
-				void this.postAuthenticate();
-			}
-		},
-		async $route(route) {
-			await this.initSettings();
-			await this.redirectIfNecessary();
-
-			this.trackPage();
-		},
-		defaultLocale(newLocale) {
-			void loadLanguage(newLocale);
-		},
 	},
 });
 </script>
diff --git a/packages/editor-ui/src/Interface.ts b/packages/editor-ui/src/Interface.ts
index ecd71cd7ad..61fd657531 100644
--- a/packages/editor-ui/src/Interface.ts
+++ b/packages/editor-ui/src/Interface.ts
@@ -6,49 +6,52 @@ import type {
 	TRIGGER_NODE_CREATOR_VIEW,
 	REGULAR_NODE_CREATOR_VIEW,
 	AI_OTHERS_NODE_CREATOR_VIEW,
+	VIEWS,
 } from './constants';
-
 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,
-	IDisplayOptions,
-	IExecutionsSummary,
-	FeatureFlags,
-	ExecutionStatus,
-	ITelemetryTrackProperties,
-	IUserManagementSettings,
-	WorkflowSettings,
-	IUserSettings,
-	IN8nUISettings,
-	BannerName,
-	INodeExecutionData,
-	INodeProperties,
+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 IExecutionsSummary,
+	type FeatureFlags,
+	type ExecutionStatus,
+	type ITelemetryTrackProperties,
+	type IUserManagementSettings,
+	type WorkflowSettings,
+	type IUserSettings,
+	type IN8nUISettings,
+	type BannerName,
+	type INodeExecutionData,
+	type INodeProperties,
+	type NodeConnectionType,
+	type INodeCredentialsDetails,
 } from 'n8n-workflow';
 import type { BulkCommand, Undoable } from '@/models/history';
 import type { PartialBy, TupleToUnion } from '@/utils/typeHelpers';
 import type { Component } from 'vue';
+import type { Scope } from '@n8n/permissions';
 
 export * from 'n8n-design-system/types';
 
@@ -91,13 +94,20 @@ declare global {
 			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;
+		Appcues?: {
+			track(event: string, properties?: ITelemetryTrackProperties): void;
+		};
 	}
 }
 
@@ -154,10 +164,6 @@ export interface INodeTypesMaxCount {
 	};
 }
 
-export interface IExternalHooks {
-	run(eventName: string, metadata?: IDataObject): Promise<void>;
-}
-
 export interface INodeTranslationHeaders {
 	data: {
 		[key: string]: {
@@ -221,6 +227,7 @@ export interface IWorkflowData {
 	tags?: string[];
 	pinData?: IPinData;
 	versionId?: string;
+	meta?: WorkflowMetadata;
 }
 
 export interface IWorkflowDataUpdate {
@@ -237,15 +244,25 @@ export interface IWorkflowDataUpdate {
 }
 
 export interface IWorkflowToShare extends IWorkflowDataUpdate {
-	meta?: {
-		instanceId: string;
-	};
+	meta?: WorkflowMetadata;
+}
+
+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: Pick<IWorkflowData, 'nodes' | 'connections' | 'settings' | 'pinData'>;
+	workflow: Pick<IWorkflowData, 'connections' | 'settings' | 'pinData'> & {
+		nodes: IWorkflowTemplateNode[];
+	};
 }
 
 export interface INewWorkflowData {
@@ -255,6 +272,9 @@ export interface INewWorkflowData {
 
 export interface WorkflowMetadata {
 	onboardingId?: string;
+	templateId?: string;
+	instanceId?: string;
+	templateCredsSetupCompleted?: boolean;
 }
 
 // Almost identical to cli.Interfaces.ts
@@ -356,6 +376,7 @@ export interface IExecutionPushResponse {
 
 export interface IExecutionResponse extends IExecutionBase {
 	id: string;
+	status: string;
 	data?: IRunExecutionData;
 	workflowData: IWorkflowDb;
 	executedNode?: string;
@@ -406,6 +427,16 @@ 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
@@ -415,7 +446,27 @@ export type IPushData =
 	| PushDataReloadNodeType
 	| PushDataRemoveNodeType
 	| PushDataTestWebhook
-	| PushDataExecutionRecovered;
+	| PushDataExecutionRecovered
+	| PushDataWorkerStatusMessage
+	| PushDataActiveWorkflowAdded
+	| PushDataActiveWorkflowRemoved
+	| PushDataWorkflowFailedToActivate
+	| PushDataWorkflowUsersChanged;
+
+type PushDataActiveWorkflowAdded = {
+	data: IActiveWorkflowAdded;
+	type: 'workflowActivated';
+};
+
+type PushDataActiveWorkflowRemoved = {
+	data: IActiveWorkflowRemoved;
+	type: 'workflowDeactivated';
+};
+
+type PushDataWorkflowFailedToActivate = {
+	data: IWorkflowFailedToActivate;
+	type: 'workflowFailedToActivate';
+};
 
 type PushDataExecutionRecovered = {
 	data: IPushDataExecutionRecovered;
@@ -462,6 +513,11 @@ type PushDataTestWebhook = {
 	type: 'testWebhookDeleted' | 'testWebhookReceived';
 };
 
+type PushDataWorkerStatusMessage = {
+	data: IPushDataWorkerStatusMessage;
+	type: 'sendWorkerStatusMessage';
+};
+
 export interface IPushDataExecutionStarted {
 	executionId: string;
 	mode: WorkflowExecuteMode;
@@ -480,6 +536,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 };
@@ -519,6 +588,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;
@@ -581,7 +685,9 @@ export type IPersonalizationSurveyVersions =
 	| IPersonalizationSurveyAnswersV2
 	| IPersonalizationSurveyAnswersV3;
 
-export type IRole = 'default' | 'owner' | 'member';
+export type IRole = 'default' | 'owner' | 'member' | 'admin';
+
+export type InvitableRoleName = 'member' | 'admin';
 
 export interface IUserResponse {
 	id: string;
@@ -594,6 +700,7 @@ export interface IUserResponse {
 		id: string;
 		createdAt: Date;
 	};
+	globalScopes?: Scope[];
 	personalizationAnswers?: IPersonalizationSurveyVersions | null;
 	isPending: boolean;
 	signInType?: SignInType;
@@ -613,6 +720,7 @@ export interface IUser extends IUserResponse {
 	fullName?: string;
 	createdAt?: string;
 	mfaEnabled: boolean;
+	globalRoleId?: number;
 }
 
 export interface IVersionNotificationSettings {
@@ -699,6 +807,9 @@ export interface ITemplatesCollectionResponse extends ITemplatesCollectionExtend
 	workflows: ITemplatesWorkflow[];
 }
 
+/**
+ * A template without the actual workflow definition
+ */
 export interface ITemplatesWorkflow {
 	id: number;
 	createdAt: string;
@@ -710,18 +821,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;
 }
 
@@ -765,6 +902,7 @@ export type SimplifiedNodeType = Pick<
 	| 'group'
 	| 'icon'
 	| 'iconUrl'
+	| 'badgeIconUrl'
 	| 'codex'
 	| 'defaults'
 	| 'outputs'
@@ -781,11 +919,13 @@ export interface SubcategoryItemProps {
 	subcategory?: string;
 	defaults?: INodeParameters;
 	forceIncludeNodes?: string[];
+	sections?: string[];
 }
 export interface ViewItemProps {
 	title: string;
 	description: string;
 	icon: string;
+	tag?: string;
 }
 export interface LabelItemProps {
 	key: string;
@@ -826,6 +966,13 @@ export interface SubcategoryCreateElement extends CreateElementBase {
 	type: 'subcategory';
 	properties: SubcategoryItemProps;
 }
+
+export interface SectionCreateElement extends CreateElementBase {
+	type: 'section';
+	title: string;
+	children: INodeCreateElement[];
+}
+
 export interface ViewCreateElement extends CreateElementBase {
 	type: 'view';
 	properties: ViewItemProps;
@@ -847,6 +994,7 @@ export type INodeCreateElement =
 	| NodeCreateElement
 	| CategoryCreateElement
 	| SubcategoryCreateElement
+	| SectionCreateElement
 	| ViewCreateElement
 	| LabelCreateElement
 	| ActionCreateElement;
@@ -899,6 +1047,7 @@ export interface IVersionNode {
 }
 
 export interface ITemplatesNode extends IVersionNode {
+	id: number;
 	categories?: ITemplatesCategory[];
 }
 
@@ -939,6 +1088,9 @@ export interface RootState {
 	baseUrl: string;
 	restEndpoint: string;
 	defaultLocale: string;
+	endpointForm: string;
+	endpointFormTest: string;
+	endpointFormWaiting: string;
 	endpointWebhook: string;
 	endpointWebhookTest: string;
 	pushConnectionActive: boolean;
@@ -967,6 +1119,9 @@ export interface IRootState {
 	activeCredentialType: string | null;
 	baseUrl: string;
 	defaultLocale: string;
+	endpointForm: string;
+	endpointFormTest: string;
+	endpointFormWaiting: string;
 	endpointWebhook: string;
 	endpointWebhookTest: string;
 	executionId: string | null;
@@ -1085,7 +1240,7 @@ export interface NDVState {
 		isDragging: boolean;
 		type: string;
 		data: string;
-		canDrop: boolean;
+		activeTargetId: string | null;
 		stickyPosition: null | XYPosition;
 	};
 	isMappingOnboarded: boolean;
@@ -1121,6 +1276,11 @@ export interface UIState {
 	executionSidebarAutoRefresh: boolean;
 	bannersHeight: number;
 	bannerStack: BannerName[];
+	theme: ThemeOption;
+	suggestedTemplates?: SuggestedTemplates;
+	pendingNotificationsForViews: {
+		[key in VIEWS]?: NotificationOptions[];
+	};
 }
 
 export type IFakeDoor = {
@@ -1149,6 +1309,7 @@ export type NodeFilterType =
 
 export type NodeCreatorOpenSource =
 	| ''
+	| 'context_menu'
 	| 'no_trigger_execution_tooltip'
 	| 'plus_endpoint'
 	| 'add_input_endpoint'
@@ -1156,6 +1317,7 @@ export type NodeCreatorOpenSource =
 	| 'tab'
 	| 'node_connection_action'
 	| 'node_connection_drop'
+	| 'notice_error_message'
 	| 'add_node_button';
 
 export interface INodeCreatorState {
@@ -1167,6 +1329,7 @@ export interface INodeCreatorState {
 }
 
 export interface ISettingsState {
+	initialized: boolean;
 	settings: IN8nUISettings;
 	promptsData: IN8nPrompts;
 	userManagement: IUserManagementSettings;
@@ -1196,23 +1359,26 @@ export interface ISettingsState {
 	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: {
@@ -1231,6 +1397,7 @@ export interface IVersionsState {
 }
 
 export interface IUsersState {
+	initialized: boolean;
 	currentUserId: null | string;
 	users: { [userId: string]: IUser };
 	currentUserCloudInfo: Cloud.UserAccount | null;
@@ -1305,17 +1472,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;
 }
@@ -1423,13 +1579,30 @@ export type NodeAuthenticationOption = {
 	displayOptions?: IDisplayOptions;
 };
 
-export interface ResourceMapperReqParams {
-	nodeTypeAndVersion: INodeTypeNameVersion;
-	path: string;
-	methodName?: string;
-	currentNodeParameters: INodeParameters;
-	credentials?: INodeCredentials;
+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;
@@ -1582,6 +1755,7 @@ export declare namespace Cloud {
 }
 
 export interface CloudPlanState {
+	initialized: boolean;
 	data: Cloud.PlanData | null;
 	usage: InstanceUsage | null;
 	loadingPlan: boolean;
@@ -1616,6 +1790,7 @@ export interface ExternalSecretsProviderWithProperties extends ExternalSecretsPr
 }
 
 export type CloudUpdateLinkSourceType =
+	| 'advanced-permissions'
 	| 'canvas-nav'
 	| 'custom-data-filter'
 	| 'workflow_sharing'
@@ -1629,7 +1804,9 @@ export type CloudUpdateLinkSourceType =
 	| 'usage_page'
 	| 'settings-users'
 	| 'variables'
-	| 'community-nodes';
+	| 'community-nodes'
+	| 'workflow-history'
+	| 'worker-view';
 
 export type UTMCampaign =
 	| 'upgrade-custom-data-filter'
@@ -1645,7 +1822,10 @@ export type UTMCampaign =
 	| 'open'
 	| 'upgrade-users'
 	| 'upgrade-variables'
-	| 'upgrade-community-nodes';
+	| 'upgrade-community-nodes'
+	| 'upgrade-workflow-history'
+	| 'upgrade-advanced-permissions'
+	| 'upgrade-worker-view';
 
 export type N8nBanners = {
 	[key in BannerName]: {
@@ -1677,3 +1857,24 @@ export type ToggleNodeCreatorOptions = {
 	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'>>;
+};
diff --git a/packages/editor-ui/src/__tests__/defaults.ts b/packages/editor-ui/src/__tests__/defaults.ts
new file mode 100644
index 0000000000..ded1b5f322
--- /dev/null
+++ b/packages/editor-ui/src/__tests__/defaults.ts
@@ -0,0 +1,44 @@
+import type { INodeTypeData, INodeTypeDescription } 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);
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 0000000000..6bf6f32999
--- /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 0000000000..3c1bc84a22
--- /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 8ee7edde43..987a654426 100644
--- a/packages/editor-ui/src/__tests__/permissions.spec.ts
+++ b/packages/editor-ui/src/__tests__/permissions.spec.ts
@@ -44,4 +44,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__/router.test.ts b/packages/editor-ui/src/__tests__/router.test.ts
index 0e5bf2e7e4..6d4be7d80a 100644
--- a/packages/editor-ui/src/__tests__/router.test.ts
+++ b/packages/editor-ui/src/__tests__/router.test.ts
@@ -2,6 +2,11 @@ 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 />',
@@ -9,25 +14,104 @@ const App = {
 const renderComponent = createComponentRenderer(App);
 
 describe('router', () => {
-	beforeAll(() => {
+	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],
-		['/workflow/R9JFXwkUCL1jZBuw/debug/29021', VIEWS.EXECUTION_DEBUG],
 		['/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', async (path, name) => {
-		await router.push(path);
-		expect(router.currentRoute.value.name).toBe(name);
-	});
+	])(
+		'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/settings.ts b/packages/editor-ui/src/__tests__/server/endpoints/settings.ts
index 97534dac3a..3fa6cc8e67 100644
--- a/packages/editor-ui/src/__tests__/server/endpoints/settings.ts
+++ b/packages/editor-ui/src/__tests__/server/endpoints/settings.ts
@@ -7,6 +7,9 @@ const defaultSettings: IN8nUISettings = {
 	allowedModules: {},
 	communityNodesEnabled: false,
 	defaultLocale: '',
+	endpointForm: '',
+	endpointFormTest: '',
+	endpointFormWaiting: '',
 	endpointWebhook: '',
 	endpointWebhookTest: '',
 	enterprise: {
@@ -14,12 +17,20 @@ const defaultSettings: IN8nUISettings = {
 		ldap: false,
 		saml: false,
 		logStreaming: false,
+		debugInEditor: false,
 		advancedExecutionFilters: false,
 		variables: true,
 		sourceControl: false,
 		auditLogs: false,
-		versionControl: false,
 		showNonProdBanner: false,
+		workflowHistory: false,
+		debugInEditor: false,
+		binaryDataS3: false,
+		externalSecrets: false,
+		workerView: false,
+	},
+	expressions: {
+		evaluator: 'tournament',
 	},
 	executionMode: 'regular',
 	executionTimeout: 0,
@@ -33,6 +44,7 @@ const defaultSettings: IN8nUISettings = {
 	oauthCallbackUrls: { oauth1: '', oauth2: '' },
 	onboardingCallPromptEnabled: false,
 	personalizationSurveyEnabled: false,
+	releaseChannel: 'stable',
 	posthog: {
 		apiHost: '',
 		apiKey: '',
@@ -43,6 +55,7 @@ const defaultSettings: IN8nUISettings = {
 	},
 	publicApi: { enabled: false, latestVersion: 0, path: '', swaggerUi: { enabled: false } },
 	pushBackend: 'websocket',
+	releaseChannel: 'stable',
 	saveDataErrorExecution: 'DEFAULT',
 	saveDataSuccessExecution: 'DEFAULT',
 	saveManualExecutions: false,
@@ -58,7 +71,7 @@ const defaultSettings: IN8nUISettings = {
 	urlBaseEditor: '',
 	urlBaseWebhook: '',
 	userManagement: {
-		showSetupOnFirstLoad: true,
+		showSetupOnFirstLoad: false,
 		smtpSetup: true,
 		authenticationMethod: 'email',
 	},
diff --git a/packages/editor-ui/src/__tests__/server/endpoints/sso.ts b/packages/editor-ui/src/__tests__/server/endpoints/sso.ts
index 61896ca1f7..0293bab063 100644
--- a/packages/editor-ui/src/__tests__/server/endpoints/sso.ts
+++ b/packages/editor-ui/src/__tests__/server/endpoints/sso.ts
@@ -18,9 +18,7 @@ export function routesForSSO(server: Server) {
 	});
 
 	server.post('/rest/sso/saml/config', (schema: AppSchema, request: Request) => {
-		const requestBody = jsonParse(request.requestBody) as Partial<
-			SamlPreferences & SamlPreferencesExtractedData
-		>;
+		const requestBody = jsonParse(request.requestBody);
 
 		samlConfig = {
 			...samlConfig,
diff --git a/packages/editor-ui/src/__tests__/setup.ts b/packages/editor-ui/src/__tests__/setup.ts
index d7d7a324c0..9316e30a30 100644
--- a/packages/editor-ui/src/__tests__/setup.ts
+++ b/packages/editor-ui/src/__tests__/setup.ts
@@ -10,3 +10,5 @@ window.ResizeObserver =
 		observe: vi.fn(),
 		unobserve: vi.fn(),
 	}));
+
+Element.prototype.scrollIntoView = vi.fn();
diff --git a/packages/editor-ui/src/__tests__/utils.ts b/packages/editor-ui/src/__tests__/utils.ts
index 836b5608fb..5ca901e85d 100644
--- a/packages/editor-ui/src/__tests__/utils.ts
+++ b/packages/editor-ui/src/__tests__/utils.ts
@@ -1,7 +1,10 @@
 import type { ISettingsState } from '@/Interface';
 import { UserManagementAuthenticationMethod } from '@/Interface';
 
-export const retry = async (assertion: () => any, { interval = 20, timeout = 1000 } = {}) => {
+export const retry = async (
+	assertion: () => ReturnType<typeof expect>,
+	{ interval = 20, timeout = 1000 } = {},
+) => {
 	return new Promise((resolve, reject) => {
 		const startTime = Date.now();
 
@@ -26,6 +29,9 @@ export const SETTINGS_STORE_DEFAULT_STATE: ISettingsState = {
 		allowedModules: {},
 		communityNodesEnabled: false,
 		defaultLocale: '',
+		endpointForm: '',
+		endpointFormTest: '',
+		endpointFormWaiting: '',
 		endpointWebhook: '',
 		endpointWebhookTest: '',
 		enterprise: {
diff --git a/packages/editor-ui/src/api/cloudPlans.ts b/packages/editor-ui/src/api/cloudPlans.ts
index fed694fb91..c849f353a1 100644
--- a/packages/editor-ui/src/api/cloudPlans.ts
+++ b/packages/editor-ui/src/api/cloudPlans.ts
@@ -1,5 +1,5 @@
-import type { Cloud, IRestApiContext, InstanceUsage } from '@/Interface';
-import { get, post } from '@/utils';
+import type { Cloud, IRestApiContext, InstanceUsage, LeadEnrichmentTemplates } from '@/Interface';
+import { get, post } from '@/utils/apiUtils';
 
 export async function getCurrentPlan(context: IRestApiContext): Promise<Cloud.PlanData> {
 	return get(context.baseUrl, '/admin/cloud-plan');
@@ -20,3 +20,9 @@ export async function confirmEmail(context: IRestApiContext): Promise<Cloud.User
 export async function getAdminPanelLoginCode(context: IRestApiContext): Promise<{ code: string }> {
 	return get(context.baseUrl, '/cloud/proxy/login/code');
 }
+
+export async function fetchSuggestedTemplates(
+	context: IRestApiContext,
+): Promise<LeadEnrichmentTemplates> {
+	return 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 12089e36fc..d72b9f8d6f 100644
--- a/packages/editor-ui/src/api/communityNodes.ts
+++ b/packages/editor-ui/src/api/communityNodes.ts
@@ -1,6 +1,6 @@
 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,
diff --git a/packages/editor-ui/src/api/environments.ee.ts b/packages/editor-ui/src/api/environments.ee.ts
index 09d91d2a5b..b98f2c96a9 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 a979a63fe9..468febc6e8 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(
diff --git a/packages/editor-ui/src/api/externalSecrets.ee.ts b/packages/editor-ui/src/api/externalSecrets.ee.ts
index 76a1e189f9..f2531e8fb6 100644
--- a/packages/editor-ui/src/api/externalSecrets.ee.ts
+++ b/packages/editor-ui/src/api/externalSecrets.ee.ts
@@ -3,7 +3,7 @@ import type {
 	ExternalSecretsProvider,
 	ExternalSecretsProviderWithProperties,
 } from '@/Interface';
-import { makeRestApiRequest } from '@/utils';
+import { makeRestApiRequest } from '@/utils/apiUtils';
 
 export const getExternalSecrets = async (
 	context: IRestApiContext,
diff --git a/packages/editor-ui/src/api/invitation.ts b/packages/editor-ui/src/api/invitation.ts
new file mode 100644
index 0000000000..b9e2b8a163
--- /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 makeRestApiRequest<IInviteResponse[]>(context, 'POST', '/invitations', params);
+}
+
+export async function acceptInvitation(context: IRestApiContext, params: AcceptInvitationParams) {
+	const { inviteeId, ...props } = params;
+	return makeRestApiRequest<CurrentUserResponse>(
+		context,
+		'POST',
+		`/invitations/${params.inviteeId}/accept`,
+		props as unknown as IDataObject,
+	);
+}
diff --git a/packages/editor-ui/src/api/nodeTypes.ts b/packages/editor-ui/src/api/nodeTypes.ts
index a42eb51524..1e99239491 100644
--- a/packages/editor-ui/src/api/nodeTypes.ts
+++ b/packages/editor-ui/src/api/nodeTypes.ts
@@ -1,16 +1,7 @@
 import { makeRestApiRequest } from '@/utils/apiUtils';
+import type { DynamicNodeParameters, INodeTranslationHeaders, IRestApiContext } from '@/Interface';
 import type {
-	INodeTranslationHeaders,
-	IResourceLocatorReqParams,
-	IRestApiContext,
-	ResourceMapperReqParams,
-} from '@/Interface';
-import type {
-	IDataObject,
-	ILoadOptions,
-	INodeCredentials,
 	INodeListSearchResult,
-	INodeParameters,
 	INodePropertyOptions,
 	INodeTypeDescription,
 	INodeTypeNameVersion,
@@ -38,38 +29,31 @@ export async function getNodesInformation(
 
 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 makeRestApiRequest(context, 'GET', '/dynamic-node-parameters/options', sendData);
 }
 
 export async function getResourceLocatorResults(
 	context: IRestApiContext,
-	sendData: IResourceLocatorReqParams,
+	sendData: DynamicNodeParameters.ResourceLocatorResultsRequest,
 ): Promise<INodeListSearchResult> {
 	return makeRestApiRequest(
 		context,
 		'GET',
-		'/nodes-list-search',
-		sendData as unknown as IDataObject,
+		'/dynamic-node-parameters/resource-locator-results',
+		sendData,
 	);
 }
 
 export async function getResourceMapperFields(
 	context: IRestApiContext,
-	sendData: ResourceMapperReqParams,
+	sendData: DynamicNodeParameters.ResourceMapperFieldsRequest,
 ): Promise<ResourceMapperFields> {
 	return makeRestApiRequest(
 		context,
 		'GET',
-		'/get-mapping-fields',
-		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 0000000000..4c8e1cd1e0
--- /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/sourceControl.ts b/packages/editor-ui/src/api/sourceControl.ts
index 13c61ef590..90777439f3 100644
--- a/packages/editor-ui/src/api/sourceControl.ts
+++ b/packages/editor-ui/src/api/sourceControl.ts
@@ -1,3 +1,4 @@
+import type { IDataObject } from 'n8n-workflow';
 import type {
 	IRestApiContext,
 	SourceControlAggregatedFile,
@@ -5,8 +6,7 @@ import type {
 	SourceControlStatus,
 	SshKeyTypes,
 } from '@/Interface';
-import { makeRestApiRequest } from '@/utils';
-import type { IDataObject } from 'n8n-workflow';
+import { makeRestApiRequest } from '@/utils/apiUtils';
 import type { TupleToUnion } from '@/utils/typeHelpers';
 
 const sourceControlApiRoot = '/source-control';
diff --git a/packages/editor-ui/src/api/sso.ts b/packages/editor-ui/src/api/sso.ts
index fc169f8207..8fc6518868 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,
diff --git a/packages/editor-ui/src/api/tags.ts b/packages/editor-ui/src/api/tags.ts
index 8ae405518b..a8a77b42ea 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 makeRestApiRequest(context, 'GET', '/tags', { withUsageCount });
diff --git a/packages/editor-ui/src/api/templates.ts b/packages/editor-ui/src/api/templates.ts
index e6b40ed15c..d53ab693ca 100644
--- a/packages/editor-ui/src/api/templates.ts
+++ b/packages/editor-ui/src/api/templates.ts
@@ -6,6 +6,7 @@ import type {
 	ITemplatesCollectionResponse,
 	ITemplatesWorkflowResponse,
 	IWorkflowTemplate,
+	TemplateSearchFacet,
 } from '@/Interface';
 import type { IDataObject } from 'n8n-workflow';
 import { get } from '@/utils/apiUtils';
@@ -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[] }> {
+): Promise<{
+	totalWorkflows: number;
+	workflows: ITemplatesWorkflow[];
+	filters: TemplateSearchFacet[];
+}> {
 	return 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/usage.ts b/packages/editor-ui/src/api/usage.ts
index 139af9b0d8..07551d9584 100644
--- a/packages/editor-ui/src/api/usage.ts
+++ b/packages/editor-ui/src/api/usage.ts
@@ -1,4 +1,4 @@
-import { makeRestApiRequest } from '@/utils/apiUtils';
+import { makeRestApiRequest, request } from '@/utils/apiUtils';
 import type { IRestApiContext, UsageState } from '@/Interface';
 
 export const getLicense = async (context: IRestApiContext): Promise<UsageState['data']> => {
@@ -15,3 +15,22 @@ export const activateLicenseKey = async (
 export const renewLicense = async (context: IRestApiContext): Promise<UsageState['data']> => {
 	return makeRestApiRequest(context, 'POST', '/license/renew');
 };
+
+export const requestLicenseTrial = async (data: {
+	licenseType: 'enterprise';
+	firstName: string;
+	lastName: string;
+	email: string;
+	instanceUrl: string;
+}): Promise<UsageState['data']> => {
+	return 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 5ce56d26dd..c6b8e361bd 100644
--- a/packages/editor-ui/src/api/users.ts
+++ b/packages/editor-ui/src/api/users.ts
@@ -1,8 +1,8 @@
 import type {
 	CurrentUserResponse,
-	IInviteResponse,
 	IPersonalizationLatestVersion,
 	IRestApiContext,
+	IRole,
 	IUserResponse,
 } from '@/Interface';
 import type { IDataObject } from 'n8n-workflow';
@@ -124,17 +124,6 @@ export async function getUsers(context: IRestApiContext): Promise<IUserResponse[
 	return makeRestApiRequest(context, 'GET', '/users');
 }
 
-export async function inviteUsers(
-	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`);
-}
-
 export async function getInviteLink(
 	context: IRestApiContext,
 	{ id }: { id: string },
@@ -155,3 +144,15 @@ export async function submitPersonalizationSurvey(
 ): Promise<void> {
 	await makeRestApiRequest(context, 'POST', '/me/survey', params as unknown as IDataObject);
 }
+
+export interface UpdateGlobalRolePayload {
+	id: string;
+	newRoleName: Exclude<IRole, 'default' | 'owner'>;
+}
+
+export async function updateGlobalRole(
+	context: IRestApiContext,
+	{ id, newRoleName }: UpdateGlobalRolePayload,
+): Promise<IUserResponse> {
+	return makeRestApiRequest(context, 'PATCH', `/users/${id}/role`, { newRoleName });
+}
diff --git a/packages/editor-ui/src/api/workflow-webhooks.ts b/packages/editor-ui/src/api/workflow-webhooks.ts
index 30fea1314b..369730085f 100644
--- a/packages/editor-ui/src/api/workflow-webhooks.ts
+++ b/packages/editor-ui/src/api/workflow-webhooks.ts
@@ -7,25 +7,25 @@ const CONTACT_EMAIL_SUBMISSION_ENDPOINT = '/accounts/onboarding';
 
 export async function fetchNextOnboardingPrompt(
 	instanceId: string,
-	currentUer: IUser,
+	currentUser: IUser,
 ): Promise<IOnboardingCallPrompt> {
 	return 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: currentUser.isOwner,
+		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;
@@ -36,13 +36,13 @@ export async function applyForOnboardingCall(
 
 export async function submitEmailOnSignup(
 	instanceId: string,
-	currentUer: IUser,
+	currentUser: IUser,
 	email: string | undefined,
 	agree: boolean,
 ): Promise<string> {
 	return post(N8N_API_BASE_URL, CONTACT_EMAIL_SUBMISSION_ENDPOINT, {
 		instance_id: instanceId,
-		user_id: `${instanceId}#${currentUer.id}`,
+		user_id: `${instanceId}#${currentUser.id}`,
 		email,
 		agree,
 	});
diff --git a/packages/editor-ui/src/api/workflowHistory.ts b/packages/editor-ui/src/api/workflowHistory.ts
index 3083dbeb6b..29ce265544 100644
--- a/packages/editor-ui/src/api/workflowHistory.ts
+++ b/packages/editor-ui/src/api/workflowHistory.ts
@@ -1,5 +1,5 @@
 import type { IRestApiContext } from '@/Interface';
-import { get } from '@/utils';
+import { get } from '@/utils/apiUtils';
 import type {
 	WorkflowHistory,
 	WorkflowVersion,
diff --git a/packages/editor-ui/src/api/workflows.ts b/packages/editor-ui/src/api/workflows.ts
index 2c2cbc6b54..4f36bedac4 100644
--- a/packages/editor-ui/src/api/workflows.ts
+++ b/packages/editor-ui/src/api/workflows.ts
@@ -24,7 +24,7 @@ export async function getWorkflows(context: IRestApiContext, filter?: object) {
 }
 
 export async function getActiveWorkflows(context: IRestApiContext) {
-	return makeRestApiRequest(context, 'GET', '/active');
+	return makeRestApiRequest(context, 'GET', '/active-workflows');
 }
 
 export async function getCurrentExecutions(context: IRestApiContext, filter: IDataObject) {
diff --git a/packages/editor-ui/src/components/AboutModal.vue b/packages/editor-ui/src/components/AboutModal.vue
index 2be4c4faa6..067c3daa81 100644
--- a/packages/editor-ui/src/components/AboutModal.vue
+++ b/packages/editor-ui/src/components/AboutModal.vue
@@ -2,7 +2,7 @@
 	<Modal
 		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>
diff --git a/packages/editor-ui/src/components/ActivationModal.vue b/packages/editor-ui/src/components/ActivationModal.vue
index 6b2e7274bc..cfed924a45 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 :modelValue="checked" @update:modelValue="handleCheckboxChange">{{
+				<el-checkbox :model-value="checked" @update:modelValue="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>
@@ -46,10 +46,11 @@ import {
 	LOCAL_STORAGE_ACTIVATION_FLAG,
 	VIEWS,
 } from '../constants';
-import { getActivatableTriggerNodes, getTriggerNodeServiceName } from '@/utils';
+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';
 
 export default defineComponent({
 	name: 'ActivationModal',
@@ -88,7 +89,7 @@ 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: {
diff --git a/packages/editor-ui/src/components/Banner.vue b/packages/editor-ui/src/components/Banner.vue
index 45fd870516..27188e535b 100644
--- a/packages/editor-ui/src/components/Banner.vue
+++ b/packages/editor-ui/src/components/Banner.vue
@@ -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/BinaryDataDisplay.vue b/packages/editor-ui/src/components/BinaryDataDisplay.vue
index a826160d07..7119233975 100644
--- a/packages/editor-ui/src/components/BinaryDataDisplay.vue
+++ b/packages/editor-ui/src/components/BinaryDataDisplay.vue
@@ -1,19 +1,19 @@
 <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>
@@ -25,13 +25,12 @@ import type { IBinaryData, IRunData } from 'n8n-workflow';
 
 import BinaryDataDisplayEmbed from '@/components/BinaryDataDisplayEmbed.vue';
 
-import { nodeHelpers } from '@/mixins/nodeHelpers';
-
 import { useWorkflowsStore } from '@/stores/workflows.store';
+import { useNodeHelpers } from '@/composables/useNodeHelpers';
 
 export default defineComponent({
 	name: 'BinaryDataDisplay',
-	mixins: [nodeHelpers],
+
 	components: {
 		BinaryDataDisplayEmbed,
 	},
@@ -39,10 +38,17 @@ export default defineComponent({
 		'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,
diff --git a/packages/editor-ui/src/components/BinaryDataDisplayEmbed.vue b/packages/editor-ui/src/components/BinaryDataDisplayEmbed.vue
index 2a36ca185a..719cb53b7d 100644
--- a/packages/editor-ui/src/components/BinaryDataDisplayEmbed.vue
+++ b/packages/editor-ui/src/components/BinaryDataDisplayEmbed.vue
@@ -11,13 +11,13 @@
 				<source :src="embedSource" :type="binaryData.mimeType" />
 				{{ $locale.baseText('binaryDataDisplay.yourBrowserDoesNotSupport') }}
 			</audio>
-			<vue-json-pretty
+			<VueJsonPretty
 				v-else-if="binaryData.fileType === 'json'"
 				:data="data"
 				:deep="3"
-				:showLength="true"
+				:show-length="true"
 			/>
-			<run-data-html v-else-if="binaryData.fileType === 'html'" :inputHtml="data" />
+			<RunDataHtml v-else-if="binaryData.fileType === 'html'" :input-html="data" />
 			<embed v-else :src="embedSource" class="binary-data" :class="embedClass()" />
 		</span>
 	</span>
@@ -30,7 +30,7 @@ import type { IBinaryData } from 'n8n-workflow';
 import { jsonParse } from 'n8n-workflow';
 import type { PropType } from 'vue';
 import VueJsonPretty from 'vue-json-pretty';
-import { useWorkflowsStore } from '@/stores';
+import { useWorkflowsStore } from '@/stores/workflows.store';
 import RunDataHtml from '@/components/RunDataHtml.vue';
 
 export default defineComponent({
diff --git a/packages/editor-ui/src/components/BreakpointsObserver.vue b/packages/editor-ui/src/components/BreakpointsObserver.vue
index 40372c0062..0676c31c25 100644
--- a/packages/editor-ui/src/components/BreakpointsObserver.vue
+++ b/packages/editor-ui/src/components/BreakpointsObserver.vue
@@ -1,6 +1,6 @@
 <template>
 	<span>
-		<slot v-bind:bp="bp" v-bind:value="value" />
+		<slot :bp="bp" :value="value" />
 	</span>
 </template>
 
@@ -17,38 +17,22 @@ import { BREAKPOINT_SM, BREAKPOINT_MD, BREAKPOINT_LG, BREAKPOINT_XL } from '@/co
  * xl >= 1920
  */
 
-import { genericHelpers } from '@/mixins/genericHelpers';
-import { debounceHelper } from '@/mixins/debounce';
-import { useUIStore } from '@/stores';
-import { getBannerRowHeight } from '@/utils';
+import { useUIStore } from '@/stores/ui.store';
+import { getBannerRowHeight } from '@/utils/htmlUtils';
+import { useDebounce } from '@/composables/useDebounce';
 
 export default defineComponent({
 	name: 'BreakpointsObserver',
-	mixins: [genericHelpers, debounceHelper],
 	props: ['valueXS', 'valueXL', 'valueLG', 'valueMD', 'valueSM', 'valueDefault'],
+	setup() {
+		const { callDebounced } = useDebounce();
+		return { callDebounced };
+	},
 	data() {
 		return {
 			width: window.innerWidth,
 		};
 	},
-	created() {
-		window.addEventListener('resize', this.onResize);
-	},
-	beforeUnmount() {
-		window.removeEventListener('resize', this.onResize);
-	},
-	methods: {
-		onResize() {
-			void this.callDebounced('onResizeEnd', { debounceTime: 50 });
-		},
-		async onResizeEnd() {
-			this.width = window.innerWidth;
-			await this.$nextTick();
-
-			const bannerHeight = await getBannerRowHeight();
-			useUIStore().updateBannersHeight(bannerHeight);
-		},
-	},
 	computed: {
 		bp(): string {
 			if (this.width < BREAKPOINT_SM) {
@@ -70,7 +54,7 @@ export default defineComponent({
 			return 'SM';
 		},
 
-		value(): any | undefined {
+		value(): number | undefined {
 			if (this.valueXS !== undefined && this.width < BREAKPOINT_SM) {
 				return this.valueXS;
 			}
@@ -94,5 +78,23 @@ export default defineComponent({
 			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 49dc0e86fb..b5677e54f3 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.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) {
@@ -76,8 +95,8 @@ onBeforeUnmount(() => {
 .zoomMenu {
 	position: absolute;
 	width: 210px;
-	bottom: var(--spacing-2xl);
-	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 601c7aa5e3..978ec9cedb 100644
--- a/packages/editor-ui/src/components/ChangePasswordModal.vue
+++ b/packages/editor-ui/src/components/ChangePasswordModal.vue
@@ -1,17 +1,17 @@
 <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"
+				:event-bus="formBus"
+				:column-view="true"
 				@update="onInput"
 				@submit="onSubmit"
 			/>
@@ -20,9 +20,9 @@
 			<n8n-button
 				:loading="loading"
 				:label="$locale.baseText('auth.changePassword')"
-				@click="onSubmitClick"
 				float="right"
 				data-test-id="change-password-button"
+				@click="onSubmitClick"
 			/>
 		</template>
 	</Modal>
@@ -32,7 +32,7 @@
 import { defineComponent } from 'vue';
 
 import { CHANGE_PASSWORD_MODAL_KEY } from '../constants';
-import { useToast } from '@/composables';
+import { useToast } from '@/composables/useToast';
 import Modal from '@/components/Modal.vue';
 import type { IFormInputs } from '@/Interface';
 import { mapStores } from 'pinia';
diff --git a/packages/editor-ui/src/components/ChatEmbedModal.vue b/packages/editor-ui/src/components/ChatEmbedModal.vue
index 6bc28ad6e0..38d58e5dfb 100644
--- a/packages/editor-ui/src/components/ChatEmbedModal.vue
+++ b/packages/editor-ui/src/components/ChatEmbedModal.vue
@@ -4,13 +4,12 @@ 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, WEBHOOK_NODE_TYPE } from '../constants';
-import { useSettingsStore } from '@/stores/settings.store';
+import { CHAT_EMBED_MODAL_KEY, CHAT_TRIGGER_NODE_TYPE, WEBHOOK_NODE_TYPE } from '../constants';
 import { useRootStore } from '@/stores/n8nRoot.store';
-import { useWorkflowsStore } from '@/stores';
+import { useWorkflowsStore } from '@/stores/workflows.store';
 import HtmlEditor from '@/components/HtmlEditor/HtmlEditor.vue';
 import CodeNodeEditor from '@/components/CodeNodeEditor/CodeNodeEditor.vue';
-import { useI18n } from '@/composables';
+import { useI18n } from '@/composables/useI18n';
 
 const props = defineProps({
 	modalBus: {
@@ -22,7 +21,6 @@ const props = defineProps({
 const i18n = useI18n();
 const rootStore = useRootStore();
 const workflowsStore = useWorkflowsStore();
-const settingsStore = useSettingsStore();
 
 const tabs = ref([
 	{
@@ -45,11 +43,30 @@ const tabs = ref([
 const currentTab = ref('cdn');
 
 const webhookNode = computed(() => {
-	return workflowsStore.workflow.nodes.find((node) => node.type === WEBHOOK_NODE_TYPE);
+	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(() => {
-	return `${rootStore.getWebhookUrl}${webhookNode.value ? `/${webhookNode.value.webhookId}` : ''}`;
+	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 = '	') {
@@ -59,9 +76,10 @@ function indentLines(code: string, indent: string = '	') {
 		.join('\n');
 }
 
+const importCode = 'import'; // To avoid vite from parsing the import statement
 const commonCode = computed(() => ({
-	import: `import '@n8n/chat/style.css';
-import { createChat } from '@n8n/chat';`,
+	import: `${importCode} '@n8n/chat/style.css';
+${importCode} { createChat } from '@n8n/chat';`,
 	createChat: `createChat({
 	webhookUrl: '${webhookUrl.value}'
 });`,
@@ -71,7 +89,7 @@ import { createChat } from '@n8n/chat';`,
 const cdnCode = computed(
 	() => `<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';
+${importCode} { createChat } from 'https://cdn.jsdelivr.net/npm/@n8n/chat/chat.bundle.es.js';
 
 ${commonCode.value.createChat}
 </${'script'}>`,
@@ -79,7 +97,7 @@ ${commonCode.value.createChat}
 
 const vueCode = computed(
 	() => `<script lang="ts" setup>
-import { onMounted } from 'vue';
+${importCode} { onMounted } from 'vue';
 ${commonCode.value.import}
 
 onMounted(() => {
@@ -89,7 +107,7 @@ ${indentLines(commonCode.value.createChat)}
 );
 
 const reactCode = computed(
-	() => `import { useEffect } from 'react';
+	() => `${importCode} { useEffect } from 'react';
 ${commonCode.value.import}
 
 export const App = () => {
@@ -118,45 +136,54 @@ function closeDialog() {
 	<Modal
 		max-width="960px"
 		:title="i18n.baseText('chatEmbed.title')"
-		:eventBus="modalBus"
+		:event-bus="modalBus"
 		:name="CHAT_EMBED_MODAL_KEY"
 		:center="true"
 	>
 		<template #content>
 			<div :class="$style.container">
-				<n8n-tabs :options="tabs" v-model="currentTab" />
+				<n8n-tabs v-model="currentTab" :options="tabs" />
 
 				<div v-if="currentTab !== 'cdn'">
-					<n8n-text>
-						{{ i18n.baseText('chatEmbed.install') }}
-					</n8n-text>
-					<CodeNodeEditor :modelValue="commonCode.install" isReadOnly />
+					<div class="mb-s">
+						<n8n-text>
+							{{ i18n.baseText('chatEmbed.install') }}
+						</n8n-text>
+					</div>
+					<CodeNodeEditor :model-value="commonCode.install" is-read-only />
 				</div>
 
-				<n8n-text>
-					<i18n-t :keypath="`chatEmbed.paste.${currentTab}`">
-						<template #code>
-							<code>{{ i18n.baseText(`chatEmbed.paste.${currentTab}.file`) }}</code>
-						</template>
-					</i18n-t>
-				</n8n-text>
-				<HtmlEditor v-if="currentTab === 'cdn'" :modelValue="cdnCode" isReadOnly />
-				<HtmlEditor v-if="currentTab === 'vue'" :modelValue="vueCode" isReadOnly />
-				<CodeNodeEditor v-if="currentTab === 'react'" :modelValue="reactCode" isReadOnly />
-				<CodeNodeEditor v-if="currentTab === 'other'" :modelValue="otherCode" isReadOnly />
+				<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>
 
-				<n8n-info-tip>
+				<HtmlEditor v-if="currentTab === 'cdn'" :model-value="cdnCode" is-read-only />
+				<HtmlEditor v-if="currentTab === 'vue'" :model-value="vueCode" is-read-only />
+				<CodeNodeEditor v-if="currentTab === 'react'" :model-value="reactCode" is-read-only />
+				<CodeNodeEditor 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 size="small" bold>
+					<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 @click="closeDialog" float="right" :label="i18n.baseText('chatEmbed.close')" />
+				<n8n-button float="right" :label="i18n.baseText('chatEmbed.close')" @click="closeDialog" />
 			</div>
 		</template>
 	</Modal>
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/AskAI/AskAI.vue b/packages/editor-ui/src/components/CodeNodeEditor/AskAI/AskAI.vue
index d2ac3e1410..515d22e2e7 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/AskAI/AskAI.vue
+++ b/packages/editor-ui/src/components/CodeNodeEditor/AskAI/AskAI.vue
@@ -9,9 +9,16 @@ 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 { useDataSchema, useI18n, useMessage, useTelemetry, useToast } from '@/composables';
-import { useNDVStore, usePostHog, useRootStore, useWorkflowsStore } from '@/stores';
-import { executionDataToJson } from '@/utils';
+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,
@@ -242,8 +249,8 @@ onMounted(() => {
 				<span
 					v-show="prompt.length > 1"
 					:class="$style.counter"
-					v-text="`${prompt.length} / ${ASK_AI_MAX_PROMPT_LENGTH}`"
 					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" />{{
@@ -253,29 +260,29 @@ onMounted(() => {
 			</div>
 			<N8nInput
 				v-model="prompt"
-				@input="onPromptInput"
 				: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 :class="$style.loader" v-if="isLoading">
+			<div v-if="isLoading" :class="$style.loader">
 				<transition name="text-fade-in-out" mode="out-in">
-					<div v-text="loadingString" :key="loadingPhraseIndex" />
+					<div :key="loadingPhraseIndex" v-text="loadingString" />
 				</transition>
 				<n8n-circle-loader :radius="8" :progress="loaderProgress" :stroke-width="3" />
 			</div>
-			<n8n-tooltip :disabled="isSubmitEnabled" v-else>
+			<N8nTooltip v-else :disabled="isSubmitEnabled">
 				<div>
 					<N8nButton
 						:disabled="!isSubmitEnabled"
-						@click="onSubmit"
 						size="small"
 						data-test-id="ask-ai-cta"
+						@click="onSubmit"
 					>
 						{{ i18n.baseText('codeNodeEditor.askAi.generateCode') }}
 					</N8nButton>
@@ -283,18 +290,18 @@ onMounted(() => {
 				<template #content>
 					<span
 						v-if="!hasExecutionData"
-						v-text="i18n.baseText('codeNodeEditor.askAi.noInputData')"
 						data-test-id="ask-ai-cta-tooltip-no-input-data"
+						v-text="i18n.baseText('codeNodeEditor.askAi.noInputData')"
 					/>
 					<span
 						v-else-if="prompt.length === 0"
-						v-text="i18n.baseText('codeNodeEditor.askAi.noPrompt')"
 						data-test-id="ask-ai-cta-tooltip-no-prompt"
+						v-text="i18n.baseText('codeNodeEditor.askAi.noPrompt')"
 					/>
 					<span
 						v-else-if="isEachItemMode"
-						v-text="i18n.baseText('codeNodeEditor.askAi.onlyAllItemsMode')"
 						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"
@@ -306,7 +313,7 @@ onMounted(() => {
 						"
 					/>
 				</template>
-			</n8n-tooltip>
+			</N8nTooltip>
 		</div>
 	</div>
 </template>
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue b/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
index e5aa887a8a..d45468210b 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
+++ b/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
@@ -1,15 +1,15 @@
 <template>
 	<div
+		ref="codeNodeEditorContainer"
 		:class="['code-node-editor', $style['code-node-editor-container'], language]"
 		@mouseover="onMouseOver"
 		@mouseout="onMouseOut"
-		ref="codeNodeEditorContainer"
 	>
 		<el-tabs
-			type="card"
+			v-if="aiEnabled"
 			ref="tabs"
 			v-model="activeTab"
-			v-if="aiEnabled"
+			type="card"
 			:before-leave="onBeforeTabLeave"
 		>
 			<el-tab-pane
@@ -17,7 +17,11 @@
 				name="code"
 				data-test-id="code-node-tab-code"
 			>
-				<div ref="codeNodeEditor" class="code-node-editor-input ph-no-capture code-editor-tabs" />
+				<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')"
@@ -26,16 +30,19 @@
 			>
 				<!-- Key the AskAI tab to make sure it re-mounts when changing tabs -->
 				<AskAI
-					@replaceCode="onReplaceCode"
-					:has-changes="hasChanges"
 					:key="activeTab"
+					:has-changes="hasChanges"
+					@replaceCode="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 ref="codeNodeEditor" class="code-node-editor-input ph-no-capture" />
+		<div v-else :class="$style.fillHeight">
+			<div ref="codeNodeEditor" :class="['ph-no-capture', $style.fillHeight]" />
+			<slot name="suffix" />
+		</div>
 	</div>
 </template>
 
@@ -52,7 +59,6 @@ import { Compartment, EditorState } from '@codemirror/state';
 import type { ViewUpdate } from '@codemirror/view';
 import { EditorView } from '@codemirror/view';
 import { javascript } from '@codemirror/lang-javascript';
-import { json } from '@codemirror/lang-json';
 import { python } from '@codemirror/lang-python';
 import type { CodeExecutionMode, CodeNodeEditorLanguage } from 'n8n-workflow';
 import { CODE_EXECUTION_MODES, CODE_LANGUAGES } from 'n8n-workflow';
@@ -60,7 +66,8 @@ import { CODE_EXECUTION_MODES, CODE_LANGUAGES } from 'n8n-workflow';
 import { workflowHelpers } from '@/mixins/workflowHelpers'; // for json field completions
 import { ASK_AI_EXPERIMENT, CODE_NODE_TYPE } from '@/constants';
 import { codeNodeEditorEventBus } from '@/event-bus';
-import { useRootStore, usePostHog } from '@/stores';
+import { useRootStore } from '@/stores/n8nRoot.store';
+import { usePostHog } from '@/stores/posthog.store';
 
 import { readOnlyEditorExtensions, writableEditorExtensions } from './baseExtensions';
 import { CODE_PLACEHOLDERS } from './constants';
@@ -68,22 +75,28 @@ import { linterExtension } from './linter';
 import { completerExtension } from './completer';
 import { codeNodeEditorTheme } from './theme';
 import AskAI from './AskAI/AskAI.vue';
-import { useMessage } from '@/composables';
+import { useMessage } from '@/composables/useMessage';
+import { useSettingsStore } from '@/stores/settings.store';
 
 export default defineComponent({
-	name: 'code-node-editor',
-	mixins: [linterExtension, completerExtension, workflowHelpers],
+	name: 'CodeNodeEditor',
 	components: {
 		AskAI,
 	},
+	mixins: [linterExtension, completerExtension, workflowHelpers],
 	props: {
 		aiButtonEnabled: {
 			type: Boolean,
 			default: false,
 		},
+		fillParent: {
+			type: Boolean,
+			default: false,
+		},
 		mode: {
 			type: String as PropType<CodeExecutionMode>,
 			validator: (value: CodeExecutionMode): boolean => CODE_EXECUTION_MODES.includes(value),
+			required: true,
 		},
 		language: {
 			type: String as PropType<CodeNodeEditorLanguage>,
@@ -94,13 +107,13 @@ export default defineComponent({
 			type: Boolean,
 			default: false,
 		},
-
 		rows: {
 			type: Number,
-			default: -1,
+			default: 4,
 		},
 		modelValue: {
 			type: String,
+			required: true,
 		},
 	},
 	setup() {
@@ -155,7 +168,7 @@ export default defineComponent({
 		},
 	},
 	computed: {
-		...mapStores(useRootStore, usePostHog),
+		...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,
@@ -173,8 +186,6 @@ export default defineComponent({
 		// eslint-disable-next-line vue/return-in-computed-property
 		languageExtensions(): [LanguageSupport, ...Extension[]] {
 			switch (this.language) {
-				case 'json':
-					return [json()];
 				case 'javaScript':
 					return [javascript(), this.autocompletionExtension('javaScript')];
 				case 'python':
@@ -182,6 +193,72 @@ export default defineComponent({
 			}
 		},
 	},
+	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() ?? '';
@@ -309,67 +386,6 @@ export default defineComponent({
 			} catch {}
 		},
 	},
-	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, customMinHeight: 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);
-		}
-	},
 });
 </script>
 
@@ -384,15 +400,9 @@ export default defineComponent({
 <style lang="scss" module>
 .code-node-editor-container {
 	position: relative;
-
-	& > div {
-		height: 100%;
-	}
 }
 
-.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 1d0c4872df..bed55df677 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/baseExtensions.ts
+++ b/packages/editor-ui/src/components/CodeNodeEditor/baseExtensions.ts
@@ -6,19 +6,22 @@ import {
 	highlightSpecialChars,
 	keymap,
 	lineNumbers,
+	type KeyBinding,
 } from '@codemirror/view';
 import { bracketMatching, foldGutter, indentOnInput } from '@codemirror/language';
-import { acceptCompletion } from '@codemirror/autocomplete';
+import { acceptCompletion, selectedCompletion } from '@codemirror/autocomplete';
 import {
 	history,
-	indentWithTab,
+	indentLess,
+	indentMore,
 	insertNewlineAndIndent,
 	toggleComment,
 	redo,
 	deleteCharBackward,
+	undo,
 } from '@codemirror/commands';
 import { lintGutter } from '@codemirror/lint';
-import type { Extension } from '@codemirror/state';
+import { type Extension, Prec } from '@codemirror/state';
 
 import { codeInputHandler } from '@/plugins/codemirror/inputHandlers/code.inputHandler';
 
@@ -28,6 +31,42 @@ export const readOnlyEditorExtensions: readonly Extension[] = [
 	highlightSpecialChars(),
 ];
 
+export const tabKeyMap: KeyBinding[] = [
+	{
+		any(editor, event) {
+			if (event.key === 'Tab' || (event.key === 'Escape' && selectedCompletion(editor.state))) {
+				event.stopPropagation();
+			}
+
+			return false;
+		},
+	},
+	{
+		key: 'Tab',
+		run: (editor) => {
+			if (selectedCompletion(editor.state)) {
+				return acceptCompletion(editor);
+			}
+
+			return indentMore(editor);
+		},
+	},
+	{ key: 'Shift-Tab', run: indentLess },
+];
+
+export const enterKeyMap: KeyBinding[] = [
+	{
+		key: 'Enter',
+		run: (editor) => {
+			if (selectedCompletion(editor.state)) {
+				return acceptCompletion(editor);
+			}
+
+			return insertNewlineAndIndent(editor);
+		},
+	},
+];
+
 export const writableEditorExtensions: readonly Extension[] = [
 	history(),
 	lintGutter(),
@@ -38,13 +77,14 @@ export const writableEditorExtensions: readonly Extension[] = [
 	bracketMatching(),
 	highlightActiveLine(),
 	highlightActiveLineGutter(),
-	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,
-	]),
+	Prec.highest(
+		keymap.of([
+			...tabKeyMap,
+			...enterKeyMap,
+			{ key: 'Mod-/', run: toggleComment },
+			{ key: 'Mod-z', run: undo },
+			{ key: 'Mod-Shift-z', run: redo },
+			{ key: 'Backspace', run: deleteCharBackward, shift: deleteCharBackward },
+		]),
+	),
 ];
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 be79c9eb6e..9ed0ddea8e 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/completions/base.completions.ts
+++ b/packages/editor-ui/src/components/CodeNodeEditor/completions/base.completions.ts
@@ -44,7 +44,7 @@ export const baseCompletions = defineComponent({
 
 		/**
 		 * - 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 {
@@ -58,6 +58,10 @@ export const baseCompletions = defineComponent({
 					label: `${prefix}execution`,
 					info: this.$locale.baseText('codeNodeEditor.completer.$execution'),
 				},
+				{
+					label: `${prefix}ifEmpty()`,
+					info: this.$locale.baseText('codeNodeEditor.completer.$ifEmpty'),
+				},
 				{ label: `${prefix}input`, info: this.$locale.baseText('codeNodeEditor.completer.$input') },
 				{
 					label: `${prefix}prevNode`,
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 b2a1ec4995..502221b48f 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/completions/execution.completions.ts
+++ b/packages/editor-ui/src/components/CodeNodeEditor/completions/execution.completions.ts
@@ -5,7 +5,7 @@ import type { Completion, CompletionContext, CompletionResult } from '@codemirro
 export const executionCompletions = defineComponent({
 	methods: {
 		/**
-		 * Complete `$execution.` to `.id .mode .resumeUrl`
+		 * Complete `$execution.` to `.id .mode .resumeUrl .resumeFormUrl`
 		 */
 		executionCompletions(
 			context: CompletionContext,
@@ -39,6 +39,10 @@ export const executionCompletions = defineComponent({
 					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/jsonField.completions.ts b/packages/editor-ui/src/components/CodeNodeEditor/completions/jsonField.completions.ts
index 3d7b3cf531..8e81e26d06 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/completions/jsonField.completions.ts
+++ b/packages/editor-ui/src/components/CodeNodeEditor/completions/jsonField.completions.ts
@@ -286,9 +286,9 @@ export const jsonFieldCompletions = defineComponent({
 				nodeName = quotedNodeName.replace(/^"/, '').replace(/"$/, '');
 			}
 
-			const pinData: IPinData | undefined = this.workflowsStore.getPinData;
+			const pinData: IPinData | undefined = this.workflowsStore.pinnedWorkflowData;
 
-			const nodePinData = pinData && pinData[nodeName];
+			const nodePinData = pinData?.[nodeName];
 
 			if (nodePinData) {
 				try {
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/completions/secrets.completions.ts b/packages/editor-ui/src/components/CodeNodeEditor/completions/secrets.completions.ts
index d3eec85bc0..7bba9b3fa3 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/completions/secrets.completions.ts
+++ b/packages/editor-ui/src/components/CodeNodeEditor/completions/secrets.completions.ts
@@ -1,12 +1,11 @@
-import Vue from 'vue';
 import { addVarType } from '../utils';
 import type { Completion, CompletionContext, CompletionResult } from '@codemirror/autocomplete';
-import type { CodeNodeEditorMixin } from '../types';
-import { useExternalSecretsStore } from '@/stores';
+import { useExternalSecretsStore } from '@/stores/externalSecrets.ee.store';
+import { defineComponent } from 'vue';
 
 const escape = (str: string) => str.replace('$', '\\$');
 
-export const secretsCompletions = (Vue as CodeNodeEditorMixin).extend({
+export const secretsCompletions = defineComponent({
 	methods: {
 		/**
 		 * Complete `$secrets.` to `$secrets.providerName` and `$secrets.providerName.secretName`.
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 278d401545..c6f7283f91 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/completions/variables.completions.ts
+++ b/packages/editor-ui/src/components/CodeNodeEditor/completions/variables.completions.ts
@@ -1,6 +1,6 @@
 import { addVarType } from '../utils';
 import type { Completion, CompletionContext, CompletionResult } from '@codemirror/autocomplete';
-import { useEnvironmentsStore } from '@/stores';
+import { useEnvironmentsStore } from '@/stores/environments.ee.store';
 import { defineComponent } from 'vue';
 
 const escape = (str: string) => str.replace('$', '\\$');
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/linter.ts b/packages/editor-ui/src/components/CodeNodeEditor/linter.ts
index f1fe9db6d4..d64d4f83cd 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/linter.ts
+++ b/packages/editor-ui/src/components/CodeNodeEditor/linter.ts
@@ -1,7 +1,6 @@
 import { defineComponent } from 'vue';
 import type { Diagnostic } from '@codemirror/lint';
 import { linter as createLinter } from '@codemirror/lint';
-import { jsonParseLinter } from '@codemirror/lang-json';
 import type { EditorView } from '@codemirror/view';
 import * as esprima from 'esprima-next';
 import type { Node } from 'estree';
@@ -21,8 +20,6 @@ export const linterExtension = defineComponent({
 			switch (language) {
 				case 'javaScript':
 					return createLinter(this.lintSource, { delay: DEFAULT_LINTER_DELAY_IN_MS });
-				case 'json':
-					return createLinter(jsonParseLinter());
 			}
 			return undefined;
 		},
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/theme.ts b/packages/editor-ui/src/components/CodeNodeEditor/theme.ts
index 3f76bb6fc8..b39c310ab4 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/theme.ts
+++ b/packages/editor-ui/src/components/CodeNodeEditor/theme.ts
@@ -27,24 +27,26 @@ const BASE_STYLING = {
 	},
 };
 
-const cssStyleDeclaration = getComputedStyle(document.documentElement);
-
 interface ThemeSettings {
 	isReadOnly?: boolean;
-	customMaxHeight?: string;
-	customMinHeight?: number;
+	maxHeight?: string;
+	minHeight?: string;
+	rows?: number;
+	highlightColors?: 'default' | 'html';
 }
 
 export const codeNodeEditorTheme = ({
 	isReadOnly,
-	customMaxHeight,
-	customMinHeight,
+	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%',
@@ -61,6 +63,7 @@ export const codeNodeEditorTheme = ({
 		},
 		'&.cm-editor': {
 			...(isReadOnly ? { backgroundColor: 'var(--color-code-background-readonly)' } : {}),
+			borderColor: 'var(--border-color-base)',
 		},
 		'&.cm-editor.cm-focused': {
 			outline: 'none',
@@ -78,6 +81,7 @@ export const codeNodeEditorTheme = ({
 				: '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,
@@ -85,62 +89,120 @@ export const codeNodeEditorTheme = ({
 		},
 		'.cm-scroller': {
 			overflow: 'auto',
-
-			maxHeight: customMaxHeight ?? '100%',
+			maxHeight: maxHeight ?? '100%',
 			...(isReadOnly
 				? {}
-				: { minHeight: customMinHeight ? `${Number(customMinHeight) * 1.3}em` : '10em' }),
+				: { 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/CollectionCard.vue b/packages/editor-ui/src/components/CollectionCard.vue
deleted file mode 100644
index 97fc3c450c..0000000000
--- a/packages/editor-ui/src/components/CollectionCard.vue
+++ /dev/null
@@ -1,37 +0,0 @@
-<template>
-	<Card :loading="loading" :title="collection.name">
-		<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 { defineComponent } from 'vue';
-import { genericHelpers } from '@/mixins/genericHelpers';
-import Card from '@/components/CollectionWorkflowCard.vue';
-import NodeList from '@/components/NodeList.vue';
-
-export default defineComponent({
-	name: 'CollectionCard',
-	mixins: [genericHelpers],
-	props: {
-		loading: {
-			type: Boolean,
-		},
-		collection: {
-			type: Object,
-		},
-	},
-	components: {
-		Card,
-		NodeList,
-	},
-});
-</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 f3e55bb0c8..67994ef43c 100644
--- a/packages/editor-ui/src/components/CollectionParameter.vue
+++ b/packages/editor-ui/src/components/CollectionParameter.vue
@@ -1,43 +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>
 
 			<Suspense>
-				<parameter-input-list
+				<ParameterInputList
 					:parameters="getProperties"
-					:nodeValues="nodeValues"
+					:node-values="nodeValues"
 					:path="path"
-					:hideDelete="hideDelete"
+					:hide-delete="hideDelete"
 					:indent="true"
-					:isReadOnly="isReadOnly"
+					:is-read-only="isReadOnly"
 					@valueChanged="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"
-						@update:modelValue="optionSelected"
 						filterable
+						@update:modelValue="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>
@@ -47,159 +48,166 @@
 	</div>
 </template>
 
-<script lang="ts">
-import { defineAsyncComponent, defineComponent } from 'vue';
-import { mapStores } from 'pinia';
-import type { INodeUi, IUpdateInformation } from '@/Interface';
+<script lang="ts" setup>
+import { ref, computed, defineAsyncComponent } 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 { useNDVStore } from '@/stores/ndv.store';
-
+import { useNodeHelpers } from '@/composables/useNodeHelpers';
+import { useI18n } from '@/composables/useI18n';
 const ParameterInputList = defineAsyncComponent(async () => import('./ParameterInputList.vue'));
 
-export default defineComponent({
-	name: 'CollectionParameter',
-	mixins: [nodeHelpers],
-	props: [
-		'hideDelete', // boolean
-		'nodeValues', // NodeParameters
-		'parameter', // INodeProperties
-		'path', // string
-		'values', // NodeParameters
-		'isReadOnly', // boolean
-	],
-	components: {
-		ParameterInputList,
-	},
-	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;
-			}
+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();
 
-			if (this.parameter.typeOptions[argumentName] === undefined) {
-				return undefined;
-			}
-
-			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);
-				}
-			}
-
-			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;
-			}
-
-			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),
-				};
-			}
-
-			this.$emit('valueChanged', parameterData);
-			this.selectedOption = undefined;
-		},
-		valueChanged(parameterData: IUpdateInformation) {
-			this.$emit('valueChanged', parameterData);
-		},
-	},
+const getPlaceholderText = computed(() => {
+	return (
+		i18n.nodeText().placeholder(props.parameter, props.path) ??
+		i18n.baseText('collectionParameter.choose')
+	);
 });
+
+function isNodePropertyCollection(
+	object: INodePropertyOptions | INodeProperties | INodePropertyCollection,
+): object is INodePropertyCollection {
+	return 'values' in object;
+}
+
+function getParameterOptionLabel(
+	item: INodePropertyOptions | INodeProperties | INodePropertyCollection,
+): string {
+	if (isNodePropertyCollection(item)) {
+		return i18n.nodeText().collectionOptionDisplayName(props.parameter, item, props.path);
+	}
+
+	return 'displayName' in item ? item.displayName : item.name;
+}
+
+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);
+}
+
+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">
@@ -210,7 +218,28 @@ export default defineComponent({
 		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 b7775bc973..82f6f1b1bc 100644
--- a/packages/editor-ui/src/components/CollectionWorkflowCard.vue
+++ b/packages/editor-ui/src/components/CollectionWorkflowCard.vue
@@ -1,10 +1,10 @@
 <template>
 	<n8n-card :class="$style.card" v-bind="$attrs">
-		<template #header v-if="!loading">
-			<span v-text="title" :class="$style.title" />
+		<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>
@@ -12,11 +12,9 @@
 
 <script lang="ts">
 import { defineComponent } from 'vue';
-import { genericHelpers } from '@/mixins/genericHelpers';
 
 export default defineComponent({
 	name: 'Card',
-	mixins: [genericHelpers],
 	props: {
 		loading: {
 			type: Boolean,
@@ -30,7 +28,7 @@ export default defineComponent({
 
 <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/CommunityPackageInstallModal.vue b/packages/editor-ui/src/components/CommunityPackageInstallModal.vue
index 3a0b4d7574..a281c99697 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']">
@@ -30,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="
@@ -60,8 +60,8 @@
 					v-model="userAgreed"
 					:class="[$style.checkbox, checkboxWarning ? $style.error : '', 'mt-l']"
 					:disabled="loading"
-					@update:modelValue="onCheckboxChecked"
 					data-test-id="user-agreement-checkbox"
+					@update:modelValue="onCheckboxChecked"
 				>
 					<n8n-text>
 						{{ $locale.baseText('settings.communityNodes.installModal.checkbox.label') }} </n8n-text
@@ -83,8 +83,8 @@
 				"
 				size="large"
 				float="right"
-				@click="onInstallClick"
 				data-test-id="install-community-package-button"
+				@click="onInstallClick"
 			/>
 		</template>
 	</Modal>
@@ -101,7 +101,7 @@ import {
 	COMMUNITY_NODES_INSTALLATION_DOCS_URL,
 	COMMUNITY_NODES_RISKS_DOCS_URL,
 } from '@/constants';
-import { useToast } from '@/composables';
+import { useToast } from '@/composables/useToast';
 import { useCommunityNodesStore } from '@/stores/communityNodes.store';
 
 export default defineComponent({
diff --git a/packages/editor-ui/src/components/CommunityPackageManageConfirmModal.vue b/packages/editor-ui/src/components/CommunityPackageManageConfirmModal.vue
index f6d11065d7..16ce302695 100644
--- a/packages/editor-ui/src/components/CommunityPackageManageConfirmModal.vue
+++ b/packages/editor-ui/src/components/CommunityPackageManageConfirmModal.vue
@@ -3,16 +3,16 @@
 		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">
 					<span v-text="getModalContent.description"></span>
@@ -36,7 +36,7 @@
 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';
+import { useToast } from '@/composables/useToast';
 import { mapStores } from 'pinia';
 import { useCommunityNodesStore } from '@/stores/communityNodes.store';
 import { createEventBus } from 'n8n-design-system/utils';
diff --git a/packages/editor-ui/src/components/ContactPromptModal.vue b/packages/editor-ui/src/components/ContactPromptModal.vue
index 7a8dcc6338..c0ee2f70da 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,7 +26,7 @@
 		</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>
@@ -42,12 +42,12 @@ 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';
+import { useToast } from '@/composables/useToast';
 
 export default defineComponent({
 	name: 'ContactPromptModal',
-	mixins: [workflowHelpers],
 	components: { Modal },
+	mixins: [workflowHelpers],
 	props: ['modalName'],
 	setup() {
 		return {
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 0000000000..761e40ef94
--- /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"
+				@visibleChange="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 88b8d71474..c999d9b5cf 100644
--- a/packages/editor-ui/src/components/CopyInput.vue
+++ b/packages/editor-ui/src/components/CopyInput.vue
@@ -8,8 +8,8 @@
 					[$style.collapsed]: collapse,
 					'ph-no-capture': redactValue,
 				}"
-				@click="copy"
 				data-test-id="copy-input"
+				@click="copy"
 			>
 				<span ref="copyInputValue">{{ value }}</span>
 				<div :class="$style.copyButton">
@@ -23,12 +23,11 @@
 
 <script lang="ts">
 import { defineComponent } from 'vue';
-import { copyPaste } from '@/mixins/copyPaste';
-import { useToast } from '@/composables';
+import { useToast } from '@/composables/useToast';
 import { i18n } from '@/plugins/i18n';
+import { useClipboard } from '@/composables/useClipboard';
 
 export default defineComponent({
-	mixins: [copyPaste],
 	props: {
 		label: {
 			type: String,
@@ -68,14 +67,17 @@ export default defineComponent({
 		},
 	},
 	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({
 				title: this.toastTitle,
diff --git a/packages/editor-ui/src/components/CredentialCard.vue b/packages/editor-ui/src/components/CredentialCard.vue
index 80ba4b5498..c589f9829e 100644
--- a/packages/editor-ui/src/components/CredentialCard.vue
+++ b/packages/editor-ui/src/components/CredentialCard.vue
@@ -1,7 +1,7 @@
 <template>
 	<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="$style.cardHeading">
@@ -12,7 +12,7 @@
 			<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" /> |
+					>{{ $locale.baseText('credentials.item.updated') }} <TimeAgo :date="data.updatedAt" /> |
 				</span>
 				<span v-show="data"
 					>{{ $locale.baseText('credentials.item.created') }} {{ formattedCreatedAtDate }}
@@ -20,7 +20,7 @@
 			</n8n-text>
 		</div>
 		<template #append>
-			<div :class="$style.cardActions" ref="cardActions">
+			<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') }}
@@ -37,7 +37,7 @@ import { defineComponent } from 'vue';
 import type { ICredentialsResponse, IUser } from '@/Interface';
 import type { ICredentialType } from 'n8n-workflow';
 import { EnterpriseEditionFeature, MODAL_CONFIRM } from '@/constants';
-import { useMessage } from '@/composables';
+import { useMessage } from '@/composables/useMessage';
 import CredentialIcon from '@/components/CredentialIcon.vue';
 import type { IPermissions } from '@/permissions';
 import { getCredentialPermissions } from '@/permissions';
@@ -54,16 +54,6 @@ export const CREDENTIAL_LIST_ITEM_ACTIONS = {
 };
 
 export default defineComponent({
-	data() {
-		return {
-			EnterpriseEditionFeature,
-		};
-	},
-	setup() {
-		return {
-			...useMessage(),
-		};
-	},
 	components: {
 		TimeAgo,
 		CredentialIcon,
@@ -88,6 +78,16 @@ export default defineComponent({
 			default: false,
 		},
 	},
+	setup() {
+		return {
+			...useMessage(),
+		};
+	},
+	data() {
+		return {
+			EnterpriseEditionFeature,
+		};
+	},
 	computed: {
 		...mapStores(useCredentialsStore, useUIStore, useUsersStore),
 		currentUser(): IUser | null {
@@ -142,7 +142,7 @@ export default defineComponent({
 		},
 		async onAction(action: string) {
 			if (action === CREDENTIAL_LIST_ITEM_ACTIONS.OPEN) {
-				await this.onClick();
+				await this.onClick(new Event('click'));
 			} else if (action === CREDENTIAL_LIST_ITEM_ACTIONS.DELETE) {
 				const deleteConfirmed = await this.confirm(
 					this.$locale.baseText(
diff --git a/packages/editor-ui/src/components/CredentialEdit/AuthTypeSelector.vue b/packages/editor-ui/src/components/CredentialEdit/AuthTypeSelector.vue
index 7c34a3a322..be2e1963fb 100644
--- a/packages/editor-ui/src/components/CredentialEdit/AuthTypeSelector.vue
+++ b/packages/editor-ui/src/components/CredentialEdit/AuthTypeSelector.vue
@@ -8,12 +8,12 @@ import {
 	getNodeAuthFields,
 	getNodeAuthOptions,
 	isAuthRelatedParameter,
-} from '@/utils';
+} from '@/utils/nodeTypesUtils';
 import type { INodeProperties, INodeTypeDescription, NodeParameterValue } from 'n8n-workflow';
 import { computed, onMounted, ref } from 'vue';
 
 export interface Props {
-	credentialType: Object;
+	credentialType: object;
 }
 
 const emit = defineEmits<{
@@ -87,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])
 			) {
@@ -118,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"
+				: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>
diff --git a/packages/editor-ui/src/components/CredentialEdit/CredentialConfig.vue b/packages/editor-ui/src/components/CredentialEdit/CredentialConfig.vue
index 37b8e7f4c7..78e8cb09d9 100644
--- a/packages/editor-ui/src/components/CredentialEdit/CredentialConfig.vue
+++ b/packages/editor-ui/src/components/CredentialEdit/CredentialConfig.vue
@@ -1,6 +1,6 @@
 <template>
 	<div :class="$style.container" data-test-id="node-credentials-config-container">
-		<banner
+		<Banner
 			v-show="showValidationWarning"
 			theme="danger"
 			:message="
@@ -13,7 +13,7 @@
 			"
 		/>
 
-		<banner
+		<Banner
 			v-if="authError && !showValidationWarning"
 			theme="danger"
 			:message="
@@ -25,43 +25,43 @@
 				)
 			"
 			: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"
-			@click="$emit('retest')"
+			: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">
@@ -73,7 +73,7 @@
 
 			<AuthTypeSelector
 				v-if="showAuthTypeSelector && isNewCredential"
-				:credentialType="credentialType"
+				:credential-type="credentialType"
 				@authTypeChanged="onAuthTypeChange"
 			/>
 
@@ -81,17 +81,17 @@
 				v-if="isOAuthType && credentialProperties.length"
 				: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')
 				"
-				:redactValue="true"
+				:redact-value="true"
 			/>
 		</template>
-		<enterprise-edition v-else :features="[EnterpriseEditionFeature.Sharing]">
+		<EnterpriseEdition v-else :features="[EnterpriseEditionFeature.Sharing]">
 			<div>
 				<n8n-info-tip :bold="false">
 					{{
@@ -101,14 +101,14 @@
 					}}
 				</n8n-info-tip>
 			</div>
-		</enterprise-edition>
+		</EnterpriseEdition>
 
 		<CredentialInputs
-			v-if="credentialType && credentialPermissions.updateConnection"
-			:credentialData="credentialData"
-			:credentialProperties="credentialProperties"
-			:documentationUrl="documentationUrl"
-			:showValidationWarnings="showValidationWarning"
+			v-if="credentialType && credentialPermissions.update"
+			:credential-data="credentialData"
+			:credential-properties="credentialProperties"
+			:documentation-url="documentationUrl"
+			:show-validation-warnings="showValidationWarning"
 			@update="onDataChange"
 		/>
 
@@ -119,7 +119,7 @@
 				!isOAuthConnected &&
 				credentialPermissions.isOwner
 			"
-			:isGoogleOAuthType="isGoogleOAuthType"
+			:is-google-o-auth-type="isGoogleOAuthType"
 			@click="$emit('oauth')"
 		/>
 
@@ -145,7 +145,7 @@ 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';
@@ -288,7 +288,7 @@ export default defineComponent({
 			const activeNode = this.ndvStore.activeNode;
 			const isCommunityNode = activeNode ? isCommunityPackageName(activeNode.type) : false;
 
-			const documentationUrl = type && type.documentationUrl;
+			const documentationUrl = type?.documentationUrl;
 
 			if (!documentationUrl) {
 				return '';
@@ -306,7 +306,7 @@ export default defineComponent({
 
 			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');
 			}
 
diff --git a/packages/editor-ui/src/components/CredentialEdit/CredentialEdit.vue b/packages/editor-ui/src/components/CredentialEdit/CredentialEdit.vue
index 22a5e8f3ef..f494c1c663 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
-						:modelValue="credentialName"
+						:model-value="credentialName"
 						:subtitle="credentialType ? credentialType.displayName : ''"
-						:readonly="!credentialPermissions.updateName || !credentialType"
+						:readonly="!credentialPermissions.update || !credentialType"
 						type="Credential"
-						@update:modelValue="onNameEdit"
 						data-test-id="credential-name"
+						@update:modelValue="onNameEdit"
 					/>
 				</div>
 				<div :class="$style.credActions">
@@ -31,20 +31,20 @@
 						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>
@@ -53,26 +53,31 @@
 		<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"
 						:mode="mode"
-						:selectedCredential="selectedCredential"
-						:showAuthTypeSelector="requiredCredentials"
+						:selected-credential="selectedCredential"
+						:show-auth-type-selector="requiredCredentials"
 						@update="onDataChange"
 						@oauth="oAuthCredentialAuthorize"
 						@retest="retestCredential"
@@ -83,24 +88,24 @@
 				<div v-else-if="activeTab === 'sharing' && credentialType" :class="$style.mainContent">
 					<CredentialSharing
 						:credential="currentCredential"
-						:credentialData="credentialData"
-						:credentialId="credentialId"
-						:credentialPermissions="credentialPermissions"
-						:modalBus="modalBus"
+						:credential-data="credentialData"
+						:credential-id="credentialId"
+						:credential-permissions="credentialPermissions"
+						:modal-bus="modalBus"
 						@update:modelValue="onChangeSharedWith"
 					/>
 				</div>
 				<div v-else-if="activeTab === 'details' && credentialType" :class="$style.mainContent">
 					<CredentialInfo
-						:nodeAccess="nodeAccess"
-						:nodesWithAccess="nodesWithAccess"
-						:currentCredential="currentCredential"
-						:credentialPermissions="credentialPermissions"
+						:node-access="nodeAccess"
+						:nodes-with-access="nodesWithAccess"
+						:current-credential="currentCredential"
+						:credential-permissions="credentialPermissions"
 						@accessChange="onNodeAccessChange"
 					/>
 				</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>
@@ -125,13 +130,14 @@ import type {
 	INodeProperties,
 	INodeTypeDescription,
 	ITelemetryTrackProperties,
+	IDataObject,
 } from 'n8n-workflow';
 import { NodeHelpers } from 'n8n-workflow';
 import CredentialIcon from '@/components/CredentialIcon.vue';
 
-import { nodeHelpers } from '@/mixins/nodeHelpers';
-import { useToast, useMessage } from '@/composables';
-
+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';
@@ -139,7 +145,6 @@ 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 type { IDataObject } from 'n8n-workflow';
 import FeatureComingSoon from '@/components/FeatureComingSoon.vue';
 import type { IPermissions } from '@/permissions';
 import { getCredentialPermissions } from '@/permissions';
@@ -151,16 +156,16 @@ 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,
-	isExpression,
-	isTestableExpression,
-} from '@/utils';
-import { externalHooks } from '@/mixins/externalHooks';
+} from '@/utils/nodeTypesUtils';
+import { isValidCredentialResponse, isCredentialModalState } from '@/utils/typeGuards';
+import { isExpression, isTestableExpression } from '@/utils/expressions';
+import { useExternalHooks } from '@/composables/useExternalHooks';
 
 interface NodeAccessMap {
 	[nodeType: string]: ICredentialNodeAccess | null;
@@ -168,7 +173,6 @@ interface NodeAccessMap {
 
 export default defineComponent({
 	name: 'CredentialEdit',
-	mixins: [nodeHelpers, externalHooks],
 	components: {
 		CredentialSharing,
 		CredentialConfig,
@@ -193,9 +197,13 @@ export default defineComponent({
 		},
 	},
 	setup() {
+		const nodeHelpers = useNodeHelpers();
+
 		return {
+			externalHooks: useExternalHooks(),
 			...useToast(),
 			...useMessage(),
+			nodeHelpers,
 		};
 	},
 	data() {
@@ -219,6 +227,7 @@ export default defineComponent({
 			selectedCredential: '',
 			requiredCredentials: false, // Are credentials required or optional for the node
 			hasUserSpecifiedName: false,
+			isSharedWithChanged: false,
 		};
 	},
 	async mounted() {
@@ -262,7 +271,7 @@ export default defineComponent({
 			}
 		}
 
-		await this.$externalHooks().run('credentialsEdit.credentialModalOpened', {
+		await this.externalHooks.run('credentialsEdit.credentialModalOpened', {
 			credentialType: this.credentialTypeName,
 			isEditingCredential: this.mode === 'edit',
 			activeNode: this.ndvStore.activeNode,
@@ -270,7 +279,7 @@ export default defineComponent({
 
 		setTimeout(async () => {
 			if (this.credentialId) {
-				if (!this.requiredPropertiesFilled && this.credentialPermissions.isOwner === true) {
+				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;
@@ -290,6 +299,7 @@ export default defineComponent({
 			useUIStore,
 			useUsersStore,
 			useWorkflowsStore,
+			useNodeTypesStore,
 		),
 		activeNodeType(): INodeTypeDescription | null {
 			const activeNode = this.ndvStore.activeNode;
@@ -364,7 +374,7 @@ export default defineComponent({
 		},
 		isCredentialTestable(): boolean {
 			// Sharees can always test since they can't see the data.
-			if (this.credentialPermissions.isOwner === false) {
+			if (!this.credentialPermissions.isOwner) {
 				return true;
 			}
 			if (this.isOAuthType || !this.requiredPropertiesFilled) {
@@ -495,7 +505,7 @@ export default defineComponent({
 		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;
 				}
 			}
@@ -571,7 +581,12 @@ export default defineComponent({
 				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);
@@ -678,10 +693,11 @@ export default defineComponent({
 				...this.credentialData,
 				sharedWith: sharees,
 			};
+			this.isSharedWithChanged = true;
 			this.hasUnsavedChanges = true;
 		},
 
-		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;
 
@@ -701,7 +717,7 @@ export default defineComponent({
 		getParentTypes(name: string): string[] {
 			const credentialType = this.credentialsStore.getCredentialTypeByName(name);
 
-			if (credentialType === undefined || credentialType.extends === undefined) {
+			if (credentialType?.extends === undefined) {
 				return [];
 			}
 
@@ -828,7 +844,7 @@ export default defineComponent({
 
 			this.isSaving = false;
 			if (credential) {
-				this.credentialId = credential.id as string;
+				this.credentialId = credential.id;
 
 				if (this.isCredentialTestable) {
 					this.isTesting = true;
@@ -872,7 +888,7 @@ export default defineComponent({
 				}
 
 				this.$telemetry.track('User saved credentials', trackProperties);
-				await this.$externalHooks().run('credentialEdit.saveCredential', trackProperties);
+				await this.externalHooks.run('credentialEdit.saveCredential', trackProperties);
 			}
 
 			return credential;
@@ -895,7 +911,7 @@ export default defineComponent({
 				return null;
 			}
 
-			await this.$externalHooks().run('credential.saved', {
+			await this.externalHooks.run('credential.saved', {
 				credential_type: credentialDetails.type,
 				credential_id: credential.id,
 				is_new: true,
@@ -915,10 +931,23 @@ export default defineComponent({
 		): 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(
@@ -929,7 +958,7 @@ export default defineComponent({
 				return null;
 			}
 
-			await this.$externalHooks().run('credential.saved', {
+			await this.externalHooks.run('credential.saved', {
 				credential_type: credentialDetails.type,
 				credential_id: credential.id,
 				is_new: false,
@@ -937,7 +966,7 @@ export default defineComponent({
 
 			// Now that the credentials changed check if any nodes use credentials
 			// which have now a different name
-			this.updateNodesCredentialsIssues();
+			this.nodeHelpers.updateNodesCredentialsIssues();
 
 			return credential;
 		},
@@ -984,7 +1013,7 @@ export default defineComponent({
 
 			this.isDeleting = false;
 			// Now that the credentials were removed check if any nodes used them
-			this.updateNodesCredentialsIssues();
+			this.nodeHelpers.updateNodesCredentialsIssues();
 			this.credentialData = {};
 
 			this.showMessage({
diff --git a/packages/editor-ui/src/components/CredentialEdit/CredentialInfo.vue b/packages/editor-ui/src/components/CredentialEdit/CredentialInfo.vue
index c23a8dcb3f..da3c2f971d 100644
--- a/packages/editor-ui/src/components/CredentialEdit/CredentialInfo.vue
+++ b/packages/editor-ui/src/components/CredentialEdit/CredentialInfo.vue
@@ -1,6 +1,6 @@
 <template>
 	<div :class="$style.container">
-		<el-row>
+		<el-row v-if="nodesWithAccess.length > 0">
 			<el-col :span="8" :class="$style.accessLabel">
 				<n8n-text :compact="true" :bold="true">
 					{{ $locale.baseText('credentialEdit.credentialInfo.allowUseBy') }}
@@ -9,14 +9,14 @@
 			<el-col :span="16">
 				<div v-for="node in nodesWithAccess" :key="node.name" :class="$style.valueLabel">
 					<el-checkbox
-						v-if="credentialPermissions.updateNodeAccess"
+						v-if="credentialPermissions.update"
 						:label="
 							$locale.headerText({
 								key: `headers.${shortNodeType(node)}.displayName`,
 								fallback: node.displayName,
 							})
 						"
-						:modelValue="!!nodeAccess[node.name]"
+						:model-value="!!nodeAccess[node.name]"
 						@update:modelValue="(val) => onNodeAccessChange(node.name, val)"
 					/>
 					<n8n-text v-else>
@@ -75,10 +75,10 @@ import type { INodeTypeDescription } from 'n8n-workflow';
 
 export default defineComponent({
 	name: 'CredentialInfo',
-	props: ['nodesWithAccess', 'nodeAccess', 'currentCredential', 'credentialPermissions'],
 	components: {
 		TimeAgo,
 	},
+	props: ['nodesWithAccess', 'nodeAccess', 'currentCredential', 'credentialPermissions'],
 	methods: {
 		onNodeAccessChange(name: string, value: string) {
 			this.$emit('accessChange', {
diff --git a/packages/editor-ui/src/components/CredentialEdit/CredentialInputs.vue b/packages/editor-ui/src/components/CredentialEdit/CredentialInputs.vue
index a75068d142..7ff4aeac07 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,14 +9,14 @@
 		>
 			<!-- 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"
+				event-source="credentials"
 				@update="valueChanged"
 			/>
 		</form>
@@ -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: {
diff --git a/packages/editor-ui/src/components/CredentialEdit/CredentialSharing.ee.vue b/packages/editor-ui/src/components/CredentialEdit/CredentialSharing.ee.vue
index d0988a16ee..c26ccec625 100644
--- a/packages/editor-ui/src/components/CredentialEdit/CredentialSharing.ee.vue
+++ b/packages/editor-ui/src/components/CredentialEdit/CredentialSharing.ee.vue
@@ -12,7 +12,7 @@
 						uiStore.contextBasedTranslationKeys.credentials.sharing.unavailable.description,
 					)
 				"
-				:buttonText="
+				:button-text="
 					$locale.baseText(
 						uiStore.contextBasedTranslationKeys.credentials.sharing.unavailable.button,
 					)
@@ -26,40 +26,42 @@
 				:description="
 					$locale.baseText('credentialEdit.credentialSharing.isDefaultUser.description')
 				"
-				:buttonText="$locale.baseText('credentialEdit.credentialSharing.isDefaultUser.button')"
+				: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"
 				@update:modelValue="onAddSharee"
@@ -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>
@@ -82,7 +84,7 @@
 <script lang="ts">
 import type { IUser, IUserListAction } from '@/Interface';
 import { defineComponent } from 'vue';
-import { useMessage } from '@/composables';
+import { useMessage } from '@/composables/useMessage';
 import { mapStores } from 'pinia';
 import { useUsersStore } from '@/stores/users.store';
 import { useSettingsStore } from '@/stores/settings.store';
@@ -124,12 +126,12 @@ export default defineComponent({
 		},
 		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[] {
@@ -143,6 +145,14 @@ export default defineComponent({
 		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) {
@@ -189,9 +199,6 @@ export default defineComponent({
 			void this.uiStore.goToUpgrade('credential_sharing', 'upgrade-credentials-sharing');
 		},
 	},
-	mounted() {
-		void this.loadUsers();
-	},
 });
 </script>
 
diff --git a/packages/editor-ui/src/components/CredentialEdit/GoogleAuthButton.vue b/packages/editor-ui/src/components/CredentialEdit/GoogleAuthButton.vue
index 309f021e86..f2eb2ca9de 100644
--- a/packages/editor-ui/src/components/CredentialEdit/GoogleAuthButton.vue
+++ b/packages/editor-ui/src/components/CredentialEdit/GoogleAuthButton.vue
@@ -7,14 +7,16 @@
 </template>
 
 <script lang="ts" setup>
+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/CredentialIcon.vue b/packages/editor-ui/src/components/CredentialIcon.vue
index b20750e924..43cdcd32fb 100644
--- a/packages/editor-ui/src/components/CredentialIcon.vue
+++ b/packages/editor-ui/src/components/CredentialIcon.vue
@@ -1,8 +1,8 @@
 <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>
 
@@ -44,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 0000000000..1f3980aca8
--- /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 0000000000..f6de2de573
--- /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:modelValue="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 245787cad0..c87e34a129 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
-				:modelValue="displayValue"
+				:model-value="displayValue"
 				:placeholder="
 					parameter.placeholder ? getPlaceholder() : $locale.baseText('parameterInput.select')
 				"
 				:title="displayTitle"
 				:disabled="isReadOnly"
-				ref="innerSelect"
+				data-test-id="credential-select"
 				@update:modelValue="(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,15 +39,15 @@
 			<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]"
+				:override-cred-type="node.parameters[parameter.name]"
 				@credentialSelected="(updateInformation) => $emit('credentialSelected', updateInformation)"
 			/>
 		</div>
diff --git a/packages/editor-ui/src/components/CredentialsSelectModal.vue b/packages/editor-ui/src/components/CredentialsSelectModal.vue
index 4716125c11..5bef0b6311 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"
-					:modelValue="selected"
-					@update:modelValue="onSelect"
+					:model-value="selected"
 					data-test-id="new-credential-type-select"
+					@update:modelValue="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>
@@ -61,19 +61,32 @@
 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.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 defineComponent({
 	name: 'CredentialsSelectModal',
-	mixins: [externalHooks],
 	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);
@@ -87,14 +100,6 @@ export default defineComponent({
 			}
 		}, 0);
 	},
-	data() {
-		return {
-			modalBus: createEventBus(),
-			selected: '',
-			loading: true,
-			CREDENTIAL_SELECT_MODAL_KEY,
-		};
-	},
 	computed: {
 		...mapStores(useCredentialsStore, useUIStore, useWorkflowsStore),
 	},
@@ -114,7 +119,7 @@ export default defineComponent({
 			};
 
 			this.$telemetry.track('User opened Credential modal', telemetryPayload);
-			void 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
index 87c733b7e1..854fb39969 100644
--- a/packages/editor-ui/src/components/DebugPaywallModal.vue
+++ b/packages/editor-ui/src/components/DebugPaywallModal.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { useI18n } from '@/composables';
+import { useI18n } from '@/composables/useI18n';
 import Modal from '@/components/Modal.vue';
 
 const props = defineProps<{
diff --git a/packages/editor-ui/src/components/DeleteUserModal.vue b/packages/editor-ui/src/components/DeleteUserModal.vue
index 8412e61f86..4e8c360625 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,14 +14,14 @@
 						$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
-						:modelValue="operation"
+						:model-value="operation"
 						label="transfer"
 						@update:modelValue="() => setOperation('transfer')"
 					>
@@ -29,19 +29,19 @@
 							$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"
-								:modelValue="transferId"
-								:ignoreIds="ignoreIds"
-								:currentUserId="usersStore.currentUserId"
+								:model-value="transferId"
+								:ignore-ids="ignoreIds"
+								:current-user-id="usersStore.currentUserId"
 								@update:modelValue="setTransferId"
 							/>
 						</n8n-input-label>
 					</div>
 					<el-radio
-						:modelValue="operation"
+						:model-value="operation"
 						label="delete"
 						@update:modelValue="() => setOperation('delete')"
 					>
@@ -50,13 +50,13 @@
 						}}</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
-								:modelValue="deleteConfirmText"
+								:model-value="deleteConfirmText"
 								:placeholder="$locale.baseText('settings.users.deleteConfirmationText')"
 								@update:modelValue="setConfirmText"
 							/>
@@ -70,8 +70,8 @@
 				:loading="loading"
 				:disabled="!enabled"
 				:label="$locale.baseText('settings.users.delete')"
-				@click="onSubmit"
 				float="right"
+				@click="onSubmit"
 			/>
 		</template>
 	</Modal>
@@ -79,7 +79,7 @@
 
 <script lang="ts">
 import { defineComponent } from 'vue';
-import { useToast } from '@/composables';
+import { useToast } from '@/composables/useToast';
 import Modal from '@/components/Modal.vue';
 import type { IUser } from '@/Interface';
 import { mapStores } from 'pinia';
diff --git a/packages/editor-ui/src/components/Draggable.vue b/packages/editor-ui/src/components/Draggable.vue
index c9a67b3a44..91e8e996a6 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>
@@ -22,7 +22,7 @@ import { mapStores } from 'pinia';
 import { defineComponent } from 'vue';
 
 export default defineComponent({
-	name: 'draggable',
+	name: 'Draggable',
 	props: {
 		disabled: {
 			type: Boolean,
diff --git a/packages/editor-ui/src/components/DraggableTarget.vue b/packages/editor-ui/src/components/DraggableTarget.vue
index 3418f60439..0cc331d6b8 100644
--- a/packages/editor-ui/src/components/DraggableTarget.vue
+++ b/packages/editor-ui/src/components/DraggableTarget.vue
@@ -1,6 +1,6 @@
 <template>
 	<div ref="target">
-		<slot :droppable="droppable" :activeDrop="activeDrop"></slot>
+		<slot :droppable="droppable" :active-drop="activeDrop"></slot>
 	</div>
 </template>
 
@@ -9,6 +9,7 @@ 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';
 
 export default defineComponent({
 	props: {
@@ -29,6 +30,7 @@ export default defineComponent({
 	data() {
 		return {
 			hovering: false,
+			id: uuid(),
 		};
 	},
 	mounted() {
@@ -83,7 +85,12 @@ export default defineComponent({
 	},
 	watch: {
 		activeDrop(active) {
-			this.ndvStore.setDraggableCanDrop(active);
+			if (active) {
+				this.ndvStore.setDraggableTargetId(this.id);
+			} else if (this.ndvStore.draggable.activeTargetId === this.id) {
+				// Only clear active target if it is this one
+				this.ndvStore.setDraggableTargetId(null);
+			}
 		},
 	},
 });
diff --git a/packages/editor-ui/src/components/DuplicateWorkflowDialog.vue b/packages/editor-ui/src/components/DuplicateWorkflowDialog.vue
index 62e78ed347..d769d8955f 100644
--- a/packages/editor-ui/src/components/DuplicateWorkflowDialog.vue
+++ b/packages/editor-ui/src/components/DuplicateWorkflowDialog.vue
@@ -1,46 +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"
+					ref="dropdown"
 					v-model="currentTagIds"
-					:createEnabled="true"
-					:eventBus="dropdownBus"
+					:create-enabled="true"
+					:event-bus="dropdownBus"
+					:placeholder="$locale.baseText('duplicateWorkflowDialog.chooseOrCreateATag')"
 					@blur="onTagsBlur"
 					@esc="onTagsEsc"
-					: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>
@@ -52,7 +52,7 @@ 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 { useToast } from '@/composables';
+import { useToast } from '@/composables/useToast';
 import TagsDropdown from '@/components/TagsDropdown.vue';
 import Modal from '@/components/Modal.vue';
 import { useSettingsStore } from '@/stores/settings.store';
@@ -62,12 +62,12 @@ import type { IPermissions } from '@/permissions';
 import { getWorkflowPermissions } from '@/permissions';
 import { useUsersStore } from '@/stores/users.store';
 import { createEventBus } from 'n8n-design-system/utils';
-import { useCredentialsStore } from '@/stores';
+import { useCredentialsStore } from '@/stores/credentials.store';
 
 export default defineComponent({
 	name: 'DuplicateWorkflow',
-	mixins: [workflowHelpers],
 	components: { TagsDropdown, Modal },
+	mixins: [workflowHelpers],
 	props: ['modalName', 'isActive', 'data'],
 	setup() {
 		return {
@@ -122,7 +122,7 @@ export default defineComponent({
 		},
 		focusOnNameInput() {
 			const inputRef = this.$refs.nameInput as HTMLElement | undefined;
-			if (inputRef && inputRef.focus) {
+			if (inputRef?.focus) {
 				inputRef.focus();
 			}
 		},
diff --git a/packages/editor-ui/src/components/EnterpriseEdition.ee.vue b/packages/editor-ui/src/components/EnterpriseEdition.ee.vue
index aea5a52f2b..f2056a0b23 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>
 
diff --git a/packages/editor-ui/src/components/Error/NodeErrorView.vue b/packages/editor-ui/src/components/Error/NodeErrorView.vue
index 03c6268e0e..85323c6120 100644
--- a/packages/editor-ui/src/components/Error/NodeErrorView.vue
+++ b/packages/editor-ui/src/components/Error/NodeErrorView.vue
@@ -1,8 +1,8 @@
 <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="error-message" v-text="getErrorMessage()" />
+			<div v-if="error.description" class="error-description" v-html="getErrorDescription()"></div>
 		</div>
 		<details>
 			<summary class="error-details__summary">
@@ -76,19 +76,19 @@
 							</div>
 						</template>
 						<div>
-							<div class="copy-button" v-if="displayCause">
+							<div v-if="displayCause" class="copy-button">
 								<n8n-icon-button
-									@click="copyCause"
 									:title="$locale.baseText('nodeErrorView.copyToClipboard')"
 									icon="copy"
+									@click="copyCause"
 								/>
 							</div>
-							<vue-json-pretty
+							<VueJsonPretty
 								v-if="displayCause"
 								:data="error.cause"
 								:deep="3"
-								:showLength="true"
-								selectableType="single"
+								:show-length="true"
+								selectable-type="single"
 								path="error"
 								class="json-data"
 							/>
@@ -121,24 +121,31 @@
 import { defineComponent } from 'vue';
 import { mapStores } from 'pinia';
 import VueJsonPretty from 'vue-json-pretty';
-import { copyPaste } from '@/mixins/copyPaste';
-import { useToast } from '@/composables';
+import { useToast } from '@/composables/useToast';
 import { MAX_DISPLAY_DATA_SIZE } from '@/constants';
 
-import type { INodeProperties, INodePropertyCollection, INodePropertyOptions } from 'n8n-workflow';
-import { sanitizeHtml } from '@/utils';
+import type {
+	INodeProperties,
+	INodePropertyCollection,
+	INodePropertyOptions,
+	NodeOperationError,
+} from 'n8n-workflow';
+import { sanitizeHtml } from '@/utils/htmlUtils';
 import { useNDVStore } from '@/stores/ndv.store';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
+import { useClipboard } from '@/composables/useClipboard';
 
 export default defineComponent({
 	name: 'NodeErrorView',
-	mixins: [copyPaste],
-	props: ['error'],
 	components: {
 		VueJsonPretty,
 	},
+	props: ['error'],
 	setup() {
+		const clipboard = useClipboard();
+
 		return {
+			clipboard,
 			...useToast(),
 		};
 	},
@@ -170,7 +177,19 @@ export default defineComponent({
 				.replace(/%%PARAMETER_FULL%%/g, parameterFullName);
 		},
 		getErrorDescription(): string {
-			if (!this.error.context || !this.error.context.descriptionTemplate) {
+			const isSubNodeError =
+				this.error.name === 'NodeOperationError' &&
+				(this.error as NodeOperationError).functionality === 'configuration-node';
+
+			if (isSubNodeError) {
+				return sanitizeHtml(
+					this.error.description +
+						this.$locale.baseText('pushConnection.executionError.openNode', {
+							interpolate: { node: this.error.node.name },
+						}),
+				);
+			}
+			if (!this.error.context?.descriptionTemplate) {
 				return sanitizeHtml(this.error.description);
 			}
 
@@ -182,7 +201,21 @@ export default defineComponent({
 		getErrorMessage(): string {
 			const baseErrorMessage = this.$locale.baseText('nodeErrorView.error') + ': ';
 
-			if (!this.error.context || !this.error.context.messageTemplate) {
+			const isSubNodeError =
+				this.error.name === 'NodeOperationError' &&
+				(this.error as NodeOperationError).functionality === 'configuration-node';
+
+			if (isSubNodeError) {
+				const baseErrorMessageSubNode = this.$locale.baseText('nodeErrorView.errorSubNode', {
+					interpolate: { node: this.error.node.name },
+				});
+				return baseErrorMessageSubNode;
+			}
+
+			if (this.error.message === this.error.description) {
+				return baseErrorMessage;
+			}
+			if (!this.error.context?.messageTemplate) {
 				return baseErrorMessage + this.error.message;
 			}
 
@@ -200,7 +233,7 @@ export default defineComponent({
 					throw new Error();
 				}
 
-				if (fullPath === false) {
+				if (!fullPath) {
 					return parameters.pop()!.displayName;
 				}
 				return parameters.map((parameter) => parameter.displayName).join(' > ');
@@ -252,7 +285,7 @@ export default defineComponent({
 			return [currentParameter];
 		},
 		copyCause() {
-			this.copyToClipboard(JSON.stringify(this.error.cause));
+			void this.clipboard.copy(JSON.stringify(this.error.cause));
 			this.copySuccess();
 		},
 		copySuccess() {
@@ -271,7 +304,7 @@ export default defineComponent({
 }
 
 .error-message {
-	color: #ff0000;
+	color: var(--color-ndv-ouptut-error-font);
 	font-weight: bold;
 	font-size: 1.1rem;
 }
diff --git a/packages/editor-ui/src/components/ExecutionFilter.vue b/packages/editor-ui/src/components/ExecutionFilter.vue
index 0a60cff53a..a2f273cb91 100644
--- a/packages/editor-ui/src/components/ExecutionFilter.vue
+++ b/packages/editor-ui/src/components/ExecutionFilter.vue
@@ -1,6 +1,5 @@
 <script lang="ts" setup>
 import { computed, reactive, onBeforeMount, ref } from 'vue';
-import debounce from 'lodash/debounce';
 import type {
 	ExecutionFilterType,
 	ExecutionFilterMetadata,
@@ -8,13 +7,13 @@ import type {
 } from '@/Interface';
 import { i18n as locale } from '@/plugins/i18n';
 import TagsDropdown from '@/components/TagsDropdown.vue';
-import { getObjectKeys, isEmpty } from '@/utils';
+import { getObjectKeys, isEmpty } from '@/utils/typesUtils';
 import { EnterpriseEditionFeature } from '@/constants';
 import { useSettingsStore } from '@/stores/settings.store';
-import { useUsageStore } from '@/stores/usage.store';
 import { useUIStore } from '@/stores/ui.store';
-import { useTelemetry } from '@/composables';
+import { useTelemetry } from '@/composables/useTelemetry';
 import type { Placement } from '@floating-ui/core';
+import { useDebounce } from '@/composables/useDebounce';
 
 export type ExecutionFilterProps = {
 	workflows?: IWorkflowShortResponse[];
@@ -25,8 +24,8 @@ export type ExecutionFilterProps = {
 const DATE_TIME_MASK = 'YYYY-MM-DD HH:mm';
 
 const settingsStore = useSettingsStore();
-const usageStore = useUsageStore();
 const uiStore = useUIStore();
+const { debounce } = useDebounce();
 
 const telemetry = useTelemetry();
 
@@ -37,7 +36,9 @@ const props = withDefaults(defineProps<ExecutionFilterProps>(), {
 const emit = defineEmits<{
 	(event: 'filterChanged', value: ExecutionFilterType): void;
 }>();
-const debouncedEmit = debounce(emit, 500);
+const debouncedEmit = debounce(emit, {
+	debounceTime: 500,
+});
 
 const isCustomDataFilterTracked = ref(false);
 const isAdvancedExecutionFilterEnabled = computed(() =>
@@ -194,10 +195,10 @@ onBeforeMount(() => {
 				<TagsDropdown
 					id="execution-filter-tags"
 					:placeholder="locale.baseText('workflowOpen.filterWorkflows')"
-					:modelValue="filter.tags"
-					:createEnabled="false"
-					@update:modelValue="onTagsChange"
+					:model-value="filter.tags"
+					:create-enabled="false"
 					data-test-id="executions-filter-tags-select"
+					@update:modelValue="onTagsChange"
 				/>
 			</div>
 			<div :class="$style.group">
@@ -225,9 +226,9 @@ onBeforeMount(() => {
 				<div :class="$style.dates">
 					<el-date-picker
 						id="execution-filter-start-date"
+						v-model="vModel.startDate"
 						type="datetime"
 						:teleported="false"
-						v-model="vModel.startDate"
 						:format="DATE_TIME_MASK"
 						:placeholder="locale.baseText('executionsFilter.startDate')"
 						data-test-id="executions-filter-start-date-picker"
@@ -235,9 +236,9 @@ onBeforeMount(() => {
 					<span :class="$style.divider">to</span>
 					<el-date-picker
 						id="execution-filter-end-date"
+						v-model="vModel.endDate"
 						type="datetime"
 						:teleported="false"
-						v-model="vModel.endDate"
 						:format="DATE_TIME_MASK"
 						:placeholder="locale.baseText('executionsFilter.endDate')"
 						data-test-id="executions-filter-end-date-picker"
@@ -273,8 +274,8 @@ onBeforeMount(() => {
 								<template #link>
 									<a
 										href="#"
-										@click.prevent="goToUpgrade"
 										data-test-id="executions-filter-view-plans-link"
+										@click.prevent="goToUpgrade"
 										>{{ locale.baseText('executionsFilter.customData.inputTooltip.link') }}</a
 									>
 								</template>
@@ -286,9 +287,9 @@ onBeforeMount(() => {
 							type="text"
 							:disabled="!isAdvancedExecutionFilterEnabled"
 							:placeholder="locale.baseText('executionsFilter.savedDataKeyPlaceholder')"
-							:modelValue="filter.metadata[0]?.key"
-							@update:modelValue="onFilterMetaChange(0, 'key', $event)"
+							:model-value="filter.metadata[0]?.key"
 							data-test-id="execution-filter-saved-data-key-input"
+							@update:modelValue="onFilterMetaChange(0, 'key', $event)"
 						/>
 					</n8n-tooltip>
 					<label for="execution-filter-saved-data-value">{{
@@ -310,9 +311,9 @@ onBeforeMount(() => {
 							type="text"
 							:disabled="!isAdvancedExecutionFilterEnabled"
 							:placeholder="locale.baseText('executionsFilter.savedDataValuePlaceholder')"
-							:modelValue="filter.metadata[0]?.value"
-							@update:modelValue="onFilterMetaChange(0, 'value', $event)"
+							:model-value="filter.metadata[0]?.value"
 							data-test-id="execution-filter-saved-data-value-input"
+							@update:modelValue="onFilterMetaChange(0, 'value', $event)"
 						/>
 					</n8n-tooltip>
 				</div>
@@ -320,10 +321,10 @@ onBeforeMount(() => {
 			<n8n-button
 				v-if="!!countSelectedFilterProps"
 				:class="$style.resetBtn"
-				@click="onFilterReset"
 				size="large"
 				text
 				data-test-id="executions-filter-reset-button"
+				@click="onFilterReset"
 			>
 				{{ locale.baseText('executionsFilter.reset') }}
 			</n8n-button>
diff --git a/packages/editor-ui/src/components/ExecutionTime.vue b/packages/editor-ui/src/components/ExecutionTime.vue
index 012b01365f..3075af4ab0 100644
--- a/packages/editor-ui/src/components/ExecutionTime.vue
+++ b/packages/editor-ui/src/components/ExecutionTime.vue
@@ -6,27 +6,25 @@
 
 <script lang="ts">
 import { defineComponent } from 'vue';
-import { genericHelpers } from '@/mixins/genericHelpers';
 
 export default defineComponent({
 	name: 'ExecutionTime',
-	mixins: [genericHelpers],
 	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.displayTimer(msPassed);
+			return this.$locale.displayTimer(msPassed);
 		},
 	},
-	data() {
-		return {
-			nowTime: -1,
-			intervalTimer: null as null | NodeJS.Timeout,
-		};
-	},
 	mounted() {
 		this.setNow();
 		this.intervalTimer = setInterval(() => {
@@ -46,9 +44,3 @@ export default defineComponent({
 	},
 });
 </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
index b5271d6ce7..749e09834c 100644
--- a/packages/editor-ui/src/components/ExecutionsList.vue
+++ b/packages/editor-ui/src/components/ExecutionsList.vue
@@ -2,19 +2,19 @@
 	<div :class="$style.execListWrapper">
 		<div :class="$style.execList">
 			<div :class="$style.execListHeader">
-				<n8n-heading tag="h1" size="2xlarge">{{ this.pageTitle }}</n8n-heading>
+				<n8n-heading tag="h1" size="2xlarge">{{ pageTitle }}</n8n-heading>
 				<div :class="$style.execListHeaderControls">
 					<n8n-loading v-if="isMounting" :class="$style.filterLoader" variant="custom" />
 					<el-checkbox
 						v-else
-						class="mr-xl"
 						v-model="autoRefresh"
-						@update:modelValue="handleAutoRefreshToggle"
+						class="mr-xl"
 						data-test-id="execution-auto-refresh-checkbox"
+						@update:modelValue="handleAutoRefreshToggle"
 					>
 						{{ i18n.baseText('executionsList.autoRefresh') }}
 					</el-checkbox>
-					<execution-filter
+					<ExecutionFilter
 						v-show="!isMounting"
 						:workflows="workflows"
 						@filterChanged="onFilterChanged"
@@ -31,9 +31,9 @@
 						interpolate: { executionNum: finishedExecutionsCount },
 					})
 				"
-				:modelValue="allExistingSelected"
-				@update:modelValue="handleCheckAllExistingChange"
+				:model-value="allExistingSelected"
 				data-test-id="select-all-executions-checkbox"
+				@update:modelValue="handleCheckAllExistingChange"
 			/>
 
 			<div v-if="isMounting">
@@ -46,11 +46,11 @@
 					<tr>
 						<th>
 							<el-checkbox
-								:modelValue="allVisibleSelected"
-								@update:modelValue="handleCheckAllVisibleChange"
+								:model-value="allVisibleSelected"
 								:disabled="finishedExecutionsCount < 1"
 								label=""
 								data-test-id="select-visible-executions-checkbox"
+								@update:modelValue="handleCheckAllVisibleChange"
 							/>
 						</th>
 						<th>{{ i18n.baseText('executionsList.name') }}</th>
@@ -72,10 +72,10 @@
 						<td>
 							<el-checkbox
 								v-if="execution.stoppedAt !== undefined && execution.id"
-								:modelValue="selectedItems[execution.id] || allExistingSelected"
-								@update:modelValue="handleCheckboxChanged(execution.id)"
+								:model-value="selectedItems[execution.id] || allExistingSelected"
 								label=""
 								data-test-id="select-execution-checkbox"
+								@update:modelValue="handleCheckboxChanged(execution.id)"
 							/>
 						</td>
 						<td>
@@ -107,14 +107,14 @@
 											v-else-if="execution.stoppedAt !== null && execution.stoppedAt !== undefined"
 										>
 											{{
-												displayTimer(
+												i18n.displayTimer(
 													new Date(execution.stoppedAt).getTime() -
 														new Date(execution.startedAt).getTime(),
 													true,
 												)
 											}}
 										</span>
-										<execution-time v-else :start-time="execution.startedAt" />
+										<ExecutionTime v-else :start-time="execution.startedAt" />
 									</template>
 								</i18n-t>
 								<n8n-tooltip v-else placement="top">
@@ -168,8 +168,8 @@
 									size="small"
 									outline
 									:label="i18n.baseText('executionsList.stop')"
-									@click.stop="stopExecution(execution.id)"
 									:loading="stoppingExecutions.includes(execution.id)"
+									@click.stop="stopExecution(execution.id)"
 								/>
 							</div>
 						</td>
@@ -231,18 +231,18 @@
 				{{ i18n.baseText('executionsList.empty') }}
 			</div>
 			<div
-				:class="$style.loadMore"
 				v-else-if="
 					finishedExecutionsCount > finishedExecutions.length || finishedExecutionsCountEstimated
 				"
+				:class="$style.loadMore"
 			>
 				<n8n-button
 					icon="sync"
 					:title="i18n.baseText('executionsList.loadMore')"
 					:label="i18n.baseText('executionsList.loadMore')"
-					@click="loadMore()"
 					:loading="isDataLoading"
 					data-test-id="load-more-button"
+					@click="loadMore()"
 				/>
 			</div>
 			<div
@@ -269,14 +269,14 @@
 			<n8n-button
 				:label="i18n.baseText('generic.delete')"
 				type="tertiary"
-				@click="handleDeleteSelected"
 				data-test-id="delete-selected-button"
+				@click="handleDeleteSelected"
 			/>
 			<n8n-button
 				:label="i18n.baseText('executionsList.clearSelection')"
 				type="tertiary"
-				@click="handleClearSelection"
 				data-test-id="clear-selection-button"
+				@click="handleClearSelection"
 			/>
 		</div>
 	</div>
@@ -287,11 +287,12 @@ import { defineComponent } from 'vue';
 import { mapStores } from 'pinia';
 import ExecutionTime from '@/components/ExecutionTime.vue';
 import ExecutionFilter from '@/components/ExecutionFilter.vue';
-import { externalHooks } from '@/mixins/externalHooks';
 import { MODAL_CONFIRM, VIEWS, WAIT_TIME_UNLIMITED } from '@/constants';
-import { genericHelpers } from '@/mixins/genericHelpers';
 import { executionHelpers } from '@/mixins/executionsHelpers';
-import { useToast, useMessage, useI18n, useTelemetry } from '@/composables';
+import { useToast } from '@/composables/useToast';
+import { useMessage } from '@/composables/useMessage';
+import { useI18n } from '@/composables/useI18n';
+import { useTelemetry } from '@/composables/useTelemetry';
 import type {
 	IExecutionsCurrentSummaryExtended,
 	IExecutionDeleteFilter,
@@ -304,16 +305,19 @@ import type { IExecutionsSummary, ExecutionStatus } from 'n8n-workflow';
 import { range as _range } from 'lodash-es';
 import { useUIStore } from '@/stores/ui.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
-import { isEmpty, setPageTitle } from '@/utils';
+import { isEmpty } from '@/utils/typesUtils';
+import { setPageTitle } from '@/utils/htmlUtils';
 import { executionFilterToQueryFilter } from '@/utils/executionUtils';
+import { useExternalHooks } from '@/composables/useExternalHooks';
+import { useRoute } from 'vue-router';
 
 export default defineComponent({
 	name: 'ExecutionsList',
-	mixins: [externalHooks, genericHelpers, executionHelpers],
 	components: {
 		ExecutionTime,
 		ExecutionFilter,
 	},
+	mixins: [executionHelpers],
 	props: {
 		autoRefreshEnabled: {
 			type: Boolean,
@@ -323,10 +327,14 @@ export default defineComponent({
 	setup() {
 		const i18n = useI18n();
 		const telemetry = useTelemetry();
+		const externalHooks = useExternalHooks();
+		const route = useRoute();
 
 		return {
 			i18n,
 			telemetry,
+			externalHooks,
+			route,
 			...useToast(),
 			...useMessage(),
 		};
@@ -340,7 +348,7 @@ export default defineComponent({
 
 			allVisibleSelected: false,
 			allExistingSelected: false,
-			autoRefresh: this.autoRefreshEnabled,
+			autoRefresh: false,
 			autoRefreshTimeout: undefined as undefined | NodeJS.Timer,
 
 			filter: {} as ExecutionFilterType,
@@ -362,14 +370,16 @@ export default defineComponent({
 		document.addEventListener('visibilitychange', this.onDocumentVisibilityChange);
 	},
 	async created() {
+		this.autoRefresh = this.autoRefreshEnabled;
 		await this.loadWorkflows();
 
-		void this.$externalHooks().run('executionsList.openDialog');
+		void this.externalHooks.run('executionsList.openDialog');
 		this.telemetry.track('User opened Executions log', {
 			workflow_id: this.workflowsStore.workflowId,
 		});
 	},
 	beforeUnmount() {
+		this.autoRefresh = false;
 		this.stopAutoRefreshInterval();
 		document.removeEventListener('visibilitychange', this.onDocumentVisibilityChange);
 	},
@@ -932,7 +942,7 @@ export default defineComponent({
 			}
 		},
 		async startAutoRefreshInterval() {
-			if (this.autoRefresh) {
+			if (this.autoRefresh && this.route.name === VIEWS.EXECUTIONS) {
 				await this.loadAutoRefresh();
 				this.autoRefreshTimeout = setTimeout(() => {
 					void this.startAutoRefreshInterval();
@@ -940,10 +950,8 @@ export default defineComponent({
 			}
 		},
 		stopAutoRefreshInterval() {
-			if (this.autoRefreshTimeout) {
-				clearTimeout(this.autoRefreshTimeout);
-				this.autoRefreshTimeout = undefined;
-			}
+			clearTimeout(this.autoRefreshTimeout);
+			this.autoRefreshTimeout = undefined;
 		},
 		onDocumentVisibilityChange() {
 			if (document.visibilityState === 'hidden') {
@@ -1074,7 +1082,7 @@ export default defineComponent({
 		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);
+		background: var(--color-table-header-background);
 
 		&:first-child {
 			padding-left: var(--spacing-s);
@@ -1085,7 +1093,7 @@ export default defineComponent({
 	td {
 		height: 100%;
 		padding: var(--spacing-s) var(--spacing-s) var(--spacing-s) 0;
-		background: var(--color-background-xlight);
+		background: var(--color-table-row-background);
 
 		&:not(:first-child, :nth-last-child(-n + 3)) {
 			width: 100%;
@@ -1127,33 +1135,33 @@ export default defineComponent({
 		}
 
 		&:nth-child(even) td {
-			background: var(--color-background-light);
+			background: var(--color-table-row-even-background);
 		}
 
 		&:hover td {
-			background: var(--color-primary-tint-3);
+			background: var(--color-table-row-hover-background);
 		}
 
 		&.crashed td:first-child::before,
 		&.failed td:first-child::before {
-			background: hsl(var(--color-danger-h), 94%, 80%);
+			background: var(--execution-card-border-error);
 		}
 
 		&.success td:first-child::before {
-			background: hsl(var(--color-success-h), 60%, 70%);
+			background: var(--execution-card-border-success);
 		}
 
 		&.new td:first-child::before,
 		&.running td:first-child::before {
-			background: hsl(var(--color-warning-h), 94%, 80%);
+			background: var(--execution-card-border-running);
 		}
 
 		&.waiting td:first-child::before {
-			background: hsl(var(--color-secondary-h), 94%, 80%);
+			background: var(--execution-card-border-waiting);
 		}
 
 		&.unknown td:first-child::before {
-			background: var(--color-text-light);
+			background: var(--execution-card-border-unknown);
 		}
 	}
 }
@@ -1167,6 +1175,7 @@ export default defineComponent({
 .loadedAll {
 	text-align: center;
 	font-size: var(--font-size-s);
+	color: var(--color-text-light);
 	margin: var(--spacing-l) 0;
 }
 
diff --git a/packages/editor-ui/src/components/ExecutionsUsage.vue b/packages/editor-ui/src/components/ExecutionsUsage.vue
index 8539e0c03a..3f9490f51d 100644
--- a/packages/editor-ui/src/components/ExecutionsUsage.vue
+++ b/packages/editor-ui/src/components/ExecutionsUsage.vue
@@ -67,7 +67,7 @@ import { i18n as locale } from '@/plugins/i18n';
 import { DateTime } from 'luxon';
 import type { CloudPlanAndUsageData } from '@/Interface';
 import { computed } from 'vue';
-import { useUIStore } from '@/stores';
+import { useUIStore } from '@/stores/ui.store';
 
 const PROGRESS_BAR_MINIMUM_THRESHOLD = 8;
 
diff --git a/packages/editor-ui/src/components/ExecutionsView/ExecutionCard.vue b/packages/editor-ui/src/components/ExecutionsView/ExecutionCard.vue
index ba1a5558a9..8d6923956a 100644
--- a/packages/editor-ui/src/components/ExecutionsView/ExecutionCard.vue
+++ b/packages/editor-ui/src/components/ExecutionsView/ExecutionCard.vue
@@ -37,7 +37,7 @@
 						size="small"
 					>
 						{{ $locale.baseText('executionDetails.runningTimeRunning') }}
-						<execution-time :start-time="execution.startedAt" />
+						<ExecutionTime :start-time="execution.startedAt" />
 					</n8n-text>
 					<n8n-text
 						v-else-if="executionUIDetails.runningTime !== ''"
@@ -62,7 +62,7 @@
 					v-if="executionUIDetails.name === 'error'"
 					:class="[$style.icon, $style.retry]"
 					:items="retryExecutionActions"
-					activatorIcon="redo"
+					activator-icon="redo"
 					data-test-id="retry-execution-button"
 					@select="onRetryMenuItemSelect"
 				/>
@@ -90,16 +90,11 @@ import { VIEWS } from '@/constants';
 import ExecutionTime from '@/components/ExecutionTime.vue';
 
 export default defineComponent({
-	name: 'execution-card',
-	mixins: [executionHelpers],
+	name: 'ExecutionCard',
 	components: {
 		ExecutionTime,
 	},
-	data() {
-		return {
-			VIEWS,
-		};
-	},
+	mixins: [executionHelpers],
 	props: {
 		execution: {
 			type: Object as () => IExecutionsSummary,
@@ -114,6 +109,11 @@ export default defineComponent({
 			default: false,
 		},
 	},
+	data() {
+		return {
+			VIEWS,
+		};
+	},
 	computed: {
 		retryExecutionActions(): object[] {
 			return [
@@ -170,7 +170,7 @@ export default defineComponent({
 		}
 		&,
 		& .executionLink {
-			border-left: var(--spacing-4xs) var(--border-style-base) hsl(var(--color-warning-h), 94%, 80%);
+			border-left: var(--spacing-4xs) var(--border-style-base) var(--execution-card-border-running);
 		}
 		.statusLabel,
 		.spinner {
@@ -181,15 +181,14 @@ export default defineComponent({
 	&.success {
 		&,
 		& .executionLink {
-			border-left: var(--spacing-4xs) var(--border-style-base) hsl(var(--color-success-h), 60%, 70%);
+			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)
-				hsl(var(--color-secondary-h), 94%, 80%);
+			border-left: var(--spacing-4xs) var(--border-style-base) var(--execution-card-border-waiting);
 		}
 		.statusLabel {
 			color: var(--color-secondary);
@@ -199,7 +198,7 @@ export default defineComponent({
 	&.error {
 		&,
 		& .executionLink {
-			border-left: var(--spacing-4xs) var(--border-style-base) hsl(var(--color-danger-h), 94%, 80%);
+			border-left: var(--spacing-4xs) var(--border-style-base) var(--execution-card-border-error);
 		}
 		.statusLabel {
 			color: var(--color-danger);
@@ -209,7 +208,7 @@ export default defineComponent({
 	&.unknown {
 		&,
 		& .executionLink {
-			border-left: var(--spacing-4xs) var(--border-style-base) var(--color-text-light);
+			border-left: var(--spacing-4xs) var(--border-style-base) var(--execution-card-border-unknown);
 		}
 	}
 }
diff --git a/packages/editor-ui/src/components/ExecutionsView/ExecutionPreview.vue b/packages/editor-ui/src/components/ExecutionsView/ExecutionPreview.vue
index 5468f6831f..ec7598f80f 100644
--- a/packages/editor-ui/src/components/ExecutionsView/ExecutionPreview.vue
+++ b/packages/editor-ui/src/components/ExecutionsView/ExecutionPreview.vue
@@ -12,8 +12,8 @@
 	</div>
 	<div v-else :class="$style.previewContainer">
 		<div
-			:class="$style.executionDetails"
 			v-if="activeExecution"
+			:class="$style.executionDetails"
 			:data-test-id="`execution-preview-details-${executionId}`"
 		>
 			<div>
@@ -80,7 +80,7 @@
 			</div>
 			<div>
 				<n8n-button
-					size="large"
+					size="medium"
 					:type="debugButtonData.type"
 					:class="{
 						[$style.debugLink]: true,
@@ -96,22 +96,22 @@
 							},
 						}"
 					>
-						<span @click="handleDebugLinkClick" data-test-id="execution-debug-button">{{
+						<span data-test-id="execution-debug-button" @click="handleDebugLinkClick">{{
 							debugButtonData.text
 						}}</span>
 					</router-link>
 				</n8n-button>
 
-				<el-dropdown
+				<ElDropdown
 					v-if="executionUIDetails?.name === 'error'"
+					ref="retryDropdown"
 					trigger="click"
 					class="mr-xs"
 					@command="handleRetryClick"
-					ref="retryDropdown"
 				>
 					<span class="retry-button">
 						<n8n-icon-button
-							size="large"
+							size="medium"
 							type="tertiary"
 							:title="$locale.baseText('executionsList.retryExecution')"
 							icon="redo"
@@ -129,22 +129,22 @@
 							</el-dropdown-item>
 						</el-dropdown-menu>
 					</template>
-				</el-dropdown>
+				</ElDropdown>
 				<n8n-icon-button
 					:title="$locale.baseText('executionDetails.deleteExecution')"
 					icon="trash"
-					size="large"
+					size="medium"
 					type="tertiary"
 					data-test-id="execution-preview-delete-button"
 					@click="onDeleteExecution"
 				/>
 			</div>
 		</div>
-		<workflow-preview
+		<WorkflowPreview
 			mode="execution"
-			loaderType="spinner"
-			:executionId="executionId"
-			:executionMode="executionMode"
+			loader-type="spinner"
+			:execution-id="executionId"
+			:execution-mode="executionMode"
 		/>
 	</div>
 </template>
@@ -152,7 +152,8 @@
 <script lang="ts">
 import { defineComponent } from 'vue';
 import { ElDropdown } from 'element-plus';
-import { useExecutionDebugging, useMessage } from '@/composables';
+import { useExecutionDebugging } from '@/composables/useExecutionDebugging';
+import { useMessage } from '@/composables/useMessage';
 import WorkflowPreview from '@/components/WorkflowPreview.vue';
 import type { IExecutionUIData } from '@/mixins/executionsHelpers';
 import { executionHelpers } from '@/mixins/executionsHelpers';
@@ -161,23 +162,23 @@ import { MODAL_CONFIRM, VIEWS } from '@/constants';
 type RetryDropdownRef = InstanceType<typeof ElDropdown> & { hide: () => void };
 
 export default defineComponent({
-	name: 'execution-preview',
-	mixins: [executionHelpers],
+	name: 'ExecutionPreview',
 	components: {
 		ElDropdown,
 		WorkflowPreview,
 	},
-	data() {
-		return {
-			VIEWS,
-		};
-	},
+	mixins: [executionHelpers],
 	setup() {
 		return {
 			...useMessage(),
 			...useExecutionDebugging(),
 		};
 	},
+	data() {
+		return {
+			VIEWS,
+		};
+	},
 	computed: {
 		executionUIDetails(): IExecutionUIData | null {
 			return this.activeExecution ? this.getExecutionUIDetails(this.activeExecution) : null;
@@ -296,19 +297,7 @@ export default defineComponent({
 }
 
 .debugLink {
-	padding: 0;
+	height: 42px;
 	margin-right: var(--spacing-xs);
-
-	&.secondary {
-		a span {
-			color: var(--color-primary-shade-1);
-		}
-	}
-
-	a span {
-		display: block;
-		padding: var(--spacing-xs) var(--spacing-m);
-		color: var(--color-text-xlight);
-	}
 }
 </style>
diff --git a/packages/editor-ui/src/components/ExecutionsView/ExecutionsInfoAccordion.vue b/packages/editor-ui/src/components/ExecutionsView/ExecutionsInfoAccordion.vue
index ade83195c3..318ff4f5ba 100644
--- a/packages/editor-ui/src/components/ExecutionsView/ExecutionsInfoAccordion.vue
+++ b/packages/editor-ui/src/components/ExecutionsView/ExecutionsInfoAccordion.vue
@@ -3,8 +3,8 @@
 		:class="[$style.accordion, 'mt-2xl']"
 		:title="$locale.baseText('executionsLandingPage.emptyState.accordion.title')"
 		:items="accordionItems"
-		:initiallyExpanded="shouldExpandAccordion"
-		:headerIcon="accordionIcon"
+		:initially-expanded="shouldExpandAccordion"
+		:header-icon="accordionIcon"
 		@click:body="onAccordionClick"
 		@tooltipClick="onItemTooltipClick"
 	>
@@ -23,9 +23,9 @@
 						</div>
 					</template>
 					<n8n-link
-						@click.prevent="openWorkflowSettings"
 						:class="{ [$style.disabled]: isNewWorkflow }"
 						size="small"
+						@click.prevent="openWorkflowSettings"
 					>
 						{{ $locale.baseText('executionsLandingPage.emptyState.accordion.footer.settingsLink') }}
 					</n8n-link>
@@ -54,7 +54,7 @@ interface IWorkflowSaveSettings {
 }
 
 export default defineComponent({
-	name: 'executions-info-accordion',
+	name: 'ExecutionsInfoAccordion',
 	mixins: [workflowHelpers],
 	props: {
 		initiallyExpanded: {
@@ -76,20 +76,20 @@ export default defineComponent({
 			} 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);
 	},
-	watch: {
-		workflowSettings(newSettings: IWorkflowSettings) {
-			this.updateSettings(newSettings);
-		},
-	},
 	computed: {
 		...mapStores(useRootStore, useSettingsStore, useUIStore, useWorkflowsStore),
-		accordionItems(): Object[] {
+		accordionItems(): object[] {
 			return [
 				{
 					id: 'productionExecutions',
@@ -114,7 +114,7 @@ export default defineComponent({
 			];
 		},
 		shouldExpandAccordion(): boolean {
-			if (this.initiallyExpanded === false) {
+			if (!this.initiallyExpanded) {
 				return false;
 			}
 			return (
diff --git a/packages/editor-ui/src/components/ExecutionsView/ExecutionsLandingPage.vue b/packages/editor-ui/src/components/ExecutionsView/ExecutionsLandingPage.vue
index a55fb1328e..12d3f80d93 100644
--- a/packages/editor-ui/src/components/ExecutionsView/ExecutionsLandingPage.vue
+++ b/packages/editor-ui/src/components/ExecutionsView/ExecutionsLandingPage.vue
@@ -16,7 +16,7 @@
 				<n8n-heading tag="h2" size="xlarge" color="text-dark" class="mb-2xs">
 					{{ $locale.baseText('executionsLandingPage.emptyState.heading') }}
 				</n8n-heading>
-				<executions-info-accordion />
+				<ExecutionsInfoAccordion />
 			</div>
 		</div>
 	</div>
@@ -31,7 +31,7 @@ import { defineComponent } from 'vue';
 import ExecutionsInfoAccordion from './ExecutionsInfoAccordion.vue';
 
 export default defineComponent({
-	name: 'executions-landing-page',
+	name: 'ExecutionsLandingPage',
 	components: {
 		ExecutionsInfoAccordion,
 	},
diff --git a/packages/editor-ui/src/components/ExecutionsView/ExecutionsList.vue b/packages/editor-ui/src/components/ExecutionsView/ExecutionsList.vue
index dc90e94ec4..9b90bb4c58 100644
--- a/packages/editor-ui/src/components/ExecutionsView/ExecutionsList.vue
+++ b/packages/editor-ui/src/components/ExecutionsView/ExecutionsList.vue
@@ -1,10 +1,10 @@
 <template>
 	<div :class="$style.container">
-		<executions-sidebar
+		<ExecutionsSidebar
 			:executions="executions"
 			:loading="loading && !executions.length"
-			:loadingMore="loadingMore"
-			:temporaryExecution="temporaryExecution"
+			:loading-more="loadingMore"
+			:temporary-execution="temporaryExecution"
 			:auto-refresh="autoRefresh"
 			@update:autoRefresh="onAutoRefreshToggle"
 			@reloadExecutions="setExecutions"
@@ -12,7 +12,7 @@
 			@loadMore="onLoadMore"
 			@retryExecution="onRetryExecution"
 		/>
-		<div :class="$style.content" v-if="!hidePreview">
+		<div v-if="!hidePreview" :class="$style.content">
 			<router-view
 				name="executionPreview"
 				@deleteCurrentExecution="onDeleteCurrentExecution"
@@ -52,13 +52,14 @@ import type {
 	INodeTypeNameVersion,
 } from 'n8n-workflow';
 import { NodeHelpers } from 'n8n-workflow';
-import { useToast, useMessage } from '@/composables';
+import { useMessage } from '@/composables/useMessage';
+import { useToast } from '@/composables/useToast';
 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 { NO_NETWORK_ERROR_CODE } from '@/utils/apiUtils';
+import { getNodeViewTab } from '@/utils/canvasUtils';
 import { workflowHelpers } from '@/mixins/workflowHelpers';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { useUIStore } from '@/stores/ui.store';
@@ -66,6 +67,8 @@ 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';
 
 // Number of execution pages that are fetched before temporary execution card is shown
 const MAX_LOADING_ATTEMPTS = 5;
@@ -73,11 +76,22 @@ const MAX_LOADING_ATTEMPTS = 5;
 const LOAD_MORE_PAGE_SIZE = 100;
 
 export default defineComponent({
-	name: 'executions-list',
-	mixins: [executionHelpers, debounceHelper, workflowHelpers],
+	name: 'ExecutionsList',
 	components: {
 		ExecutionsSidebar,
 	},
+	mixins: [executionHelpers, workflowHelpers],
+	setup() {
+		const externalHooks = useExternalHooks();
+		const { callDebounced } = useDebounce();
+
+		return {
+			externalHooks,
+			callDebounced,
+			...useToast(),
+			...useMessage(),
+		};
+	},
 	data() {
 		return {
 			loading: false,
@@ -88,18 +102,11 @@ export default defineComponent({
 			autoRefreshTimeout: undefined as undefined | NodeJS.Timer,
 		};
 	},
-	setup() {
-		return {
-			...useToast(),
-			...useMessage(),
-		};
-	},
 	computed: {
 		...mapStores(useTagsStore, useNodeTypesStore, useSettingsStore, useUIStore, useWorkflowsStore),
 		hidePreview(): boolean {
 			const activeNotPresent =
-				this.filterApplied &&
-				!(this.executions as IExecutionsSummary[]).find((ex) => ex.id === this.activeExecution?.id);
+				this.filterApplied && !this.executions.find((ex) => ex.id === this.activeExecution?.id);
 			return this.loading || !this.executions.length || activeNotPresent;
 		},
 		filterApplied(): boolean {
@@ -175,6 +182,9 @@ export default defineComponent({
 			next();
 		}
 	},
+	created() {
+		this.autoRefresh = this.uiStore.executionSidebarAutoRefresh;
+	},
 	async mounted() {
 		this.loading = true;
 		const workflowUpdated = this.$route.params.name !== this.workflowsStore.workflowId;
@@ -192,23 +202,20 @@ export default defineComponent({
 				await this.setExecutions();
 			}
 		}
-
-		this.autoRefresh = this.uiStore.executionSidebarAutoRefresh === true;
 		void this.startAutoRefreshInterval();
 		document.addEventListener('visibilitychange', this.onDocumentVisibilityChange);
 
 		this.loading = false;
 	},
 	beforeUnmount() {
-		this.stopAutoRefreshInterval();
 		document.removeEventListener('visibilitychange', this.onDocumentVisibilityChange);
+		this.autoRefresh = false;
+		this.stopAutoRefreshInterval();
 	},
 	methods: {
 		async initView(loadWorkflow: boolean): Promise<void> {
 			if (loadWorkflow) {
-				if (this.nodeTypesStore.allNodeTypes.length === 0) {
-					await this.nodeTypesStore.getNodeTypes();
-				}
+				await this.nodeTypesStore.loadNodeTypesIfNotLoaded();
 				await this.openWorkflow(this.$route.params.name);
 				this.uiStore.nodeViewInitialized = false;
 				if (this.workflowsStore.currentWorkflowExecutions.length === 0) {
@@ -226,7 +233,7 @@ export default defineComponent({
 		},
 		async onLoadMore(): Promise<void> {
 			if (!this.loadingMore) {
-				await this.callDebounced('loadMore', { debounceTime: 1000 });
+				await this.callDebounced(this.loadMore, { debounceTime: 1000 });
 			}
 		},
 		async loadMore(limit = 20): Promise<void> {
@@ -282,26 +289,27 @@ export default defineComponent({
 					this.executions[0];
 
 				await this.workflowsStore.deleteExecutions({ ids: [this.$route.params.executionId] });
+				this.workflowsStore.deleteExecution(this.executions[executionIndex]);
 				if (this.temporaryExecution?.id === this.$route.params.executionId) {
 					this.temporaryExecution = null;
 				}
 				if (this.executions.length > 0) {
 					await this.$router
-						.push({
+						.replace({
 							name: VIEWS.EXECUTION_PREVIEW,
 							params: { name: this.currentWorkflow, executionId: nextExecution.id },
 						})
 						.catch(() => {});
 					this.workflowsStore.activeWorkflowExecution = nextExecution;
+					await this.setExecutions();
 				} 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({
+					await this.$router.replace({
 						name: VIEWS.EXECUTION_HOME,
 						params: { name: this.currentWorkflow },
 					});
 				}
-				await this.setExecutions();
 			} catch (error) {
 				this.loading = false;
 				this.showError(
@@ -351,16 +359,15 @@ export default defineComponent({
 		async startAutoRefreshInterval() {
 			if (this.autoRefresh) {
 				await this.loadAutoRefresh();
+				this.stopAutoRefreshInterval();
 				this.autoRefreshTimeout = setTimeout(() => {
 					void this.startAutoRefreshInterval();
 				}, 4000);
 			}
 		},
 		stopAutoRefreshInterval() {
-			if (this.autoRefreshTimeout) {
-				clearTimeout(this.autoRefreshTimeout);
-				this.autoRefreshTimeout = undefined;
-			}
+			clearTimeout(this.autoRefreshTimeout);
+			this.autoRefreshTimeout = undefined;
 		},
 		onAutoRefreshToggle(value: boolean): void {
 			this.autoRefresh = value;
@@ -442,8 +449,15 @@ export default defineComponent({
 							params: { name: this.currentWorkflow, executionId: this.executions[0].id },
 						})
 						.catch(() => {});
-				} else if (this.executions.length === 0) {
-					this.$router.push({ name: VIEWS.EXECUTION_HOME }).catch(() => {});
+				} else if (this.executions.length === 0 && this.$route.name === VIEWS.EXECUTION_PREVIEW) {
+					this.$router
+						.push({
+							name: VIEWS.EXECUTION_HOME,
+							params: {
+								name: this.currentWorkflow,
+							},
+						})
+						.catch(() => {});
 					this.workflowsStore.activeWorkflowExecution = null;
 				}
 			}
@@ -577,11 +591,11 @@ export default defineComponent({
 
 			this.tagsStore.upsertTags(tags);
 
-			void this.$externalHooks().run('workflow.open', { workflowId, workflowName: data.name });
+			void this.externalHooks.run('workflow.open', { workflowId, workflowName: data.name });
 			this.uiStore.stateIsDirty = false;
 		},
 		async addNodes(nodes: INodeUi[], connections?: IConnections) {
-			if (!nodes || !nodes.length) {
+			if (!nodes?.length) {
 				return;
 			}
 
@@ -723,7 +737,7 @@ export default defineComponent({
 					loadWorkflow,
 				);
 
-				if (retrySuccessful === true) {
+				if (retrySuccessful) {
 					this.showMessage({
 						title: this.$locale.baseText('executionsList.showMessage.retrySuccessfulTrue.title'),
 						type: 'success',
diff --git a/packages/editor-ui/src/components/ExecutionsView/ExecutionsSidebar.vue b/packages/editor-ui/src/components/ExecutionsView/ExecutionsSidebar.vue
index 2677c72623..3778d91b3f 100644
--- a/packages/editor-ui/src/components/ExecutionsView/ExecutionsSidebar.vue
+++ b/packages/editor-ui/src/components/ExecutionsView/ExecutionsSidebar.vue
@@ -1,7 +1,7 @@
 <template>
 	<div
-		:class="['executions-sidebar', $style.container]"
 		ref="container"
+		:class="['executions-sidebar', $style.container]"
 		data-test-id="executions-sidebar"
 	>
 		<div :class="$style.heading">
@@ -11,17 +11,17 @@
 		</div>
 		<div :class="$style.controls">
 			<el-checkbox
-				:modelValue="autoRefresh"
-				@update:modelValue="$emit('update:autoRefresh', $event)"
+				:model-value="autoRefresh"
 				data-test-id="auto-refresh-checkbox"
+				@update:modelValue="$emit('update:autoRefresh', $event)"
 			>
 				{{ $locale.baseText('executionsList.autoRefresh') }}
 			</el-checkbox>
-			<execution-filter popover-placement="left-start" @filterChanged="onFilterChanged" />
+			<ExecutionFilter popover-placement="left-start" @filterChanged="onFilterChanged" />
 		</div>
 		<div
-			:class="$style.executionList"
 			ref="executionList"
+			:class="$style.executionList"
 			data-test-id="current-executions-list"
 			@scroll="loadMore(20)"
 		>
@@ -33,19 +33,19 @@
 					{{ $locale.baseText('executionsLandingPage.noResults') }}
 				</n8n-text>
 			</div>
-			<execution-card
+			<ExecutionCard
 				v-else-if="temporaryExecution"
-				:execution="temporaryExecution"
 				:ref="`execution-${temporaryExecution.id}`"
+				:execution="temporaryExecution"
 				:data-test-id="`execution-details-${temporaryExecution.id}`"
-				:showGap="true"
+				:show-gap="true"
 				@retryExecution="onRetryExecution"
 			/>
-			<execution-card
+			<ExecutionCard
 				v-for="execution in executions"
 				:key="execution.id"
-				:execution="execution"
 				:ref="`execution-${execution.id}`"
+				:execution="execution"
 				:data-test-id="`execution-details-${execution.id}`"
 				@retryExecution="onRetryExecution"
 			/>
@@ -54,7 +54,7 @@
 			</div>
 		</div>
 		<div :class="$style.infoAccordion">
-			<executions-info-accordion :initiallyExpanded="false" />
+			<ExecutionsInfoAccordion :initially-expanded="false" />
 		</div>
 	</div>
 </template>
@@ -76,7 +76,7 @@ import type { ExecutionFilterType } from '@/Interface';
 type ExecutionCardRef = InstanceType<typeof ExecutionCard>;
 
 export default defineComponent({
-	name: 'executions-sidebar',
+	name: 'ExecutionsSidebar',
 	components: {
 		ExecutionCard,
 		ExecutionsInfoAccordion,
@@ -120,10 +120,6 @@ export default defineComponent({
 				this.$router.go(-1);
 			}
 		},
-		'workflowsStore.activeWorkflowExecution'() {
-			this.checkListSize();
-			this.scrollToActiveCard();
-		},
 	},
 	mounted() {
 		// On larger screens, we need to load more then first page of executions
@@ -145,7 +141,7 @@ export default defineComponent({
 				}
 			}
 		},
-		onRetryExecution(payload: Object) {
+		onRetryExecution(payload: object) {
 			this.$emit('retryExecution', payload);
 		},
 		onRefresh(): void {
@@ -204,6 +200,8 @@ export default defineComponent({
 	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;
 }
 
@@ -228,7 +226,7 @@ export default defineComponent({
 }
 
 .executionList {
-	height: calc(100% - 10.5em);
+	flex: 1;
 	overflow: auto;
 	margin-bottom: var(--spacing-m);
 	background-color: var(--color-background-xlight) !important;
diff --git a/packages/editor-ui/src/components/ExecutionsView/__tests__/ExecutionPreview.test.ts b/packages/editor-ui/src/components/ExecutionsView/__tests__/ExecutionPreview.test.ts
index fb13c06a34..a1715e7a24 100644
--- a/packages/editor-ui/src/components/ExecutionsView/__tests__/ExecutionPreview.test.ts
+++ b/packages/editor-ui/src/components/ExecutionsView/__tests__/ExecutionPreview.test.ts
@@ -5,7 +5,8 @@ import { faker } from '@faker-js/faker';
 import { createRouter, createWebHistory } from 'vue-router';
 import { createPinia, PiniaVuePlugin, setActivePinia } from 'pinia';
 import type { IExecutionsSummary } from 'n8n-workflow';
-import { useSettingsStore, useWorkflowsStore } from '@/stores';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
 import ExecutionPreview from '@/components/ExecutionsView/ExecutionPreview.vue';
 import { VIEWS } from '@/constants';
 import { i18nInstance, I18nPlugin } from '@/plugins/i18n';
diff --git a/packages/editor-ui/src/components/ExpandableInput/ExpandableInputEdit.vue b/packages/editor-ui/src/components/ExpandableInput/ExpandableInputEdit.vue
index 9c0ac148ea..ec9838d429 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 :modelValue="modelValue" :placeholder="placeholder">
+	<ExpandableInputBase :model-value="modelValue" :placeholder="placeholder">
 		<input
+			ref="input"
+			v-on-click-outside="onClickOutside"
 			class="el-input__inner"
 			:value="modelValue"
 			:placeholder="placeholder"
 			:maxlength="maxlength"
+			size="4"
 			@input="onInput"
 			@keydown.enter="onEnter"
 			@keydown.esc="onEscape"
-			ref="input"
-			size="4"
-			v-on-click-outside="onClickOutside"
 		/>
 	</ExpandableInputBase>
 </template>
diff --git a/packages/editor-ui/src/components/ExpandableInput/ExpandableInputPreview.vue b/packages/editor-ui/src/components/ExpandableInput/ExpandableInputPreview.vue
index b0451dda46..6700198b87 100644
--- a/packages/editor-ui/src/components/ExpandableInput/ExpandableInputPreview.vue
+++ b/packages/editor-ui/src/components/ExpandableInput/ExpandableInputPreview.vue
@@ -1,5 +1,5 @@
 <template>
-	<ExpandableInputBase :modelValue="modelValue" :staticSize="true">
+	<ExpandableInputBase :model-value="modelValue" :static-size="true">
 		<input
 			:class="{ 'el-input__inner': true, clickable: true }"
 			:value="modelValue"
diff --git a/packages/editor-ui/src/components/ExpressionEdit.vue b/packages/editor-ui/src/components/ExpressionEdit.vue
index 2b1bfd2264..740e72fa01 100644
--- a/packages/editor-ui/src/components/ExpressionEdit.vue
+++ b/packages/editor-ui/src/components/ExpressionEdit.vue
@@ -1,7 +1,7 @@
 <template>
-	<div class="expression-edit" v-if="dialogVisible" @keydown.stop>
+	<div v-if="dialogVisible" class="expression-edit" @keydown.stop>
 		<el-dialog
-			:modelValue="dialogVisible"
+			:model-value="dialogVisible"
 			class="expression-dialog classic"
 			width="80%"
 			:title="$locale.baseText('expressionEdit.editExpression')"
@@ -19,11 +19,11 @@
 					</div>
 
 					<div class="variable-selector">
-						<variable-selector
+						<VariableSelector
 							:path="path"
-							:redactValues="redactValues"
+							:redact-values="redactValues"
 							@itemSelected="itemSelected"
-						></variable-selector>
+						></VariableSelector>
 					</div>
 				</el-col>
 				<el-col :span="16" class="right-side">
@@ -48,14 +48,14 @@
 						</div>
 						<div class="expression-editor">
 							<ExpressionEditorModalInput
-								:modelValue="modelValue"
-								:isReadOnly="isReadOnlyRoute"
+								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>
@@ -66,8 +66,8 @@
 						</div>
 						<div :class="{ 'ph-no-capture': redactValues }">
 							<ExpressionEditorModalOutput
-								:segments="segments"
 								ref="expressionResult"
+								:segments="segments"
 								data-test-id="expression-modal-output"
 							/>
 						</div>
@@ -87,27 +87,62 @@ 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 { debounceHelper } from '@/mixins/debounce';
 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';
 
 export default defineComponent({
 	name: 'ExpressionEdit',
-	mixins: [externalHooks, genericHelpers, debounceHelper],
-	props: ['dialogVisible', 'parameter', 'path', 'modelValue', 'eventSource', 'redactValues'],
 	components: {
 		ExpressionEditorModalInput,
 		ExpressionEditorModalOutput,
 		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: '',
@@ -119,16 +154,50 @@ export default defineComponent({
 	computed: {
 		...mapStores(useNDVStore, useWorkflowsStore),
 	},
+	watch: {
+		dialogVisible(newValue) {
+			this.displayValue = this.modelValue;
+			this.latestValue = this.modelValue;
+
+			const resolvedExpressionValue =
+				(
+					this.$refs.expressionResult as {
+						getValue: () => string;
+					}
+				)?.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.sessionId,
+					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('update:modelValue', this.latestValue);
 			} else {
-				void this.callDebounced('updateDisplayValue', { debounceTime: 500 });
+				void this.callDebounced(this.updateDisplayValue, {
+					debounceTime: 500,
+				});
 			}
 		},
 
@@ -147,8 +216,12 @@ export default defineComponent({
 		},
 
 		itemSelected(eventData: IVariableItemSelected) {
-			(this.$refs.inputFieldExpression as any).itemSelected(eventData);
-			void 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.modelValue,
 				selectedItem: eventData,
@@ -218,35 +291,6 @@ export default defineComponent({
 			);
 		},
 	},
-	watch: {
-		dialogVisible(newValue) {
-			this.displayValue = this.modelValue;
-			this.latestValue = this.modelValue;
-
-			const resolvedExpressionValue =
-				(this.$refs.expressionResult && (this.$refs.expressionResult as any).getValue()) ||
-				undefined;
-			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.sessionId,
-					this.ndvStore.activeNode?.type ?? '',
-				);
-
-				this.$telemetry.track('User closed Expression Editor', telemetryPayload);
-				void this.$externalHooks().run('expressionEdit.closeDialog', telemetryPayload);
-			}
-		},
-	},
 });
 </script>
 
diff --git a/packages/editor-ui/src/components/ExpressionEditorModal/ExpressionEditorModalInput.vue b/packages/editor-ui/src/components/ExpressionEditorModal/ExpressionEditorModalInput.vue
index 2cf390f105..bccb83c72b 100644
--- a/packages/editor-ui/src/components/ExpressionEditorModal/ExpressionEditorModalInput.vue
+++ b/packages/editor-ui/src/components/ExpressionEditorModal/ExpressionEditorModalInput.vue
@@ -6,7 +6,7 @@
 import { defineComponent } from 'vue';
 import { EditorView, keymap } from '@codemirror/view';
 import { EditorState, Prec } from '@codemirror/state';
-import { history, redo } from '@codemirror/commands';
+import { history, redo, undo } from '@codemirror/commands';
 
 import { workflowHelpers } from '@/mixins/workflowHelpers';
 import { expressionManager } from '@/mixins/expressionManager';
@@ -26,12 +26,15 @@ export default defineComponent({
 	props: {
 		modelValue: {
 			type: String,
+			required: true,
 		},
 		path: {
 			type: String,
+			required: true,
 		},
 		isReadOnly: {
 			type: Boolean,
+			default: false,
 		},
 	},
 	data() {
@@ -56,6 +59,7 @@ export default defineComponent({
 							return false;
 						},
 					},
+					{ key: 'Mod-z', run: undo },
 					{ key: 'Mod-Shift-z', run: redo },
 				]),
 			),
diff --git a/packages/editor-ui/src/components/ExpressionEditorModal/ExpressionEditorModalOutput.vue b/packages/editor-ui/src/components/ExpressionEditorModal/ExpressionEditorModalOutput.vue
index 8891fe05fd..de1d60abec 100644
--- a/packages/editor-ui/src/components/ExpressionEditorModal/ExpressionEditorModalOutput.vue
+++ b/packages/editor-ui/src/components/ExpressionEditorModal/ExpressionEditorModalOutput.vue
@@ -19,18 +19,7 @@ export default defineComponent({
 	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);
+			required: true,
 		},
 	},
 	data() {
@@ -38,25 +27,6 @@ export default defineComponent({
 			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,
-			}),
-		});
-	},
-	beforeUnmount() {
-		this.editor?.destroy();
-	},
 	computed: {
 		resolvedExpression(): string {
 			return this.segments.reduce((acc, segment) => {
@@ -78,8 +48,8 @@ export default defineComponent({
 						segment.kind === 'plaintext'
 							? segment.plaintext.length
 							: segment.resolved
-							? (segment.resolved as any).toString().length
-							: 0;
+							  ? segment.resolved.toString().length
+							  : 0;
 
 					segment.to = cursor;
 
@@ -88,6 +58,37 @@ export default defineComponent({
 				.filter((segment): segment is Resolved => segment.kind === 'resolvable');
 		},
 	},
+	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);
+		},
+	},
+	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,
+			}),
+		});
+	},
+	beforeUnmount() {
+		this.editor?.destroy();
+	},
 	methods: {
 		getValue() {
 			return '=' + this.resolvedExpression;
diff --git a/packages/editor-ui/src/components/ExpressionEditorModal/theme.ts b/packages/editor-ui/src/components/ExpressionEditorModal/theme.ts
index 5369f9c32c..f47f7c1535 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 ad9093f180..091c04e266 100644
--- a/packages/editor-ui/src/components/ExpressionParameterInput.vue
+++ b/packages/editor-ui/src/components/ExpressionParameterInput.vue
@@ -1,45 +1,39 @@
 <template>
 	<div
-		:class="$style['expression-parameter-input']"
 		v-on-click-outside="onBlur"
+		:class="$style['expression-parameter-input']"
 		@keydown.tab="onBlur"
 	>
 		<div :class="[$style['all-sections'], { [$style['focused']]: isFocused }]">
-			<div
-				:class="[
-					$style['prepend-section'],
-					'el-input-group__prepend',
-					{ [$style['squared']]: isForRecordLocator },
-				]"
-			>
+			<div :class="[$style['prepend-section'], 'el-input-group__prepend']">
 				<ExpressionFunctionIcon />
 			</div>
 			<InlineExpressionEditorInput
-				:modelValue="modelValue"
-				:isReadOnly="isReadOnly"
-				:targetItem="hoveringItem"
-				:isSingleLine="isForRecordLocator"
-				:additionalData="additionalExpressionData"
+				ref="inlineInput"
+				:model-value="modelValue"
+				:is-read-only="isReadOnly"
+				:target-item="hoveringItem"
+				:is-single-line="isSingleLine"
+				:additional-data="additionalExpressionData"
 				:path="path"
 				@focus="onFocus"
 				@blur="onBlur"
 				@change="onChange"
-				ref="inlineInput"
 			/>
 			<n8n-icon
 				v-if="!isDragging"
 				icon="external-link-alt"
 				size="xsmall"
 				:class="$style['expression-editor-modal-opener']"
-				@click="$emit('modalOpenerClick')"
 				data-test-id="expander"
+				@click="$emit('modalOpenerClick')"
 			/>
 		</div>
 		<InlineExpressionEditorOutput
 			:segments="segments"
-			:isReadOnly="isReadOnly"
+			:is-read-only="isReadOnly"
 			:visible="isFocused"
-			:hoveringItemNumber="hoveringItemNumber"
+			:hovering-item-number="hoveringItemNumber"
 		/>
 	</div>
 </template>
@@ -69,12 +63,6 @@ export default defineComponent({
 		InlineExpressionEditorOutput,
 		ExpressionFunctionIcon,
 	},
-	data() {
-		return {
-			isFocused: false,
-			segments: [] as Segment[],
-		};
-	},
 	props: {
 		path: {
 			type: String,
@@ -86,7 +74,7 @@ export default defineComponent({
 			type: Boolean,
 			default: false,
 		},
-		isForRecordLocator: {
+		isSingleLine: {
 			type: Boolean,
 			default: false,
 		},
@@ -95,6 +83,12 @@ export default defineComponent({
 			default: () => ({}),
 		},
 	},
+	data() {
+		return {
+			isFocused: false,
+			segments: [] as Segment[],
+		};
+	},
 	computed: {
 		...mapStores(useNDVStore, useWorkflowsStore),
 		hoveringItemNumber(): number {
@@ -164,6 +158,10 @@ export default defineComponent({
 .expression-parameter-input {
 	position: relative;
 
+	:global(.cm-editor) {
+		background-color: var(--color-code-background);
+	}
+
 	.all-sections {
 		height: 30px;
 		display: flex;
@@ -178,22 +176,26 @@ export default defineComponent({
 		width: 22px;
 		text-align: center;
 	}
-
-	.squared {
-		border-radius: 0;
-	}
 }
 
 .expression-editor-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);
 	border-top-left-radius: var(--border-radius-base);
-	border-bottom-right-radius: var(--border-radius-base);
+	border-bottom-right-radius: var(--input-border-bottom-right-radius, var(--border-radius-base));
+	border-right-color: var(
+		--input-border-right-color,
+		var(--input-border-color, var(--border-color-base))
+	);
+	border-bottom-color: var(
+		--input-border-bottom-color,
+		var(--input-border-color, var(--border-color-base))
+	);
 	cursor: pointer;
 
 	svg {
@@ -219,6 +221,6 @@ export default defineComponent({
 .focused > .expression-editor-modal-opener {
 	border-color: var(--color-secondary);
 	border-bottom-right-radius: 0;
-	background-color: white;
+	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
index ed4934733c..ffb60527fd 100644
--- a/packages/editor-ui/src/components/ExternalSecretsProviderCard.ee.vue
+++ b/packages/editor-ui/src/components/ExternalSecretsProviderCard.ee.vue
@@ -3,8 +3,11 @@ 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, useUIStore } from '@/stores';
-import { useExternalSecretsProvider, useI18n, useToast } from '@/composables';
+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';
@@ -51,7 +54,7 @@ const canConnect = computed(() => {
 });
 
 const formattedDate = computed((provider: ExternalSecretsProvider) => {
-	return DateTime.fromISO(props.provider.connectedAt!).toFormat('dd LLL yyyy');
+	return DateTime.fromISO(props.provider.connectedAt).toFormat('dd LLL yyyy');
 });
 
 onMounted(() => {
@@ -110,7 +113,7 @@ async function onActionDropdownClick(id: string) {
 			<ExternalSecretsProviderImage :class="$style.cardImage" :provider="provider" />
 			<div :class="$style.cardContent">
 				<n8n-text bold>{{ provider.displayName }}</n8n-text>
-				<n8n-text color="text-light" size="small" v-if="provider.connected">
+				<n8n-text v-if="provider.connected" color="text-light" size="small">
 					<span>
 						{{
 							i18n.baseText('settings.externalSecrets.card.secretsCount', {
@@ -132,10 +135,10 @@ async function onActionDropdownClick(id: string) {
 					</span>
 				</n8n-text>
 			</div>
-			<div :class="$style.cardActions" v-if="canConnect">
+			<div v-if="canConnect" :class="$style.cardActions">
 				<ExternalSecretsProviderConnectionSwitch
 					:provider="provider"
-					:beforeUpdate="onBeforeConnectionUpdate"
+					:before-update="onBeforeConnectionUpdate"
 					:disabled="connectionState === 'error' && !provider.connected"
 				/>
 				<n8n-action-toggle
diff --git a/packages/editor-ui/src/components/ExternalSecretsProviderConnectionSwitch.ee.vue b/packages/editor-ui/src/components/ExternalSecretsProviderConnectionSwitch.ee.vue
index d56ead9a86..7552050fa6 100644
--- a/packages/editor-ui/src/components/ExternalSecretsProviderConnectionSwitch.ee.vue
+++ b/packages/editor-ui/src/components/ExternalSecretsProviderConnectionSwitch.ee.vue
@@ -1,8 +1,10 @@
 <script lang="ts" setup>
 import type { PropType } from 'vue';
 import type { ExternalSecretsProvider } from '@/Interface';
-import { useExternalSecretsStore } from '@/stores';
-import { useI18n, useLoadingService, useToast } from '@/composables';
+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';
 
@@ -70,7 +72,7 @@ async function onUpdateConnected(value: boolean) {
 </script>
 
 <template>
-	<div class="connection-switch" v-loading="saving" element-loading-spinner="el-icon-loading">
+	<div v-loading="saving" class="connection-switch">
 		<n8n-icon
 			v-if="provider.state === 'error'"
 			color="danger"
@@ -85,7 +87,7 @@ async function onUpdateConnected(value: boolean) {
 			}}
 		</n8n-text>
 		<el-switch
-			:modelValue="provider.connected"
+			:model-value="provider.connected"
 			:title="
 				i18n.baseText('settings.externalSecrets.card.connectedSwitch.title', {
 					interpolate: { provider: provider.displayName },
diff --git a/packages/editor-ui/src/components/ExternalSecretsProviderModal.ee.vue b/packages/editor-ui/src/components/ExternalSecretsProviderModal.ee.vue
index 64c2d54d7b..c44c4f8ee7 100644
--- a/packages/editor-ui/src/components/ExternalSecretsProviderModal.ee.vue
+++ b/packages/editor-ui/src/components/ExternalSecretsProviderModal.ee.vue
@@ -4,17 +4,23 @@ 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, useI18n, useMessage, useToast } from '@/composables';
+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';
+import { useUIStore } from '@/stores/ui.store';
 import { useRoute } from 'vue-router';
 import ParameterInputExpanded from '@/components/ParameterInputExpanded.vue';
-import type { IUpdateInformation, ExternalSecretsProviderData } from '@/Interface';
+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';
-import type { ExternalSecretsProvider } from '@/Interface';
 
 const props = defineProps({
 	data: {
@@ -163,7 +169,7 @@ async function onBeforeClose() {
 		id="external-secrets-provider-modal"
 		width="812px"
 		:title="provider.displayName"
-		:eventBus="data.eventBus"
+		:event-bus="data.eventBus"
 		:name="EXTERNAL_SECRETS_PROVIDER_MODAL_KEY"
 		:before-close="onBeforeClose"
 	>
@@ -203,7 +209,7 @@ async function onBeforeClose() {
 		<template #content>
 			<div :class="$style.container">
 				<hr class="mb-l" />
-				<div class="mb-l" v-if="connectionState !== 'initializing'">
+				<div v-if="connectionState !== 'initializing'" class="mb-l">
 					<n8n-callout
 						v-if="connectionState === 'connected' || connectionState === 'tested'"
 						theme="success"
@@ -262,13 +268,13 @@ async function onBeforeClose() {
 					@submit.prevent
 				>
 					<n8n-notice v-if="property.type === 'notice'" :content="property.displayName" />
-					<parameter-input-expanded
+					<ParameterInputExpanded
 						v-else
 						class="mb-l"
 						:parameter="property"
 						:value="providerData[property.name]"
 						:label="labelSize"
-						eventSource="external-secrets-provider"
+						event-source="external-secrets-provider"
 						@update="onValueChange"
 					/>
 				</form>
diff --git a/packages/editor-ui/src/components/FeatureComingSoon.vue b/packages/editor-ui/src/components/FeatureComingSoon.vue
index 23e4153893..ea53f67c5b 100644
--- a/packages/editor-ui/src/components/FeatureComingSoon.vue
+++ b/packages/editor-ui/src/components/FeatureComingSoon.vue
@@ -13,7 +13,7 @@
 		<div :class="$style.actionBoxContainer">
 			<n8n-action-box
 				:description="$locale.baseText(featureInfo.actionBoxDescription)"
-				:buttonText="
+				:button-text="
 					$locale.baseText(featureInfo.actionBoxButtonLabel || 'fakeDoor.actionBox.button.label')
 				"
 				@click:button="openLinkPage"
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 0000000000..b6be6b9d10
--- /dev/null
+++ b/packages/editor-ui/src/components/FilterConditions/CombinatorSelect.vue
@@ -0,0 +1,48 @@
+<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:modelValue="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 0000000000..d68ea0bad9
--- /dev/null
+++ b/packages/editor-ui/src/components/FilterConditions/Condition.vue
@@ -0,0 +1,454 @@
+<script setup lang="ts">
+import type { IUpdateInformation } from '@/Interface';
+import ParameterInputFull from '@/components/ParameterInputFull.vue';
+import ParameterIssues from '@/components/ParameterIssues.vue';
+import { useI18n } from '@/composables/useI18n';
+import { DateTime } from 'luxon';
+import {
+	executeFilterCondition,
+	type FilterOptionsValue,
+	type FilterConditionValue,
+	type FilterOperatorType,
+	type INodeProperties,
+	type NodeParameterValue,
+	type NodePropertyTypes,
+	FilterError,
+	validateFieldType,
+} from 'n8n-workflow';
+import { computed, ref } from 'vue';
+import OperatorSelect from './OperatorSelect.vue';
+import { OPERATORS_BY_ID, type FilterOperatorId } from './constants';
+import type { FilterOperator } from './types';
+import { resolveParameter } from '@/mixins/workflowHelpers';
+type ConditionResult =
+	| { status: 'resolve_error' }
+	| { status: 'validation_error'; error: string }
+	| { status: 'success'; result: boolean };
+
+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,
+});
+
+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(() => OPERATORS_BY_ID[operatorId.value] as FilterOperator);
+
+const operatorTypeToNodePropType = (operatorType: FilterOperatorType): NodePropertyTypes => {
+	switch (operatorType) {
+		case 'array':
+		case 'object':
+		case 'boolean':
+		case 'any':
+			return 'string';
+		default:
+			return operatorType;
+	}
+};
+
+const conditionResult = computed<ConditionResult>(() => {
+	try {
+		const resolved = resolveParameter(
+			condition.value as unknown as NodeParameterValue,
+		) as FilterConditionValue;
+
+		if (resolved.leftValue === undefined || resolved.rightValue === undefined) {
+			return { status: 'resolve_error' };
+		}
+		try {
+			const result = executeFilterCondition(resolved, props.options, {
+				index: props.index ?? 0,
+				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' };
+	}
+});
+
+const allIssues = computed(() => {
+	if (conditionResult.value.status === 'validation_error') {
+		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'),
+	type: operatorTypeToNodePropType(operator.value.type),
+}));
+
+const rightParameter = computed<INodeProperties>(() => ({
+	name: '',
+	displayName: '',
+	default: '',
+	placeholder:
+		operator.value.type === 'dateTime'
+			? now.value
+			: i18n.baseText('filter.condition.placeholderRight'),
+	type: operatorTypeToNodePropType(operator.value.rightType ?? operator.value.type),
+}));
+
+const onLeftValueChange = (update: IUpdateInformation): void => {
+	condition.value.leftValue = update.value;
+};
+
+const onRightValueChange = (update: IUpdateInformation): void => {
+	condition.value.rightValue = update.value;
+};
+
+const convertToType = (value: unknown, type: FilterOperatorType): unknown => {
+	if (type === 'any') return value;
+
+	return (
+		validateFieldType('filter', condition.value.leftValue, type, { parseStrings: true }).newValue ??
+		value
+	);
+};
+
+const onOperatorChange = (value: string): void => {
+	const newOperator = OPERATORS_BY_ID[value as FilterOperatorId] as FilterOperator;
+	const rightType = operator.value.rightType ?? operator.value.type;
+	const newRightType = newOperator.rightType ?? newOperator.type;
+	const leftTypeChanged = operator.value.type !== newOperator.type;
+	const rightTypeChanged = rightType !== newRightType;
+
+	// Try to convert left & right values to operator type
+	if (leftTypeChanged) {
+		condition.value.leftValue = convertToType(condition.value.leftValue, newOperator.type);
+	}
+	if (rightTypeChanged && !newOperator.singleValue) {
+		condition.value.rightValue = convertToType(condition.value.rightValue, newRightType);
+	}
+
+	condition.value.operator = {
+		type: newOperator.type,
+		operation: newOperator.operation,
+		rightType: newOperator.rightType,
+		singleValue: newOperator.singleValue,
+	};
+	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>
+		<n8n-resize-observer
+			:class="$style.observer"
+			:breakpoints="[
+				{ bp: 'stacked', width: 340 },
+				{ bp: 'medium', width: 520 },
+			]"
+		>
+			<template #default="{ bp }">
+				<div
+					:class="{
+						[$style.condition]: true,
+						[$style.hideRightInput]: operator.singleValue,
+						[$style.stacked]: bp === 'stacked',
+						[$style.medium]: bp === 'medium',
+					}"
+				>
+					<ParameterInputFull
+						v-if="!fixedLeftValue"
+						:key="leftParameter.type"
+						display-options
+						hide-label
+						hide-hint
+						is-single-line
+						:parameter="leftParameter"
+						:value="condition.leftValue"
+						:path="`${path}.left`"
+						:class="[$style.input, $style.inputLeft]"
+						:is-read-only="readOnly"
+						data-test-id="filter-condition-left"
+						@update="onLeftValueChange"
+						@blur="onBlur"
+					/>
+					<OperatorSelect
+						:class="$style.select"
+						:selected="`${operator.type}:${operator.operation}`"
+						:read-only="readOnly"
+						@operatorChange="onOperatorChange"
+					></OperatorSelect>
+					<ParameterInputFull
+						v-if="!operator.singleValue"
+						:key="rightParameter.type"
+						display-options
+						hide-label
+						hide-hint
+						is-single-line
+						:options-position="bp === 'default' ? 'top' : 'bottom'"
+						:parameter="rightParameter"
+						:value="condition.rightValue"
+						:path="`${path}.right`"
+						:class="[$style.input, $style.inputRight]"
+						:is-read-only="readOnly"
+						data-test-id="filter-condition-right"
+						@update="onRightValueChange"
+						@blur="onBlur"
+					/>
+				</div>
+			</template>
+		</n8n-resize-observer>
+
+		<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;
+		}
+	}
+}
+
+.condition {
+	display: flex;
+	flex-wrap: nowrap;
+	align-items: flex-end;
+}
+
+.observer {
+	width: 100%;
+}
+
+.status {
+	align-self: flex-start;
+	padding-top: 28px;
+}
+
+.statusIcon {
+	padding-left: var(--spacing-4xs);
+}
+
+.select {
+	flex-shrink: 0;
+	flex-grow: 0;
+	flex-basis: 160px;
+	--input-border-radius: 0;
+	--input-border-right-color: transparent;
+}
+
+.input {
+	flex-shrink: 0;
+	flex-basis: 160px;
+	flex-grow: 1;
+}
+
+.inputLeft {
+	--input-border-top-right-radius: 0;
+	--input-border-bottom-right-radius: 0;
+	--input-border-right-color: transparent;
+}
+
+.inputRight {
+	--input-border-top-left-radius: 0;
+	--input-border-bottom-left-radius: 0;
+}
+
+.hideRightInput {
+	.select {
+		--input-border-top-right-radius: var(--border-radius-base);
+		--input-border-bottom-right-radius: var(--border-radius-base);
+		--input-border-right-color: var(--input-border-color-base);
+	}
+}
+
+.remove {
+	position: absolute;
+	left: 0;
+	top: var(--spacing-l);
+	opacity: 0;
+	transition: opacity 100ms ease-in;
+}
+
+.medium {
+	flex-wrap: wrap;
+
+	.select {
+		--input-border-top-right-radius: var(--border-radius-base);
+		--input-border-bottom-right-radius: 0;
+		--input-border-bottom-color: transparent;
+		--input-border-right-color: var(--input-border-color-base);
+	}
+
+	.inputLeft {
+		--input-border-top-right-radius: 0;
+		--input-border-bottom-left-radius: 0;
+		--input-border-right-color: transparent;
+		--input-border-bottom-color: transparent;
+	}
+
+	.inputRight {
+		flex-basis: 340px;
+		flex-shrink: 1;
+		--input-border-top-right-radius: 0;
+		--input-border-bottom-left-radius: var(--border-radius-base);
+	}
+
+	&.hideRightInput {
+		.select {
+			--input-border-bottom-color: var(--input-border-color-base);
+			--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);
+		}
+
+		.inputLeft {
+			--input-border-top-right-radius: 0;
+			--input-border-bottom-left-radius: var(--border-radius-base);
+			--input-border-bottom-right-radius: 0;
+			--input-border-bottom-color: var(--input-border-color-base);
+		}
+	}
+}
+
+.stacked {
+	display: block;
+
+	.select {
+		width: 100%;
+		--input-border-right-color: var(--input-border-color-base);
+		--input-border-bottom-color: transparent;
+		--input-border-radius: 0;
+	}
+
+	.inputLeft {
+		--input-border-right-color: var(--input-border-color-base);
+		--input-border-bottom-color: transparent;
+		--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;
+	}
+
+	.inputRight {
+		--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);
+	}
+
+	&.hideRightInput {
+		.select {
+			--input-border-bottom-color: var(--input-border-color-base);
+			--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);
+		}
+
+		.inputLeft {
+			--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;
+			--input-border-bottom-color: transparent;
+		}
+	}
+}
+</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 0000000000..de993a9f36
--- /dev/null
+++ b/packages/editor-ui/src/components/FilterConditions/FilterConditions.vue
@@ -0,0 +1,251 @@
+<script setup lang="ts">
+import { 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 '@/mixins/workflowHelpers';
+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 { callDebounced } = 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;
+		}
+	},
+	{ immediate: true },
+);
+
+watch(state.paramValue, (value) => {
+	void callDebounced(
+		() => {
+			emit('valueChanged', { name: props.path, value, node: props.node?.name as string });
+		},
+		{ debounceTime: 1000 },
+	);
+});
+
+function addCondition(): void {
+	state.paramValue.conditions.push(createCondition());
+}
+
+function onConditionUpdate(index: number, value: FilterConditionValue): void {
+	state.paramValue.conditions[index] = value;
+}
+
+function onCombinatorChange(combinator: FilterTypeCombinator): void {
+	state.paramValue.combinator = combinator;
+}
+
+function onConditionRemove(index: number): void {
+	state.paramValue.conditions.splice(index, 1);
+}
+
+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"
+			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"
+						@combinatorChange="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 0000000000..0b1cfd70e9
--- /dev/null
+++ b/packages/editor-ui/src/components/FilterConditions/OperatorSelect.vue
@@ -0,0 +1,139 @@
+<script setup lang="ts">
+import { useI18n } from '@/composables/useI18n';
+import { OPERATORS_BY_ID, OPERATOR_GROUPS } from './constants';
+import { computed, ref } from 'vue';
+import type { FilterOperator } from './types';
+
+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(() => OPERATORS_BY_ID[selected.value] as FilterOperator);
+
+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:modelValue="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.groupTitle"
+							@mouseenter="() => onGroupSelect(group.id)"
+							@click="() => onGroupSelect(group.id)"
+						>
+							<n8n-icon v-if="group.icon" :icon="group.icon" color="text-light" size="small" />
+							<span>{{ i18n.baseText(group.name) }}</span>
+						</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;
+}
+
+.groupTitle {
+	display: flex;
+	gap: var(--spacing-2xs);
+	align-items: center;
+	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);
+	}
+}
+</style>
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 0000000000..578d74c71a
--- /dev/null
+++ b/packages/editor-ui/src/components/FilterConditions/constants.ts
@@ -0,0 +1,272 @@
+/* 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: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: 'filter.operatorGroup.string',
+		icon: 'font',
+		children: OPERATORS.filter((operator) => operator.type === 'string'),
+	},
+	{
+		id: 'number',
+		name: 'filter.operatorGroup.number',
+		icon: 'hashtag',
+		children: OPERATORS.filter((operator) => operator.type === 'number'),
+	},
+	{
+		id: 'dateTime',
+		name: 'filter.operatorGroup.date',
+		icon: 'calendar',
+		children: OPERATORS.filter((operator) => operator.type === 'dateTime'),
+	},
+	{
+		id: 'boolean',
+		name: 'filter.operatorGroup.boolean',
+		icon: 'check-square',
+		children: OPERATORS.filter((operator) => operator.type === 'boolean'),
+	},
+	{
+		id: 'array',
+		name: 'filter.operatorGroup.array',
+		icon: 'list',
+		children: OPERATORS.filter((operator) => operator.type === 'array'),
+	},
+	{
+		id: 'object',
+		name: 'filter.operatorGroup.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 0000000000..d23d4eff65
--- /dev/null
+++ b/packages/editor-ui/src/components/FilterConditions/types.ts
@@ -0,0 +1,13 @@
+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[];
+}
diff --git a/packages/editor-ui/src/components/FixedCollectionParameter.vue b/packages/editor-ui/src/components/FixedCollectionParameter.vue
index 6c8fe3ae42..250c419ea4 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')
@@ -27,37 +27,41 @@
 					<div
 						:class="index ? 'border-top-dashed parameter-item-wrapper ' : '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, 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>
 						<Suspense>
-							<parameter-input-list
+							<ParameterInputList
 								:parameters="property.values"
-								:nodeValues="nodeValues"
+								:node-values="nodeValues"
 								:path="getPropertyPath(property.name, index)"
-								:hideDelete="true"
-								:isReadOnly="isReadOnly"
+								:hide-delete="true"
+								:is-read-only="isReadOnly"
 								@valueChanged="valueChanged"
 							/>
 						</Suspense>
@@ -66,42 +70,44 @@
 			</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"
+						:hide-delete="true"
 						@valueChanged="valueChanged"
-						:hideDelete="true"
 					/>
 				</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"
-					@update:modelValue="optionSelected"
 					filterable
+					@update:modelValue="optionSelected"
 				>
 					<n8n-option
 						v-for="item in parameterOptions"
@@ -134,6 +140,9 @@ const ParameterInputList = defineAsyncComponent(async () => import('./ParameterI
 
 export default defineComponent({
 	name: 'FixedCollectionParameter',
+	components: {
+		ParameterInputList,
+	},
 	props: {
 		nodeValues: {
 			type: Object as PropType<Record<string, INodeParameters[]>>,
@@ -156,26 +165,12 @@ export default defineComponent({
 			default: false,
 		},
 	},
-	components: {
-		ParameterInputList,
-	},
 	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);
@@ -212,6 +207,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];
@@ -346,9 +352,36 @@ export default defineComponent({
 .fixed-collection-parameter {
 	padding-left: var(--spacing-s);
 
-	:deep(.button) {
-		--button-background-color: var(--color-background-base);
-		--button-border-color: var(--color-foreground-base);
+	.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;
+			}
+		}
 	}
 }
 
@@ -356,19 +389,8 @@ export default defineComponent({
 	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 {
@@ -391,11 +413,4 @@ export default defineComponent({
 .no-items-exist {
 	margin: var(--spacing-xs) 0;
 }
-
-.sort-icon {
-	display: flex;
-	flex-direction: column;
-	margin-left: 1px;
-	margin-top: 0.5em;
-}
 </style>
diff --git a/packages/editor-ui/src/components/GoBackButton.vue b/packages/editor-ui/src/components/GoBackButton.vue
index 56f7a433f8..86b13d8224 100644
--- a/packages/editor-ui/src/components/GoBackButton.vue
+++ b/packages/editor-ui/src/components/GoBackButton.vue
@@ -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 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 5e79a51cd9..22b665f626 100644
--- a/packages/editor-ui/src/components/HoverableNodeIcon.vue
+++ b/packages/editor-ui/src/components/HoverableNodeIcon.vue
@@ -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 c0db995916..5aba6b063a 100644
--- a/packages/editor-ui/src/components/HtmlEditor/HtmlEditor.vue
+++ b/packages/editor-ui/src/components/HtmlEditor/HtmlEditor.vue
@@ -1,44 +1,48 @@
 <template>
-	<div ref="htmlEditor"></div>
+	<div :class="$style.editor">
+		<div ref="htmlEditor"></div>
+		<slot name="suffix" />
+	</div>
 </template>
 
 <script lang="ts">
-import { defineComponent } from 'vue';
-import { format } from 'prettier';
-import htmlParser from 'prettier/plugins/html';
-import cssParser from 'prettier/plugins/postcss';
-import jsParser from 'prettier/plugins/babel';
-import * as estree from 'prettier/plugins/estree';
-import { htmlLanguage, autoCloseTags, html } from 'codemirror-lang-html-n8n';
 import { autocompletion } from '@codemirror/autocomplete';
-import { indentWithTab, insertNewlineAndIndent, history, redo } from '@codemirror/commands';
+import { history, redo, undo } 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 { EditorState, Prec } from '@codemirror/state';
 import type { ViewUpdate } from '@codemirror/view';
 import {
-	dropCursor,
 	EditorView,
+	dropCursor,
 	highlightActiveLine,
 	highlightActiveLineGutter,
 	keymap,
 	lineNumbers,
 } from '@codemirror/view';
+import { autoCloseTags, html, htmlLanguage } from 'codemirror-lang-html-n8n';
+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 { defineComponent } from 'vue';
 
+import { htmlEditorEventBus } from '@/event-bus';
+import { expressionManager } from '@/mixins/expressionManager';
 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 { enterKeyMap, tabKeyMap } from '../CodeNodeEditor/baseExtensions';
+import { codeNodeEditorTheme } from '../CodeNodeEditor/theme';
 import type { Range, Section } from './types';
+import { nonTakenRanges } from './utils';
 
 export default defineComponent({
 	name: 'HtmlEditor',
@@ -52,9 +56,13 @@ export default defineComponent({
 			type: Boolean,
 			default: false,
 		},
+		fillParent: {
+			type: Boolean,
+			default: false,
+		},
 		rows: {
 			type: Number,
-			default: -1,
+			default: 4,
 		},
 		disableExpressionColoring: {
 			type: Boolean,
@@ -67,7 +75,8 @@ export default defineComponent({
 	},
 	data() {
 		return {
-			editor: {} as EditorView,
+			editor: null as EditorView | null,
+			editorState: null as EditorState | null,
 		};
 	},
 	computed: {
@@ -89,14 +98,21 @@ export default defineComponent({
 				this.disableExpressionCompletions ? html() : htmlWithCompletions(),
 				autoCloseTags,
 				expressionInputHandler(),
-				keymap.of([
-					indentWithTab,
-					{ key: 'Enter', run: insertNewlineAndIndent },
-					{ key: 'Mod-Shift-z', run: redo },
-				]),
+				Prec.highest(
+					keymap.of([
+						...tabKeyMap,
+						...enterKeyMap,
+						{ key: 'Mod-z', run: undo },
+						{ key: 'Mod-Shift-z', run: redo },
+					]),
+				),
 				indentOnInput(),
-				theme({
+				codeNodeEditorTheme({
 					isReadOnly: this.isReadOnly,
+					maxHeight: this.fillParent ? '100%' : '40vh',
+					minHeight: '20vh',
+					rows: this.rows,
+					highlightColors: 'html',
 				}),
 				lineNumbers(),
 				highlightActiveLineGutter(),
@@ -110,8 +126,6 @@ export default defineComponent({
 				EditorView.updateListener.of((viewUpdate: ViewUpdate) => {
 					if (!viewUpdate.docChanged) return;
 
-					this.editorState = this.editor.state;
-
 					this.getHighlighter()?.removeColor(this.editor, this.htmlSegments);
 					this.getHighlighter()?.addColor(this.editor, this.resolvableSegments);
 
@@ -176,6 +190,27 @@ export default defineComponent({
 		},
 	},
 
+	mounted() {
+		htmlEditorEventBus.on('format-html', this.format);
+
+		let doc = this.modelValue;
+
+		if (this.modelValue === '' && this.rows > 0) {
+			doc = '\n'.repeat(this.rows - 1);
+		}
+
+		const state = EditorState.create({ doc, extensions: this.extensions });
+
+		this.editor = new EditorView({ parent: this.root(), state });
+		this.editorState = this.editor.state;
+
+		this.getHighlighter()?.addColor(this.editor, this.resolvableSegments);
+	},
+
+	beforeUnmount() {
+		htmlEditorEventBus.off('format-html', this.format);
+	},
+
 	methods: {
 		root() {
 			const rootRef = this.$refs.htmlEditor as HTMLDivElement | undefined;
@@ -264,28 +299,15 @@ export default defineComponent({
 			return highlighter;
 		},
 	},
-
-	mounted() {
-		htmlEditorEventBus.on('format-html', this.format);
-
-		let doc = this.modelValue;
-
-		if (this.modelValue === '' && this.rows > 0) {
-			doc = '\n'.repeat(this.rows - 1);
-		}
-
-		const state = EditorState.create({ doc, extensions: this.extensions });
-
-		this.editor = new EditorView({ parent: this.root(), state });
-		this.editorState = this.editor.state;
-
-		this.getHighlighter()?.addColor(this.editor, this.resolvableSegments);
-	},
-
-	beforeUnmount() {
-		htmlEditorEventBus.off('format-html', this.format);
-	},
 });
 </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 1fad0ff3ee..0000000000
--- a/packages/editor-ui/src/components/HtmlEditor/theme.ts
+++ /dev/null
@@ -1,95 +0,0 @@
-import { HighlightStyle, syntaxHighlighting } from '@codemirror/language';
-import { EditorView } from '@codemirror/view';
-import { tags } from '@lezer/highlight';
-
-export const theme = ({ isReadOnly }: { isReadOnly: boolean }) => [
-	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': {
-			...(isReadOnly ? { backgroundColor: 'var(--color-code-background-readonly)' } : {}),
-		},
-		'&.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: isReadOnly
-				? 'var(--color-code-background-readonly)'
-				: '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 8fd8c32197..3fd5b50fd9 100644
--- a/packages/editor-ui/src/components/ImportCurlModal.vue
+++ b/packages/editor-ui/src/components/ImportCurlModal.vue
@@ -2,7 +2,7 @@
 	<Modal
 		width="700px"
 		:title="$locale.baseText('importCurlModal.title')"
-		:eventBus="modalBus"
+		:event-bus="modalBus"
 		:name="IMPORT_CURL_MODAL_KEY"
 		:center="true"
 	>
@@ -10,13 +10,13 @@
 			<div :class="$style.container">
 				<n8n-input-label :label="$locale.baseText('importCurlModal.input.label')" color="text-dark">
 					<n8n-input
-						:modelValue="curlCommand"
+						ref="input"
+						:model-value="curlCommand"
 						type="textarea"
 						:rows="5"
 						:placeholder="$locale.baseText('importCurlModal.input.placeholder')"
 						@update:modelValue="onInput"
 						@focus="$event.target.select()"
-						ref="input"
 					/>
 				</n8n-input-label>
 			</div>
@@ -29,9 +29,9 @@
 				/>
 				<div>
 					<n8n-button
-						@click="importCurlCommand"
 						float="right"
 						:label="$locale.baseText('importCurlModal.button.label')"
+						@click="importCurlCommand"
 					/>
 				</div>
 			</div>
@@ -46,7 +46,7 @@ import {
 	CURL_IMPORT_NOT_SUPPORTED_PROTOCOLS,
 	CURL_IMPORT_NODES_PROTOCOLS,
 } from '@/constants';
-import { useToast } from '@/composables';
+import { useToast } from '@/composables/useToast';
 import { defineComponent } from 'vue';
 import type { INodeUi } from '@/Interface';
 import { mapStores } from 'pinia';
@@ -77,6 +77,12 @@ export default defineComponent({
 			return this.ndvStore.activeNode;
 		},
 	},
+	mounted() {
+		this.curlCommand = this.uiStore.getCurlCommand || '';
+		setTimeout(() => {
+			(this.$refs.input as HTMLTextAreaElement).focus();
+		});
+	},
 	methods: {
 		closeDialog(): void {
 			this.modalBus.emit('close');
@@ -176,12 +182,6 @@ export default defineComponent({
 			});
 		},
 	},
-	mounted() {
-		this.curlCommand = this.uiStore.getCurlCommand || '';
-		setTimeout(() => {
-			(this.$refs.input as HTMLTextAreaElement).focus();
-		});
-	},
 });
 </script>
 
diff --git a/packages/editor-ui/src/components/ImportParameter.vue b/packages/editor-ui/src/components/ImportParameter.vue
index 3f9448765f..ff5a67e3f1 100644
--- a/packages/editor-ui/src/components/ImportParameter.vue
+++ b/packages/editor-ui/src/components/ImportParameter.vue
@@ -17,7 +17,7 @@ import { useUIStore } from '@/stores/ui.store';
 import { mapStores } from 'pinia';
 
 export default defineComponent({
-	name: 'import-parameter',
+	name: 'ImportParameter',
 	props: {
 		isReadOnly: {
 			type: Boolean,
diff --git a/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorInput.vue b/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorInput.vue
index fc6434aa63..a4deef2bc6 100644
--- a/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorInput.vue
+++ b/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorInput.vue
@@ -8,7 +8,7 @@ import type { PropType } from 'vue';
 import { mapStores } from 'pinia';
 import { EditorView, keymap } from '@codemirror/view';
 import { Compartment, EditorState, Prec } from '@codemirror/state';
-import { history, redo } from '@codemirror/commands';
+import { history, redo, undo } from '@codemirror/commands';
 import { acceptCompletion, autocompletion, completionStatus } from '@codemirror/autocomplete';
 
 import { useNDVStore } from '@/stores/ndv.store';
@@ -29,6 +29,7 @@ export default defineComponent({
 	props: {
 		modelValue: {
 			type: String,
+			required: true,
 		},
 		isReadOnly: {
 			type: Boolean,
@@ -40,6 +41,7 @@ export default defineComponent({
 		},
 		path: {
 			type: String,
+			required: true,
 		},
 		additionalData: {
 			type: Object as PropType<IDataObject>,
@@ -103,6 +105,7 @@ export default defineComponent({
 							return false;
 						},
 					},
+					{ key: 'Mod-z', run: undo },
 					{ key: 'Mod-Shift-z', run: redo },
 				]),
 			),
diff --git a/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorOutput.vue b/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorOutput.vue
index c987626585..3e461b1594 100644
--- a/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorOutput.vue
+++ b/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorOutput.vue
@@ -40,7 +40,7 @@ import { outputTheme } from './theme';
 
 import type { Plaintext, Resolved, Segment } from '@/types/expressions';
 import { EXPRESSIONS_DOCS_URL } from '@/constants';
-import { useI18n } from '@/composables';
+import { useI18n } from '@/composables/useI18n';
 
 export default defineComponent({
 	name: 'InlineExpressionEditorOutput',
@@ -62,18 +62,6 @@ export default defineComponent({
 			required: true,
 		},
 	},
-	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);
-		},
-	},
 	setup() {
 		const i18n = useI18n();
 
@@ -87,18 +75,6 @@ export default defineComponent({
 			expressionsDocsUrl: EXPRESSIONS_DOCS_URL,
 		};
 	},
-	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],
-			}),
-		});
-	},
-	beforeUnmount() {
-		this.editor?.destroy();
-	},
 	computed: {
 		resolvedExpression(): string {
 			return this.segments.reduce((acc, segment) => {
@@ -119,14 +95,38 @@ export default defineComponent({
 						segment.kind === 'plaintext'
 							? segment.plaintext.length
 							: segment.resolved
-							? (segment.resolved as any).toString().length
-							: 0;
+							  ? segment.resolved.toString().length
+							  : 0;
 					segment.to = cursor;
 					return segment;
 				})
 				.filter((segment): segment is Resolved => segment.kind === 'resolvable');
 		},
 	},
+	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);
+		},
+	},
+	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],
+			}),
+		});
+	},
+	beforeUnmount() {
+		this.editor?.destroy();
+	},
 });
 </script>
 
@@ -140,7 +140,7 @@ export default defineComponent({
 	flex-direction: column;
 	position: absolute;
 	z-index: 2; // cover tooltips
-	background: white;
+	background: var(--color-code-background);
 	border: var(--border-base);
 	border-top: none;
 	width: 100%;
@@ -148,6 +148,10 @@ export default defineComponent({
 	border-bottom-left-radius: 4px;
 	border-bottom-right-radius: 4px;
 
+	:global(.cm-editor) {
+		background-color: var(--color-code-background);
+	}
+
 	.header,
 	.body,
 	.footer {
@@ -179,7 +183,7 @@ export default defineComponent({
 			display: inline-block;
 			font-size: var(--font-size-2xs);
 			height: var(--font-size-m);
-			background-color: #f0f0f0;
+			background-color: var(--color-expression-syntax-example);
 			margin-left: var(--spacing-5xs);
 			margin-right: var(--spacing-5xs);
 		}
diff --git a/packages/editor-ui/src/components/InlineExpressionEditor/theme.ts b/packages/editor-ui/src/components/InlineExpressionEditor/theme.ts
index 0e11f5e8c9..f6dd6aed26 100644
--- a/packages/editor-ui/src/components/InlineExpressionEditor/theme.ts
+++ b/packages/editor-ui/src/components/InlineExpressionEditor/theme.ts
@@ -8,6 +8,7 @@ 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',
@@ -26,9 +27,17 @@ 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': {
diff --git a/packages/editor-ui/src/components/InlineNameEdit.vue b/packages/editor-ui/src/components/InlineNameEdit.vue
index 59ba4292e5..5e6c1e8ca3 100644
--- a/packages/editor-ui/src/components/InlineNameEdit.vue
+++ b/packages/editor-ui/src/components/InlineNameEdit.vue
@@ -5,10 +5,10 @@
 		</span>
 		<div
 			v-else
+			v-on-click-outside="disableNameEdit"
 			:class="[$style.headline, $style['headline-editable']]"
 			@keydown.stop
 			@click="enableNameEdit"
-			v-on-click-outside="disableNameEdit"
 		>
 			<div v-if="!isNameEdit">
 				<span>{{ modelValue }}</span>
@@ -16,16 +16,16 @@
 			</div>
 			<div v-else :class="$style.nameInput">
 				<n8n-input
-					:modelValue="modelValue"
-					size="xlarge"
 					ref="nameInput"
+					:model-value="modelValue"
+					size="xlarge"
+					:maxlength="64"
 					@update:modelValue="onNameEdit"
 					@change="disableNameEdit"
-					:maxlength="64"
 				/>
 			</div>
 		</div>
-		<div :class="$style.subtitle" v-if="!isNameEdit && subtitle">
+		<div v-if="!isNameEdit && subtitle" :class="$style.subtitle">
 			{{ subtitle }}
 		</div>
 	</div>
@@ -33,7 +33,7 @@
 
 <script lang="ts">
 import { defineComponent } from 'vue';
-import { useToast } from '@/composables';
+import { useToast } from '@/composables/useToast';
 
 export default defineComponent({
 	name: 'InlineNameEdit',
diff --git a/packages/editor-ui/src/components/InlineTextEdit.vue b/packages/editor-ui/src/components/InlineTextEdit.vue
index 4eb43044bc..d4ca182afd 100644
--- a/packages/editor-ui/src/components/InlineTextEdit.vue
+++ b/packages/editor-ui/src/components/InlineTextEdit.vue
@@ -1,12 +1,12 @@
 <template>
-	<span @keydown.stop class="inline-edit">
+	<span class="inline-edit" @keydown.stop>
 		<span v-if="isEditEnabled && !isDisabled">
 			<ExpandableInputEdit
 				:placeholder="placeholder"
-				:modelValue="newValue"
+				:model-value="newValue"
 				:maxlength="maxLength"
 				:autofocus="true"
-				:eventBus="inputBus"
+				:event-bus="inputBus"
 				@update:modelValue="onInput"
 				@esc="onEscape"
 				@blur="onBlur"
@@ -14,8 +14,8 @@
 			/>
 		</span>
 
-		<span @click="onClick" class="preview" v-else>
-			<ExpandableInputPreview :modelValue="previewValue || modelValue" />
+		<span v-else class="preview" @click="onClick">
+			<ExpandableInputPreview :model-value="previewValue || modelValue" />
 		</span>
 	</span>
 </template>
@@ -63,6 +63,11 @@ export default defineComponent({
 			inputBus: createEventBus(),
 		};
 	},
+	watch: {
+		disabled(value) {
+			this.isDisabled = value;
+		},
+	},
 	methods: {
 		onInput(newValue: string) {
 			if (this.disabled) {
@@ -114,11 +119,6 @@ export default defineComponent({
 			this.$emit('toggle');
 		},
 	},
-	watch: {
-		disabled(value) {
-			this.isDisabled = value;
-		},
-	},
 });
 </script>
 
diff --git a/packages/editor-ui/src/components/InputPanel.vue b/packages/editor-ui/src/components/InputPanel.vue
index 160229bc3d..e0d50a2bac 100644
--- a/packages/editor-ui/src/components/InputPanel.vue
+++ b/packages/editor-ui/src/components/InputPanel.vue
@@ -1,25 +1,28 @@
 <template>
 	<RunData
-		:nodeUi="currentNode"
-		:runIndex="runIndex"
-		:linkedRuns="linkedRuns"
-		:canLinkRuns="!mappedNode && 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="isMappingEnabled"
-		:distanceFromActive="currentNodeDepth"
-		:isProductionExecutionPreview="isProductionExecutionPreview"
-		paneType="input"
+		: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')"
+		:session-id="sessionId"
+		: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"
+		@activatePane="activatePane"
 		@itemHover="$emit('itemHover', $event)"
 		@linkRun="onLinkRun"
 		@unlinkRun="onUnlinkRun"
 		@runChange="onRunIndexChange"
 		@tableMounted="$emit('tableMounted', $event)"
-		data-test-id="ndv-input-panel"
+		@search="$emit('search', $event)"
 	>
 		<template #header>
 			<div :class="$style.titleSection">
@@ -27,20 +30,20 @@
 					v-if="parentNodes.length"
 					teleported
 					size="small"
-					:modelValue="currentNodeName"
-					@update:modelValue="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:modelValue="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"
@@ -58,12 +61,12 @@
 				<n8n-radio-buttons
 					v-if="isActiveNodeConfig && !readOnly"
 					:options="inputModes"
-					:modelValue="inputMode"
+					:model-value="inputMode"
 					@update:modelValue="onInputModeChange"
 				/>
 			</div>
 		</template>
-		<template #before-data v-if="isMappingMode">
+		<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.
@@ -71,11 +74,11 @@
 			<component :is="'style'">button.linkRun { display: none }</component>
 			<div :class="$style.mappedNode">
 				<n8n-select
-					:modelValue="mappedNode"
-					@update:modelValue="onMappedNodeSelected"
+					:model-value="mappedNode"
 					size="small"
-					@click.stop
 					teleported
+					@update:modelValue="onMappedNodeSelected"
+					@click.stop
 				>
 					<template #prepend>{{ $locale.baseText('ndv.input.previousNode') }}</template>
 					<n8n-option
@@ -89,8 +92,8 @@
 		</template>
 		<template #node-not-run>
 			<div
-				:class="$style.noOutputData"
 				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')
@@ -108,18 +111,18 @@
 					<NodeExecuteButton
 						type="secondary"
 						:transparent="true"
-						:nodeName="isActiveNodeConfig ? rootNode : 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>
@@ -163,7 +166,13 @@ import { defineComponent } from 'vue';
 import { mapStores } from 'pinia';
 import type { INodeUi } from '@/Interface';
 import { NodeHelpers, NodeConnectionType } from 'n8n-workflow';
-import type { ConnectionTypes, IConnectedNode, INodeTypeDescription, Workflow } from 'n8n-workflow';
+import type {
+	ConnectionTypes,
+	IConnectedNode,
+	INodeOutputConfiguration,
+	INodeTypeDescription,
+	Workflow,
+} from 'n8n-workflow';
 import RunData from './RunData.vue';
 import { workflowHelpers } from '@/mixins/workflowHelpers';
 import NodeExecuteButton from './NodeExecuteButton.vue';
@@ -182,14 +191,15 @@ type MappingMode = 'debugging' | 'mapping';
 
 export default defineComponent({
 	name: 'InputPanel',
-	mixins: [workflowHelpers],
 	components: { RunData, NodeExecuteButton, WireMeUp },
+	mixins: [workflowHelpers],
 	props: {
 		currentNodeName: {
 			type: String,
 		},
 		runIndex: {
 			type: Number,
+			required: true,
 		},
 		linkedRuns: {
 			type: Boolean,
@@ -208,6 +218,10 @@ export default defineComponent({
 			type: Boolean,
 			default: false,
 		},
+		isPaneActive: {
+			type: Boolean,
+			default: false,
+		},
 	},
 	data() {
 		return {
@@ -263,9 +277,9 @@ export default defineComponent({
 			}
 
 			if (
-				(inputs.length === 0 ||
-					inputs.find((inputName) => inputName !== NodeConnectionType.Main)) &&
-				outputs.find((outputName) => outputName !== NodeConnectionType.Main)
+				inputs.length === 0 ||
+				(inputs.every((input) => this.filterOutConnectionType(input, NodeConnectionType.Main)) &&
+					outputs.find((output) => this.filterOutConnectionType(output, NodeConnectionType.Main)))
 			) {
 				return true;
 			}
@@ -375,7 +389,46 @@ export default defineComponent({
 			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];
+				}
+			},
+			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;
 		},
@@ -432,9 +485,9 @@ export default defineComponent({
 		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) {
@@ -454,36 +507,8 @@ export default defineComponent({
 			}
 			return truncated;
 		},
-	},
-	watch: {
-		inputMode: {
-			handler(val) {
-				this.onRunIndexChange(-1);
-				if (val === 'mapping') {
-					this.onUnlinkRun();
-					this.mappedNode = this.rootNodesParents[0];
-				}
-			},
-			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;
-			}
+		activatePane() {
+			this.$emit('activatePane');
 		},
 	},
 });
diff --git a/packages/editor-ui/src/components/InviteUsersModal.vue b/packages/editor-ui/src/components/InviteUsersModal.vue
index 791b9fa10b..18a56e32c8 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,8 +42,8 @@
 			<n8n-form-inputs
 				v-else
 				:inputs="config"
-				:eventBus="formBus"
-				:columnView="true"
+				:event-bus="formBus"
+				:column-view="true"
 				@update="onInput"
 				@submit="onSubmit"
 			/>
@@ -44,8 +53,8 @@
 				:loading="loading"
 				:disabled="!enabledButton"
 				:label="buttonLabel"
-				@click="onSubmitClick"
 				float="right"
+				@click="onSubmitClick"
 			/>
 		</template>
 	</Modal>
@@ -54,15 +63,16 @@
 <script lang="ts">
 import { defineComponent } from 'vue';
 import { mapStores } from 'pinia';
-import { useToast } from '@/composables';
-import { copyPaste } from '@/mixins/copyPaste';
+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 { ROLE } from '@/utils/userUtils';
+import { EnterpriseEditionFeature, VALID_EMAIL_REGEX, INVITE_USER_MODAL_KEY } 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 = /^.* <(.*)>$/;
 
@@ -79,7 +89,6 @@ function getEmail(email: string): string {
 
 export default defineComponent({
 	name: 'InviteUsersModal',
-	mixins: [copyPaste],
 	components: { Modal },
 	props: {
 		modalName: {
@@ -87,7 +96,10 @@ export default defineComponent({
 		},
 	},
 	setup() {
+		const clipboard = useClipboard();
+
 		return {
+			clipboard,
 			...useToast(),
 		};
 	},
@@ -97,6 +109,7 @@ export default defineComponent({
 			formBus: createEventBus(),
 			modalBus: createEventBus(),
 			emails: '',
+			role: 'member',
 			showInviteUrls: null as IInviteResponse[] | null,
 			loading: false,
 			INVITE_USER_MODAL_KEY,
@@ -132,6 +145,11 @@ export default defineComponent({
 							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,
 				},
@@ -139,7 +157,7 @@ export default defineComponent({
 		];
 	},
 	computed: {
-		...mapStores(useUsersStore, useSettingsStore),
+		...mapStores(useUsersStore, useSettingsStore, useUIStore),
 		emailsCount(): number {
 			return this.emails.split(',').filter((email: string) => !!email.trim()).length;
 		},
@@ -167,6 +185,11 @@ export default defineComponent({
 				  )
 				: [];
 		},
+		isAdvancedPermissionsEnabled(): boolean {
+			return this.settingsStore.isEnterpriseFeatureEnabled(
+				EnterpriseEditionFeature.AdvancedPermissions,
+			);
+		},
 	},
 	methods: {
 		validateEmails(value: string | number | boolean | null | undefined) {
@@ -193,6 +216,9 @@ export default defineComponent({
 			if (e.name === 'emails') {
 				this.emails = e.value;
 			}
+			if (e.name === 'role') {
+				this.role = e.value;
+			}
 		},
 		async onSubmit() {
 			try {
@@ -200,7 +226,7 @@ export default defineComponent({
 
 				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) {
@@ -234,7 +260,7 @@ export default defineComponent({
 
 				if (successfulUrlInvites.length) {
 					if (successfulUrlInvites.length === 1) {
-						this.copyToClipboard(successfulUrlInvites[0].user.inviteAcceptUrl);
+						void this.clipboard.copy(successfulUrlInvites[0].user.inviteAcceptUrl);
 					}
 
 					this.showMessage({
@@ -304,10 +330,13 @@ export default defineComponent({
 		},
 		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 0000000000..cb9c60c85b
--- /dev/null
+++ b/packages/editor-ui/src/components/JsEditor/JsEditor.vue
@@ -0,0 +1,120 @@
+<template>
+	<div :class="$style.editor">
+		<div ref="jsEditor" class="ph-no-capture js-editor"></div>
+		<slot name="suffix" />
+	</div>
+</template>
+
+<script lang="ts">
+import { autocompletion } from '@codemirror/autocomplete';
+import { history, redo, toggleComment, undo } 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 { enterKeyMap, tabKeyMap } from '../CodeNodeEditor/baseExtensions';
+import { codeNodeEditorTheme } from '../CodeNodeEditor/theme';
+
+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,
+							{ key: 'Mod-z', run: undo },
+							{ key: 'Mod-Shift-z', run: redo },
+							{ key: 'Mod-/', run: toggleComment },
+						]),
+					),
+					lintGutter(),
+					autocompletion(),
+					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 0000000000..82ab0bfe99
--- /dev/null
+++ b/packages/editor-ui/src/components/JsonEditor/JsonEditor.vue
@@ -0,0 +1,121 @@
+<template>
+	<div :class="$style.editor">
+		<div ref="jsonEditor" class="ph-no-capture json-editor"></div>
+		<slot name="suffix" />
+	</div>
+</template>
+
+<script lang="ts">
+import { autocompletion } from '@codemirror/autocomplete';
+import { history, redo, undo } 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 { enterKeyMap, tabKeyMap } from '../CodeNodeEditor/baseExtensions';
+import { codeNodeEditorTheme } from '../CodeNodeEditor/theme';
+
+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,
+							{ key: 'Mod-z', run: undo },
+							{ key: 'Mod-Shift-z', run: redo },
+						]),
+					),
+					createLinter(jsonParseLinter()),
+					lintGutter(),
+					autocompletion(),
+					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;
+		},
+	},
+	mounted() {
+		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;
+	},
+});
+</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 0000000000..66beca4d16
--- /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 8504ae28ca..e8947b5d99 100644
--- a/packages/editor-ui/src/components/Logo.vue
+++ b/packages/editor-ui/src/components/Logo.vue
@@ -5,7 +5,8 @@
 <script lang="ts">
 import { defineComponent } from 'vue';
 import { mapStores } from 'pinia';
-import { useRootStore, useUIStore } from '@/stores';
+import { useRootStore } from '@/stores/n8nRoot.store';
+import { useUIStore } from '@/stores/ui.store';
 
 export default defineComponent({
 	computed: {
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 0000000000..ca258918c4
--- /dev/null
+++ b/packages/editor-ui/src/components/MainHeader/CollaborationPane.vue
@@ -0,0 +1,79 @@
+<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';
+
+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((user) => user.globalRoleId === 1);
+	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(() => {
+	startHeartbeat();
+	document.addEventListener('visibilitychange', onDocumentVisibilityChange);
+});
+
+onBeforeUnmount(() => {
+	document.removeEventListener('visibilitychange', onDocumentVisibilityChange);
+	stopHeartbeat();
+});
+</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 f66dc9344b..e4b171555b 100644
--- a/packages/editor-ui/src/components/MainHeader/MainHeader.vue
+++ b/packages/editor-ui/src/components/MainHeader/MainHeader.vue
@@ -1,12 +1,12 @@
 <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 :readOnly="readOnly" />
-				<tab-bar
+				<WorkflowDetails :read-only="readOnly" />
+				<TabBar
 					v-if="onWorkflowPage"
 					:items="tabBarItems"
-					:activeTab="activeHeaderTab"
+					:active-tab="activeHeaderTab"
 					@select="onTabSelected"
 				/>
 			</div>
@@ -30,7 +30,9 @@ import {
 } from '@/constants';
 import type { INodeUi, ITabBarItem } from '@/Interface';
 import { workflowHelpers } from '@/mixins/workflowHelpers';
-import { useUIStore, useNDVStore, useSourceControlStore } from '@/stores';
+import { useNDVStore } from '@/stores/ndv.store';
+import { useSourceControlStore } from '@/stores/sourceControl.store';
+import { useUIStore } from '@/stores/ui.store';
 
 export default defineComponent({
 	name: 'MainHeader',
@@ -39,12 +41,12 @@ export default defineComponent({
 		TabBar,
 	},
 	mixins: [pushConnection, workflowHelpers],
-	setup(props) {
+	setup(props, ctx) {
 		return {
 			// eslint-disable-next-line @typescript-eslint/no-misused-promises
-			...pushConnection.setup?.(props),
+			...pushConnection.setup?.(props, ctx),
 			// eslint-disable-next-line @typescript-eslint/no-misused-promises
-			...workflowHelpers.setup?.(props),
+			...workflowHelpers.setup?.(props, ctx),
 		};
 	},
 	data() {
@@ -87,20 +89,15 @@ export default defineComponent({
 			return this.sourceControlStore.preferences.branchReadOnly;
 		},
 	},
-	mounted() {
-		this.dirtyState = this.uiStore.stateIsDirty;
-		this.syncTabsWithRoute(this.$route);
-		// Initialize the push connection
-		this.pushConnect();
-	},
-	beforeUnmount() {
-		this.pushDisconnect();
-	},
 	watch: {
 		$route(to, from) {
 			this.syncTabsWithRoute(to);
 		},
 	},
+	mounted() {
+		this.dirtyState = this.uiStore.stateIsDirty;
+		this.syncTabsWithRoute(this.$route);
+	},
 	methods: {
 		syncTabsWithRoute(route: Route): void {
 			if (
@@ -157,7 +154,6 @@ export default defineComponent({
 							params: { name: routeWorkflowId },
 						});
 					}
-					// this.modalBus.emit('closeAll');
 					this.activeHeaderTab = MAIN_HEADER_TABS.EXECUTIONS;
 					break;
 				default:
diff --git a/packages/editor-ui/src/components/MainHeader/TabBar.vue b/packages/editor-ui/src/components/MainHeader/TabBar.vue
index 4ddf6b0108..e4e85fb22c 100644
--- a/packages/editor-ui/src/components/MainHeader/TabBar.vue
+++ b/packages/editor-ui/src/components/MainHeader/TabBar.vue
@@ -7,7 +7,7 @@
 			[$style.menuCollapsed]: mainSidebarCollapsed,
 		}"
 	>
-		<n8n-radio-buttons :modelValue="activeTab" :options="items" @update:modelValue="onSelect" />
+		<n8n-radio-buttons :model-value="activeTab" :options="items" @update:modelValue="onSelect" />
 	</div>
 </template>
 
@@ -20,12 +20,7 @@ import { mapStores } from 'pinia';
 import { useUIStore } from '@/stores/ui.store';
 
 export default defineComponent({
-	name: 'tab-bar',
-	data() {
-		return {
-			MAIN_HEADER_TABS,
-		};
-	},
+	name: 'TabBar',
 	props: {
 		items: {
 			type: Array as PropType<ITabBarItem[]>,
@@ -36,6 +31,11 @@ export default defineComponent({
 			default: MAIN_HEADER_TABS.WORKFLOW,
 		},
 	},
+	data() {
+		return {
+			MAIN_HEADER_TABS,
+		};
+	},
 	computed: {
 		...mapStores(useUIStore),
 		mainSidebarCollapsed(): boolean {
diff --git a/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue b/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue
index 7c414e2fa7..c405bf6146 100644
--- a/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue
+++ b/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue
@@ -1,24 +1,24 @@
 <template>
-	<div class="container" v-if="workflowName">
-		<BreakpointsObserver :valueXS="15" :valueSM="25" :valueMD="50" class="name-container">
+	<div v-if="workflowName" class="container">
+		<BreakpointsObserver :value-x-s="15" :value-s-m="25" :value-m-d="50" class="name-container">
 			<template #default="{ value }">
 				<ShortenName
 					:name="workflowName"
 					:limit="value"
 					:custom="true"
-					testId="workflow-name-input"
+					test-id="workflow-name-input"
 				>
 					<template #default="{ shortenedName }">
 						<InlineTextEdit
-							:modelValue="workflowName"
-							:previewValue="shortenedName"
-							:isEditEnabled="isNameEditEnabled"
-							:maxLength="MAX_WORKFLOW_NAME_LENGTH"
+							:model-value="workflowName"
+							:preview-value="shortenedName"
+							:is-edit-enabled="isNameEditEnabled"
+							:max-length="MAX_WORKFLOW_NAME_LENGTH"
 							:disabled="readOnly"
-							@toggle="onNameToggle"
-							@submit="onNameSubmit"
 							placeholder="Enter workflow name"
 							class="name"
+							@toggle="onNameToggle"
+							@submit="onNameSubmit"
 						/>
 					</template>
 				</ShortenName>
@@ -28,11 +28,11 @@
 		<span v-if="settingsStore.areTagsEnabled" class="tags" data-test-id="workflow-tags-container">
 			<TagsDropdown
 				v-if="isTagsEditEnabled && !readOnly"
-				v-model="appliedTagIds"
-				:createEnabled="true"
-				:eventBus="tagsEditBus"
-				:placeholder="$locale.baseText('workflowDetails.chooseOrCreateATag')"
 				ref="dropdown"
+				v-model="appliedTagIds"
+				:create-enabled="true"
+				:event-bus="tagsEditBus"
+				:placeholder="$locale.baseText('workflowDetails.chooseOrCreateATag')"
 				class="tags-edit"
 				data-test-id="workflow-tags-dropdown"
 				@blur="onTagsBlur"
@@ -45,29 +45,31 @@
 			</div>
 			<TagsContainer
 				v-else
-				:tagIds="currentWorkflowTagIds"
+				:key="currentWorkflowId"
+				:tag-ids="currentWorkflowTagIds"
 				:clickable="true"
 				:responsive="true"
-				:key="currentWorkflowId"
-				@click="onTagsEditEnable"
 				data-test-id="workflow-tags"
+				@click="onTagsEditEnable"
 			/>
 		</span>
 		<span v-else class="tags"></span>
 
 		<PushConnectionTracker class="actions">
-			<span class="activator">
+			<span :class="`activator ${$style.group}`">
 				<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>
+				<div :class="$style.group">
+					<CollaborationPane />
+					<n8n-button
+						type="secondary"
+						data-test-id="workflow-share-button"
+						@click="onShareButtonClick"
+					>
+						{{ $locale.baseText('workflowDetails.share') }}
+					</n8n-button>
+				</div>
 				<template #fallback>
 					<n8n-tooltip>
 						<n8n-button type="secondary" :class="['mr-2xs', $style.disabledShareButton]">
@@ -94,31 +96,34 @@
 					</n8n-tooltip>
 				</template>
 			</enterprise-edition>
-			<SaveButton
-				type="primary"
-				:saved="!this.isDirty && !this.isNewWorkflow"
-				:disabled="isWorkflowSaving || readOnly"
-				data-test-id="workflow-save-button"
-				@click="onSaveButtonClick"
-			/>
-			<router-link
-				v-if="isWorkflowHistoryFeatureEnabled"
-				:to="workflowHistoryRoute"
-				:class="$style.workflowHistoryButton"
-			>
-				<n8n-icon-button
-					:disabled="isWorkflowHistoryButtonDisabled"
-					type="tertiary"
-					icon="history"
-					size="medium"
-					text
+			<div :class="$style.group">
+				<SaveButton
+					type="primary"
+					:saved="!isDirty && !isNewWorkflow"
+					:disabled="isWorkflowSaving || readOnly"
+					data-test-id="workflow-save-button"
+					@click="onSaveButtonClick"
 				/>
-			</router-link>
-			<div :class="$style.workflowMenuContainer">
+				<router-link
+					v-if="isWorkflowHistoryFeatureEnabled"
+					:to="workflowHistoryRoute"
+					:class="$style.workflowHistoryButton"
+				>
+					<n8n-icon-button
+						:disabled="isWorkflowHistoryButtonDisabled"
+						data-test-id="workflow-history-button"
+						type="tertiary"
+						icon="history"
+						size="medium"
+						text
+					/>
+				</router-link>
+			</div>
+			<div :class="[$style.workflowMenuContainer, $style.group]">
 				<input
+					ref="importFile"
 					:class="$style.hiddenInput"
 					type="file"
-					ref="importFile"
 					data-test-id="workflow-import-input"
 					@change="handleFileImport()"
 				/>
@@ -158,26 +163,28 @@ 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 CollaborationPane from '@/components/MainHeader/CollaborationPane.vue';
 import type { IUser, IWorkflowDataUpdate, IWorkflowDb, IWorkflowToShare } from '@/Interface';
 
 import { saveAs } from 'file-saver';
-import { useTitleChange, useToast, useMessage } from '@/composables';
+import { useTitleChange } from '@/composables/useTitleChange';
+import { useMessage } from '@/composables/useMessage';
+import { useToast } from '@/composables/useToast';
 import type { MessageBoxInputData } from 'element-plus';
-import {
-	useUIStore,
-	useSettingsStore,
-	useWorkflowsStore,
-	useRootStore,
-	useTagsStore,
-	useUsersStore,
-	useUsageStore,
-	useSourceControlStore,
-} from '@/stores';
+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 { useUsageStore } from '@/stores/usage.store';
+import { useUsersStore } from '@/stores/users.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
 import type { IPermissions } from '@/permissions';
 import { getWorkflowPermissions } from '@/permissions';
 import { createEventBus } from 'n8n-design-system/utils';
 import { nodeViewEventBus } from '@/event-bus';
-import { genericHelpers } from '@/mixins/genericHelpers';
+import { hasPermission } from '@/rbac/permissions';
+import { useCanvasStore } from '@/stores/canvas.store';
 
 const hasChanged = (prev: string[], curr: string[]) => {
 	if (prev.length !== curr.length) {
@@ -190,7 +197,6 @@ const hasChanged = (prev: string[], curr: string[]) => {
 
 export default defineComponent({
 	name: 'WorkflowDetails',
-	mixins: [workflowHelpers, genericHelpers],
 	components: {
 		TagsContainer,
 		PushConnectionTracker,
@@ -200,7 +206,9 @@ export default defineComponent({
 		TagsDropdown,
 		InlineTextEdit,
 		BreakpointsObserver,
+		CollaborationPane,
 	},
+	mixins: [workflowHelpers],
 	props: {
 		readOnly: {
 			type: Boolean,
@@ -236,11 +244,12 @@ export default defineComponent({
 			useWorkflowsStore,
 			useUsersStore,
 			useSourceControlStore,
+			useCanvasStore,
 		),
 		currentUser(): IUser | null {
 			return this.usersStore.currentUser;
 		},
-		contextBasedTranslationKeys(): NestedRecord<string> {
+		contextBasedTranslationKeys() {
 			return this.uiStore.contextBasedTranslationKeys;
 		},
 		isWorkflowActive(): boolean {
@@ -288,7 +297,7 @@ export default defineComponent({
 			].includes(this.$route.name || '');
 		},
 		workflowPermissions(): IPermissions {
-			return getWorkflowPermissions(this.usersStore.currentUser, this.workflow);
+			return getWorkflowPermissions(this.currentUser, this.workflow);
 		},
 		workflowMenuItems(): Array<{}> {
 			const actions = [
@@ -320,15 +329,17 @@ export default defineComponent({
 				);
 			}
 
-			actions.push({
-				id: WORKFLOW_MENU_ACTIONS.PUSH,
-				label: this.$locale.baseText('menuActions.push'),
-				disabled:
-					!this.sourceControlStore.isEnterpriseSourceControlEnabled ||
-					!this.onWorkflowPage ||
-					this.onExecutionsTab ||
-					this.readOnlyEnv,
-			});
+			if (hasPermission(['rbac'], { rbac: { scope: 'sourceControl:push' } })) {
+				actions.push({
+					id: WORKFLOW_MENU_ACTIONS.PUSH,
+					label: this.$locale.baseText('menuActions.push'),
+					disabled:
+						!this.sourceControlStore.isEnterpriseSourceControlEnabled ||
+						!this.onWorkflowPage ||
+						this.onExecutionsTab ||
+						this.readOnlyEnv,
+				});
+			}
 
 			actions.push({
 				id: WORKFLOW_MENU_ACTIONS.SETTINGS,
@@ -349,9 +360,8 @@ export default defineComponent({
 			return actions;
 		},
 		isWorkflowHistoryFeatureEnabled(): boolean {
-			return (
-				this.settingsStore.isEnterpriseFeatureEnabled(EnterpriseEditionFeature.WorkflowHistory) &&
-				this.settingsStore.isDevRelease
+			return this.settingsStore.isEnterpriseFeatureEnabled(
+				EnterpriseEditionFeature.WorkflowHistory,
 			);
 		},
 		workflowHistoryRoute(): { name: string; params: { workflowId: string } } {
@@ -366,6 +376,12 @@ export default defineComponent({
 			return this.workflowsStore.isNewWorkflow;
 		},
 	},
+	watch: {
+		currentWorkflowId() {
+			this.isTagsEditEnabled = false;
+			this.isNameEditEnabled = false;
+		},
+	},
 	methods: {
 		async onSaveButtonClick() {
 			let currentId = undefined;
@@ -379,7 +395,17 @@ export default defineComponent({
 				name: this.workflowName,
 				tags: this.currentWorkflowTagIds,
 			});
-			if (saved) await this.settingsStore.fetchPromptsData();
+
+			if (saved) {
+				await this.settingsStore.fetchPromptsData();
+
+				if (this.$route.name === VIEWS.EXECUTION_DEBUG) {
+					await this.$router.replace({
+						name: VIEWS.WORKFLOW,
+						params: { name: this.currentWorkflowId },
+					});
+				}
+			}
 		},
 		onShareButtonClick() {
 			this.uiStore.openModalWithData({
@@ -518,6 +544,7 @@ export default defineComponent({
 					const exportData: IWorkflowToShare = {
 						...data,
 						meta: {
+							...(this.workflowsStore.workflow.meta || {}),
 							instanceId: this.rootStore.instanceId,
 						},
 						tags: (tags || []).map((tagId) => {
@@ -560,7 +587,7 @@ export default defineComponent({
 					break;
 				}
 				case WORKFLOW_MENU_ACTIONS.PUSH: {
-					this.startLoading();
+					this.canvasStore.startLoading();
 					try {
 						await this.onSaveButtonClick();
 
@@ -571,9 +598,20 @@ export default defineComponent({
 							data: { eventBus: this.eventBus, status },
 						});
 					} catch (error) {
-						this.showError(error, this.$locale.baseText('error'));
+						// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+						switch (error.message) {
+							case 'source_control_not_connected':
+								this.showError(
+									{ ...error, message: '' },
+									this.$locale.baseText('settings.sourceControl.error.not.connected.title'),
+									this.$locale.baseText('settings.sourceControl.error.not.connected.message'),
+								);
+								break;
+							default:
+								this.showError(error, this.$locale.baseText('error'));
+						}
 					} finally {
-						this.stopLoading();
+						this.canvasStore.stopLoading();
 					}
 
 					break;
@@ -628,12 +666,6 @@ export default defineComponent({
 			void this.uiStore.goToUpgrade('workflow_sharing', 'upgrade-workflow-sharing');
 		},
 	},
-	watch: {
-		currentWorkflowId() {
-			this.isTagsEditEnabled = false;
-			this.isNameEditEnabled = false;
-		},
-	},
 });
 </script>
 
@@ -665,7 +697,6 @@ $--header-spacing: 20px;
 	line-height: $--text-line-height;
 	display: flex;
 	align-items: center;
-	margin-right: 30px;
 
 	> span {
 		margin-right: 5px;
@@ -701,14 +732,15 @@ $--header-spacing: 20px;
 .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;
 }
@@ -724,8 +756,6 @@ $--header-spacing: 20px;
 .workflowHistoryButton {
 	width: 30px;
 	height: 30px;
-	margin-left: var(--spacing-m);
-	margin-right: var(--spacing-4xs);
 	color: var(--color-text-dark);
 	border-radius: var(--border-radius-base);
 
diff --git a/packages/editor-ui/src/components/MainSidebar.vue b/packages/editor-ui/src/components/MainSidebar.vue
index 50ce0f3025..61f8003f15 100644
--- a/packages/editor-ui/src/components/MainSidebar.vue
+++ b/packages/editor-ui/src/components/MainSidebar.vue
@@ -18,18 +18,23 @@
 		<n8n-menu :items="mainMenuItems" :collapsed="isCollapsed" @select="handleSelect">
 			<template #header>
 				<div :class="$style.logo">
-					<img :src="logoPath" :class="$style.icon" alt="n8n" />
+					<img :src="logoPath" data-test-id="n8n-logo" :class="$style.icon" alt="n8n" />
 				</div>
 			</template>
 
 			<template #beforeLowerMenu>
 				<ExecutionsUsage
-					:cloud-plan-data="currentPlanAndUsageData"
 					v-if="fullyExpanded && userIsTrialing"
+					:cloud-plan-data="currentPlanAndUsageData"
 			/></template>
 			<template #menuSuffix>
 				<div>
-					<div v-if="hasVersionUpdates" :class="$style.updates" @click="openUpdatesPanel">
+					<div
+						v-if="hasVersionUpdates"
+						data-test-id="version-updates-panel-button"
+						:class="$style.updates"
+						@click="openUpdatesPanel"
+					>
 						<div :class="$style.giftContainer">
 							<GiftNotificationIcon />
 						</div>
@@ -45,7 +50,7 @@
 					<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 -->
@@ -57,8 +62,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>
@@ -99,29 +104,25 @@
 import type { CloudPlanAndUsageData, IExecutionResponse, IMenuItem, IVersion } from '@/Interface';
 import GiftNotificationIcon from './GiftNotificationIcon.vue';
 
-import { genericHelpers } from '@/mixins/genericHelpers';
-import { useMessage } from '@/composables';
-import { workflowHelpers } from '@/mixins/workflowHelpers';
-import { workflowRun } from '@/mixins/workflowRun';
-
+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 { defineComponent } from 'vue';
 import { mapStores } from 'pinia';
-import {
-	useUIStore,
-	useSettingsStore,
-	useUsersStore,
-	useWorkflowsStore,
-	useRootStore,
-	useVersionsStore,
-	useCloudPlanStore,
-	useSourceControlStore,
-} from '@/stores/';
+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 { isNavigationFailure } from 'vue-router';
 import ExecutionsUsage from '@/components/ExecutionsUsage.vue';
 import MainSidebarSourceControl from '@/components/MainSidebarSourceControl.vue';
+import { hasPermission } from '@/rbac/permissions';
+import { useExternalHooks } from '@/composables/useExternalHooks';
+import { useDebounce } from '@/composables/useDebounce';
 
 export default defineComponent({
 	name: 'MainSidebar',
@@ -130,12 +131,15 @@ export default defineComponent({
 		ExecutionsUsage,
 		MainSidebarSourceControl,
 	},
-	mixins: [genericHelpers, workflowHelpers, workflowRun, userHelpers, debounceHelper],
-	setup(props) {
+	mixins: [userHelpers],
+	setup(props, ctx) {
+		const externalHooks = useExternalHooks();
+		const { callDebounced } = useDebounce();
+
 		return {
+			externalHooks,
+			callDebounced,
 			...useMessage(),
-			// eslint-disable-next-line @typescript-eslint/no-misused-promises
-			...workflowRun.setup?.(props),
 		};
 	},
 	data() {
@@ -177,7 +181,7 @@ export default defineComponent({
 			return accessibleRoute !== null;
 		},
 		showUserArea(): boolean {
-			return this.usersStore.canUserAccessSidebarUserInfo && this.usersStore.currentUser !== null;
+			return hasPermission(['authenticated']);
 		},
 		workflowExecution(): IExecutionResponse | null {
 			return this.workflowsStore.getWorkflowExecution;
@@ -219,10 +223,8 @@ export default defineComponent({
 				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 : '',
+						icon: item.icon || '',
+						label: item.label || '',
 						position: item.position,
 						type: item.properties?.href ? 'link' : 'regular',
 						properties: item.properties,
@@ -263,6 +265,14 @@ export default defineComponent({
 					position: 'top',
 					activateOnRouteNames: [VIEWS.EXECUTIONS],
 				},
+				{
+					id: 'cloud-admin',
+					type: 'link',
+					position: 'bottom',
+					label: 'Admin Panel',
+					icon: 'home',
+					available: this.settingsStore.isCloudDeployment && hasPermission(['instanceOwner']),
+				},
 				{
 					id: 'settings',
 					icon: 'cog',
@@ -293,7 +303,7 @@ export default defineComponent({
 							label: this.$locale.baseText('mainSidebar.helpMenuItems.documentation'),
 							type: 'link',
 							properties: {
-								href: 'https://docs.n8n.io',
+								href: 'https://docs.n8n.io?utm_source=n8n_app&utm_medium=app_sidebar',
 								newWindow: true,
 							},
 						},
@@ -303,7 +313,7 @@ export default defineComponent({
 							label: this.$locale.baseText('mainSidebar.helpMenuItems.forum'),
 							type: 'link',
 							properties: {
-								href: 'https://community.n8n.io',
+								href: 'https://community.n8n.io?utm_source=n8n_app&utm_medium=app_sidebar',
 								newWindow: true,
 							},
 						},
@@ -341,10 +351,12 @@ export default defineComponent({
 			};
 		},
 	},
-	mounted() {
+	async mounted() {
 		this.basePath = this.rootStore.baseUrl;
 		if (this.$refs.user) {
-			void this.$externalHooks().run('mainSidebar.mounted', { userRef: this.$refs.user });
+			void this.externalHooks.run('mainSidebar.mounted', {
+				userRef: this.$refs.user as Element,
+			});
 		}
 
 		void this.$nextTick(() => {
@@ -402,31 +414,31 @@ export default defineComponent({
 		async handleSelect(key: string) {
 			switch (key) {
 				case 'workflows': {
-					if (this.$router.currentRoute.name !== VIEWS.WORKFLOWS) {
+					if (this.$router.currentRoute.value.name !== VIEWS.WORKFLOWS) {
 						this.goToRoute({ name: VIEWS.WORKFLOWS });
 					}
 					break;
 				}
 				case 'templates': {
-					if (this.$router.currentRoute.name !== VIEWS.TEMPLATES) {
+					if (this.$router.currentRoute.value.name !== VIEWS.TEMPLATES) {
 						this.goToRoute({ name: VIEWS.TEMPLATES });
 					}
 					break;
 				}
 				case 'credentials': {
-					if (this.$router.currentRoute.name !== VIEWS.CREDENTIALS) {
+					if (this.$router.currentRoute.value.name !== VIEWS.CREDENTIALS) {
 						this.goToRoute({ name: VIEWS.CREDENTIALS });
 					}
 					break;
 				}
 				case 'variables': {
-					if (this.$router.currentRoute.name !== VIEWS.VARIABLES) {
+					if (this.$router.currentRoute.value.name !== VIEWS.VARIABLES) {
 						this.goToRoute({ name: VIEWS.VARIABLES });
 					}
 					break;
 				}
 				case 'executions': {
-					if (this.$router.currentRoute.name !== VIEWS.EXECUTIONS) {
+					if (this.$router.currentRoute.value.name !== VIEWS.EXECUTIONS) {
 						this.goToRoute({ name: VIEWS.EXECUTIONS });
 					}
 					break;
@@ -435,7 +447,7 @@ export default defineComponent({
 					const defaultRoute = this.findFirstAccessibleSettingsRoute();
 					if (defaultRoute) {
 						const route = this.$router.resolve({ name: defaultRoute });
-						if (this.$router.currentRoute.name !== defaultRoute) {
+						if (this.$router.currentRoute.value.name !== defaultRoute) {
 							this.goToRoute(route.path);
 						}
 					}
@@ -446,6 +458,10 @@ export default defineComponent({
 					this.uiStore.openModal(ABOUT_MODAL_KEY);
 					break;
 				}
+				case 'cloud-admin': {
+					void this.cloudPlanStore.redirectToDashboard();
+					break;
+				}
 				case 'quickstart':
 				case 'docs':
 				case 'forum':
@@ -474,7 +490,7 @@ export default defineComponent({
 
 			let defaultSettingsRoute = null;
 			for (const route of settingsRoutes) {
-				if (this.canUserAccessRouteByName(route)) {
+				if (this.canUserAccessRouteByName(route.toString())) {
 					defaultSettingsRoute = route;
 					break;
 				}
@@ -483,7 +499,7 @@ export default defineComponent({
 			return defaultSettingsRoute;
 		},
 		onResize(event: UIEvent) {
-			void this.callDebounced('onResizeEnd', { debounceTime: 100 }, event);
+			void this.callDebounced(this.onResizeEnd, { debounceTime: 100 }, event);
 		},
 		async onResizeEnd(event: UIEvent) {
 			const browserWidth = (event.target as Window).outerWidth;
diff --git a/packages/editor-ui/src/components/MainSidebarSourceControl.vue b/packages/editor-ui/src/components/MainSidebarSourceControl.vue
index 332dce0827..b3a4b424d5 100644
--- a/packages/editor-ui/src/components/MainSidebarSourceControl.vue
+++ b/packages/editor-ui/src/components/MainSidebarSourceControl.vue
@@ -2,10 +2,12 @@
 import { computed, nextTick, ref } from 'vue';
 import { useRouter } from 'vue-router';
 import { createEventBus } from 'n8n-design-system/utils';
-import { useI18n, useLoadingService, useMessage, useToast } from '@/composables';
+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 { useUsersStore } from '@/stores/users.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';
@@ -21,9 +23,7 @@ const responseStatuses = {
 const router = useRouter();
 const loadingService = useLoadingService();
 const uiStore = useUIStore();
-const usersStore = useUsersStore();
 const sourceControlStore = useSourceControlStore();
-const message = useMessage();
 const toast = useToast();
 const i18n = useI18n();
 
@@ -33,8 +33,11 @@ const tooltipOpenDelay = ref(300);
 const currentBranch = computed(() => {
 	return sourceControlStore.preferences.branchName;
 });
-const isInstanceOwner = computed(() => usersStore.isInstanceOwner);
-const setupButtonTooltipPlacement = computed(() => (props.isCollapsed ? 'right' : 'top'));
+const sourceControlAvailable = computed(
+	() =>
+		sourceControlStore.isEnterpriseSourceControlEnabled &&
+		hasPermission(['rbac'], { rbac: { scope: 'sourceControl:manage' } }),
+);
 
 async function pushWorkfolder() {
 	loadingService.startLoading();
@@ -122,7 +125,7 @@ const goToSourceControlSetup = async () => {
 
 <template>
 	<div
-		v-if="sourceControlStore.isEnterpriseSourceControlEnabled && isInstanceOwner"
+		v-if="sourceControlAvailable"
 		:class="{
 			[$style.sync]: true,
 			[$style.collapsed]: isCollapsed,
@@ -206,10 +209,6 @@ const goToSourceControlSetup = async () => {
 		display: none;
 	}
 
-	span {
-		color: var(--color-text-base);
-	}
-
 	button {
 		font-size: var(--font-size-3xs);
 	}
diff --git a/packages/editor-ui/src/components/MfaSetupModal.vue b/packages/editor-ui/src/components/MfaSetupModal.vue
index c7240d833c..560e25ff34 100644
--- a/packages/editor-ui/src/components/MfaSetupModal.vue
+++ b/packages/editor-ui/src/components/MfaSetupModal.vue
@@ -6,7 +6,7 @@
 				? $locale.baseText('mfa.setup.step1.title')
 				: $locale.baseText('mfa.setup.step2.title')
 		"
-		:eventBus="modalBus"
+		:event-bus="modalBus"
 		:name="MFA_SETUP_MODAL_KEY"
 		:center="true"
 		:loading="loadingQrCode"
@@ -27,8 +27,8 @@
 							<template #part2>
 								<a
 									:class="$style.secret"
-									@click="onCopySecretToClipboard"
 									data-test-id="mfa-secret-button"
+									@click="onCopySecretToClipboard"
 									>{{ $locale.baseText('mfa.setup.step1.instruction1.subtitle.part2') }}</a
 								>
 							</template>
@@ -36,7 +36,7 @@
 					</n8n-text>
 				</div>
 				<div :class="$style.qrContainer">
-					<qrcode-vue :value="qrCode" size="150" level="H" />
+					<QrcodeVue :value="qrCode" size="150" level="H" />
 				</div>
 				<div :class="$style.textContainer">
 					<n8n-text size="large" color="text-dark" :bold="true">{{
@@ -55,9 +55,9 @@
 							type="text"
 							:maxlength="6"
 							:placeholder="$locale.baseText('mfa.code.input.placeholder')"
-							@input="onInput"
 							:required="true"
 							data-test-id="mfa-token-input"
+							@input="onInput"
 						/>
 					</n8n-input-label>
 					<div :class="[$style.infoText, 'mt-4xs']">
@@ -140,20 +140,22 @@ import { mapStores } from 'pinia';
 import { useUIStore } from '@/stores/ui.store';
 import { useNDVStore } from '@/stores/ndv.store';
 import { useUsersStore } from '@/stores/users.store';
-import { copyPaste } from '@/mixins/copyPaste';
 import { mfaEventBus } from '@/event-bus';
-import { useToast } from '@/composables';
+import { useToast } from '@/composables/useToast';
 //@ts-ignore
 import QrcodeVue from 'qrcode.vue';
+import { useClipboard } from '@/composables/useClipboard';
 export default defineComponent({
 	name: 'MfaSetupModal',
-	mixins: [copyPaste],
 	components: {
 		Modal,
 		QrcodeVue,
 	},
 	setup() {
+		const clipboard = useClipboard();
+
 		return {
+			clipboard,
 			...useToast(),
 		};
 	},
@@ -176,6 +178,9 @@ export default defineComponent({
 	computed: {
 		...mapStores(useNDVStore, useUIStore, useUsersStore),
 	},
+	async mounted() {
+		await this.getMfaQR();
+	},
 	methods: {
 		closeDialog(): void {
 			this.modalBus.emit('close');
@@ -196,7 +201,7 @@ export default defineComponent({
 				});
 		},
 		onCopySecretToClipboard() {
-			this.copyToClipboard(this.secret);
+			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'),
@@ -265,9 +270,6 @@ export default defineComponent({
 			}
 		},
 	},
-	async mounted() {
-		await this.getMfaQR();
-	},
 });
 </script>
 
@@ -289,6 +291,14 @@ export default defineComponent({
 	padding-bottom: var(--spacing-xl);
 }
 
+.qrContainer {
+	text-align: center;
+
+	canvas {
+		border: 4px solid var(--prim-gray-10);
+	}
+}
+
 .headerContainer {
 	text-align: center;
 }
diff --git a/packages/editor-ui/src/components/Modal.vue b/packages/editor-ui/src/components/Modal.vue
index 86722b4e37..5c7ddeff3b 100644
--- a/packages/editor-ui/src/components/Modal.vue
+++ b/packages/editor-ui/src/components/Modal.vue
@@ -1,6 +1,6 @@
 <template>
 	<el-dialog
-		:modelValue="uiStore.isModalOpen(this.name)"
+		:model-value="uiStore.isModalOpen(name)"
 		:before-close="closeDialog"
 		:class="{
 			'dialog-wrapper': true,
@@ -14,13 +14,13 @@
 		:close-on-press-escape="closeOnPressEscape"
 		:style="styles"
 		:append-to-body="appendToBody"
-		:data-test-id="`${this.name}-modal`"
+		:data-test-id="`${name}-modal`"
 		:modal-class="center ? $style.center : ''"
 	>
-		<template #header v-if="$slots.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>
@@ -37,7 +37,7 @@
 			@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>
@@ -134,7 +134,6 @@ export default defineComponent({
 		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) {
@@ -143,7 +142,6 @@ export default defineComponent({
 	},
 	beforeUnmount() {
 		this.eventBus?.off('close', this.closeDialog);
-		this.eventBus?.off('closeAll', this.uiStore.closeAllModals);
 		window.removeEventListener('keydown', this.onWindowKeydown);
 	},
 	computed: {
@@ -227,6 +225,7 @@ export default defineComponent({
 
 	.modal-content {
 		overflow: hidden;
+		overflow-y: auto;
 		flex-grow: 1;
 	}
 
diff --git a/packages/editor-ui/src/components/ModalDrawer.vue b/packages/editor-ui/src/components/ModalDrawer.vue
index 9a9923c17e..468203788b 100644
--- a/packages/editor-ui/src/components/ModalDrawer.vue
+++ b/packages/editor-ui/src/components/ModalDrawer.vue
@@ -1,11 +1,11 @@
 <template>
-	<el-drawer
+	<ElDrawer
 		:direction="direction"
-		:modelValue="uiStore.isModalOpen(this.name)"
+		:model-value="uiStore.isModalOpen(name)"
 		:size="width"
 		:before-close="close"
 		:modal="modal"
-		:wrapperClosable="wrapperClosable"
+		:wrapper-closable="wrapperClosable"
 	>
 		<template #header>
 			<slot name="header" />
@@ -13,7 +13,7 @@
 		<span @keydown.stop>
 			<slot name="content" />
 		</span>
-	</el-drawer>
+	</ElDrawer>
 </template>
 
 <script lang="ts">
diff --git a/packages/editor-ui/src/components/ModalRoot.vue b/packages/editor-ui/src/components/ModalRoot.vue
index de6ea03454..d9ed7f4137 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>
diff --git a/packages/editor-ui/src/components/Modals.vue b/packages/editor-ui/src/components/Modals.vue
index 587c811d90..894a343977 100644
--- a/packages/editor-ui/src/components/Modals.vue
+++ b/packages/editor-ui/src/components/Modals.vue
@@ -2,13 +2,13 @@
 	<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">
@@ -25,7 +25,7 @@
 
 		<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>
 
@@ -37,13 +37,13 @@
 			<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>
 
@@ -65,7 +65,7 @@
 
 		<ModalRoot :name="DELETE_USER_MODAL_KEY">
 			<template #default="{ modalName, activeId }">
-				<DeleteUserModal :modalName="modalName" :activeId="activeId" />
+				<DeleteUserModal :modal-name="modalName" :active-id="activeId" />
 			</template>
 		</ModalRoot>
 
@@ -79,7 +79,7 @@
 
 		<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>
 
@@ -98,8 +98,8 @@
 		<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,35 +108,39 @@
 		<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 :modalName="modalName" :data="data" />
+				<SourceControlPushModal :modal-name="modalName" :data="data" />
 			</template>
 		</ModalRoot>
 
 		<ModalRoot :name="SOURCE_CONTROL_PULL_MODAL_KEY">
 			<template #default="{ modalName, data }">
-				<SourceControlPullModal :modalName="modalName" :data="data" />
+				<SourceControlPullModal :modal-name="modalName" :data="data" />
 			</template>
 		</ModalRoot>
 
 		<ModalRoot :name="EXTERNAL_SECRETS_PROVIDER_MODAL_KEY">
 			<template #default="{ modalName, data }">
-				<ExternalSecretsProviderModal :modalName="modalName" :data="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" :modalName="modalName" :data="data" />
+				<DebugPaywallModal
+					data-test-id="debug-paywall-modal"
+					:modal-name="modalName"
+					:data="data"
+				/>
 			</template>
 		</ModalRoot>
 
@@ -144,7 +148,26 @@
 			<template #default="{ modalName, data }">
 				<WorkflowHistoryVersionRestoreModal
 					data-test-id="workflow-history-version-restore-modal"
-					:modalName="modalName"
+					: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>
@@ -183,6 +206,8 @@ import {
 	DEBUG_PAYWALL_MODAL_KEY,
 	MFA_SETUP_MODAL_KEY,
 	WORKFLOW_HISTORY_VERSION_RESTORE,
+	SUGGESTED_TEMPLATES_PREVIEW_MODAL_KEY,
+	SETUP_CREDENTIALS_MODAL_KEY,
 } from '@/constants';
 
 import AboutModal from './AboutModal.vue';
@@ -214,6 +239,8 @@ 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';
 
 export default defineComponent({
 	name: 'Modals',
@@ -247,6 +274,8 @@ export default defineComponent({
 		DebugPaywallModal,
 		MfaSetupModal,
 		WorkflowHistoryVersionRestoreModal,
+		SuggestedTemplatesPreviewModal,
+		SetupWorkflowCredentialsModal,
 	},
 	data: () => ({
 		CHAT_EMBED_MODAL_KEY,
@@ -277,6 +306,8 @@ export default defineComponent({
 		DEBUG_PAYWALL_MODAL_KEY,
 		MFA_SETUP_MODAL_KEY,
 		WORKFLOW_HISTORY_VERSION_RESTORE,
+		SUGGESTED_TEMPLATES_PREVIEW_MODAL_KEY,
+		SETUP_CREDENTIALS_MODAL_KEY,
 	}),
 });
 </script>
diff --git a/packages/editor-ui/src/components/MultipleParameter.vue b/packages/editor-ui/src/components/MultipleParameter.vue
index 1731b71ffa..abc3361e1e 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"
+					:hide-delete="hideDelete"
+					:is-read-only="isReadOnly"
 					@valueChanged="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)"
+					input-size="small"
+					:is-read-only="isReadOnly"
 					@update="valueChanged"
-					inputSize="small"
-					:isReadOnly="isReadOnly"
 				/>
 			</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();
diff --git a/packages/editor-ui/src/components/NDVDraggablePanels.vue b/packages/editor-ui/src/components/NDVDraggablePanels.vue
index 027e73a01f..26be4016cd 100644
--- a/packages/editor-ui/src/components/NDVDraggablePanels.vue
+++ b/packages/editor-ui/src/components/NDVDraggablePanels.vue
@@ -1,28 +1,34 @@
 <template>
 	<div>
-		<div :class="$style.inputPanel" v-if="!hideInputAndOutput" :style="inputPanelStyles">
+		<NDVFloatingNodes
+			v-if="activeNode"
+			:root-node="activeNode"
+			type="input"
+			@switchSelectedNode="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"
@@ -41,14 +47,16 @@ import { defineComponent } from 'vue';
 import type { PropType } 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 { debounceHelper } from '@/mixins/debounce';
 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;
@@ -66,9 +74,9 @@ const initialMainPanelWidth: { [key: string]: number } = {
 
 export default defineComponent({
 	name: 'NDVDraggablePanels',
-	mixins: [debounceHelper],
 	components: {
 		PanelDragButton,
+		NDVFloatingNodes,
 	},
 	props: {
 		isDraggable: {
@@ -85,6 +93,11 @@ export default defineComponent({
 			default: () => ({}),
 		},
 	},
+	setup() {
+		const { callDebounced } = useDebounce();
+
+		return { callDebounced };
+	},
 	data(): {
 		windowWidth: number;
 		isDragging: boolean;
@@ -135,6 +148,9 @@ export default defineComponent({
 		} {
 			return this.ndvStore.getMainPanelDimensions(this.currentNodePaneType);
 		},
+		activeNode() {
+			return this.ndvStore.activeNode;
+		},
 		supportedResizeDirections(): string[] {
 			const supportedDirections = ['right'];
 
@@ -248,6 +264,9 @@ export default defineComponent({
 		},
 	},
 	methods: {
+		onSwitchSelectedNode(node: string) {
+			this.$emit('switchSelectedNode', node);
+		},
 		getInitialLeftPosition(width: number) {
 			if (this.currentNodePaneType === 'dragless')
 				return this.pxToRelativeWidth(SIDE_MARGIN + 1 + this.fixedPanelWidth);
@@ -328,7 +347,7 @@ export default defineComponent({
 		},
 		onResizeDebounced(data: { direction: string; x: number; width: number }) {
 			if (this.initialized) {
-				void 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 }) {
@@ -345,9 +364,9 @@ export default defineComponent({
 			);
 		},
 		restorePositionData() {
-			const storedPanelWidthData = window.localStorage.getItem(
+			const storedPanelWidthData = useStorage(
 				`${LOCAL_STORAGE_MAIN_PANEL_RELATIVE_WIDTH}_${this.currentNodePaneType}`,
-			);
+			).value;
 
 			if (storedPanelWidthData) {
 				const parsedWidth = parseFloat(storedPanelWidthData);
@@ -360,10 +379,8 @@ export default defineComponent({
 			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;
diff --git a/packages/editor-ui/src/components/NDVFloatingNodes.vue b/packages/editor-ui/src/components/NDVFloatingNodes.vue
new file mode 100644
index 0000000000..0a592b1e71
--- /dev/null
+++ b/packages/editor-ui/src/components/NDVFloatingNodes.vue
@@ -0,0 +1,262 @@
+<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;
+	type: 'input' | 'sub-input' | 'sub-output' | 'output';
+}
+const enum FloatingNodePosition {
+	top = 'outputSub',
+	right = 'outputMain',
+	bottom = 'inputSub',
+	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,
+			ArrowDown: FloatingNodePosition.bottom,
+			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.bottom]: getINodesFromNames(
+			workflow.getParentNodes(rootName, 'ALL_NON_MAIN'),
+		),
+		[FloatingNodePosition.left]: getINodesFromNames(workflow.getParentNodes(rootName, 'main', 1)),
+	};
+});
+
+const connectionGroups = [
+	FloatingNodePosition.top,
+	FloatingNodePosition.right,
+	FloatingNodePosition.bottom,
+	FloatingNodePosition.left,
+];
+const tooltipPositionMapper = {
+	[FloatingNodePosition.top]: 'bottom',
+	[FloatingNodePosition.right]: 'left',
+	[FloatingNodePosition.bottom]: 'top',
+	[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/Node.vue b/packages/editor-ui/src/components/Node.vue
index 91ddec569d..33ef613e39 100644
--- a/packages/editor-ui/src/components/Node.vue
+++ b/packages/editor-ui/src/components/Node.vue
@@ -1,45 +1,49 @@
 <template>
 	<div
+		:id="nodeId"
+		:ref="data.name"
 		:class="nodeWrapperClass"
 		:style="nodeWrapperStyles"
-		:id="nodeId"
 		data-test-id="canvas-node"
-		:ref="data.name"
 		: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" data-test-id="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,29 +51,30 @@
 							<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"
+						:show-after="500"
 						:visible="showTriggerNodeTooltip"
 						popper-class="node-trigger-tooltip__wrapper--item"
 					>
@@ -93,64 +98,38 @@
 
 				<NodeIcon
 					class="node-icon"
-					:nodeType="nodeType"
+					:node-type="nodeType"
 					:size="40"
 					:shrink="false"
-					:colorDefault="iconColorDefault"
-					: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 && !isConfigNode"
+			<div v-if="!isReadOnly" v-show="!hideActions" class="node-options no-select-on-click">
+				<n8n-icon-button
 					data-test-id="execute-node-button"
-				>
-					<font-awesome-icon class="execute-icon" icon="play-circle" />
-				</div>
+					type="tertiary"
+					text
+					icon="play"
+					:disabled="workflowRunning || isConfigNode"
+					:title="$locale.baseText('node.testStep')"
+					@click="executeNode"
+				/>
+				<n8n-icon-button
+					data-test-id="overflow-node-button"
+					type="tertiary"
+					text
+					icon="ellipsis-h"
+					@click="(e: MouseEvent) => openContextMenu(e, 'node-button')"
+				/>
 			</div>
 			<div
+				v-if="showDisabledLinethrough"
 				:class="{
 					'disabled-linethrough': true,
 					success: !['unknown'].includes(nodeExecutionStatus) && workflowDataItems > 0,
 				}"
-				v-if="showDisabledLinethrough"
 			></div>
 		</div>
 		<div class="node-description">
@@ -170,6 +149,7 @@
 <script lang="ts">
 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,
@@ -178,12 +158,8 @@ import {
 	NOT_DUPLICATABE_NODE_TYPES,
 	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 {
 	ConnectionTypes,
 	IExecutionsSummary,
@@ -191,6 +167,7 @@ import type {
 	INodeOutputConfiguration,
 	INodeTypeDescription,
 	ITaskData,
+	NodeOperationError,
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeHelpers } from 'n8n-workflow';
 
@@ -198,34 +175,66 @@ import NodeIcon from '@/components/NodeIcon.vue';
 import TitledList from '@/components/TitledList.vue';
 
 import { get } from 'lodash-es';
-import { getStyleTokenValue, getTriggerNodeServiceName } from '@/utils';
+import { getTriggerNodeServiceName } from '@/utils/nodeTypesUtils';
 import type { INodeUi, XYPosition } from '@/Interface';
-import { debounceHelper } from '@/mixins/debounce';
 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';
+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',
-	mixins: [externalHooks, nodeBase, nodeHelpers, workflowHelpers, pinData, debounceHelper],
 	components: {
 		TitledList,
 		FontAwesomeIcon,
 		NodeIcon,
 	},
+	mixins: [nodeBase, workflowHelpers],
 	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;
@@ -252,7 +261,7 @@ export default defineComponent({
 				['crashed', 'error', 'failed'].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;
 			}
@@ -285,7 +294,7 @@ export default defineComponent({
 			}
 		},
 		isPollingTypeNode(): boolean {
-			return !!(this.nodeType && this.nodeType.polling);
+			return !!this.nodeType?.polling;
 		},
 		isExecuting(): boolean {
 			return this.workflowsStore.isNodeExecuting(this.data.name);
@@ -302,15 +311,11 @@ export default defineComponent({
 			return this.data.type === MANUAL_TRIGGER_NODE_TYPE;
 		},
 		isConfigNode(): boolean {
-			return this.nodeTypesStore.isConfigNode(
-				this.getCurrentWorkflow(),
-				this.data,
-				this.data?.type ?? '',
-			);
+			return this.nodeTypesStore.isConfigNode(this.workflow, this.data, this.data?.type ?? '');
 		},
 		isConfigurableNode(): boolean {
 			return this.nodeTypesStore.isConfigurableNode(
-				this.getCurrentWorkflow(),
+				this.workflow,
 				this.data,
 				this.data?.type ?? '',
 			);
@@ -364,37 +369,39 @@ export default defineComponent({
 				top: this.position[1] + 'px',
 			};
 
-			const workflow = this.workflowsStore.getCurrentWorkflow();
-			const inputs =
-				NodeHelpers.getNodeInputs(workflow, this.node, this.nodeType) ||
-				([] as Array<ConnectionTypes | INodeInputConfiguration>);
-			const inputTypes = NodeHelpers.getConnectionTypes(inputs);
+			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,
-				);
+				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;
+					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;
 				}
 
-				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;
 			}
 
-			const outputs =
-				NodeHelpers.getNodeOutputs(workflow, this.node, this.nodeType) ||
-				([] as Array<ConnectionTypes | INodeOutputConfiguration>);
-
-			const outputTypes = NodeHelpers.getConnectionTypes(outputs);
-
-			const mainOutputs = outputTypes.filter((output) => output === NodeConnectionType.Main);
-			styles['--node-main-output-count'] = mainOutputs.length;
-
 			return styles;
 		},
 		nodeClass(): object {
@@ -407,7 +414,7 @@ export default defineComponent({
 		nodeExecutionStatus(): string {
 			const nodeExecutionRunData = this.workflowsStore.getWorkflowRunData?.[this.name];
 			if (nodeExecutionRunData) {
-				return nodeExecutionRunData[0].executionStatus ?? '';
+				return nodeExecutionRunData.filter(Boolean)[0].executionStatus ?? '';
 			}
 			return '';
 		},
@@ -416,7 +423,7 @@ export default defineComponent({
 			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})` : ''
@@ -441,7 +448,10 @@ export default defineComponent({
 			return this.node ? this.node.position : [0, 0];
 		},
 		showDisabledLinethrough(): boolean {
-			return !!(this.data.disabled && this.inputs.length === 1 && this.outputs.length === 1);
+			return (
+				!this.isConfigurableNode &&
+				!!(this.data.disabled && this.inputs.length === 1 && this.outputs.length === 1)
+			);
 		},
 		shortNodeType(): string {
 			return this.$locale.shortNodeType(this.data.type);
@@ -487,31 +497,37 @@ export default defineComponent({
 				[key: string]: string;
 			} = {};
 
-			let borderColor = getStyleTokenValue('--color-foreground-xdark');
+			let borderColor = '--color-foreground-xdark';
 
 			if (this.isConfigurableNode || this.isConfigNode) {
-				borderColor = getStyleTokenValue('--color-foreground-dark');
+				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');
-					returnStyles['border-width'] = '2px';
-					returnStyles['border-style'] = 'solid';
+				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) {
 					returnStyles['border-width'] = '2px';
 					returnStyles['border-style'] = 'solid';
-					borderColor = getStyleTokenValue('--color-success');
+					borderColor = '--color-success';
 				}
 			}
 
-			returnStyles['border-color'] = borderColor;
+			returnStyles['border-color'] = `var(${borderColor})`;
 
 			return returnStyles;
 		},
@@ -529,7 +545,7 @@ export default defineComponent({
 				!!this.node &&
 				this.isTriggerNode &&
 				!this.isPollingTypeNode &&
-				!this.hasPinData &&
+				!this.pinnedData.hasData.value &&
 				!this.isNodeDisabled &&
 				this.workflowRunning &&
 				this.workflowDataItems === 0 &&
@@ -539,6 +555,13 @@ export default defineComponent({
 				!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
+			);
+		},
 	},
 	watch: {
 		isActive(newValue, oldValue) {
@@ -579,9 +602,7 @@ export default defineComponent({
 		},
 	},
 	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);
@@ -618,11 +639,12 @@ export default defineComponent({
 				!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();
@@ -634,7 +656,7 @@ export default defineComponent({
 			// so we only update it when necessary (when node is mounted and when it's opened and closed (isActive))
 			try {
 				const nodeSubtitle =
-					this.getNodeSubtitle(this.data, this.nodeType, this.getCurrentWorkflow()) || '';
+					this.nodeHelpers.getNodeSubtitle(this.data, this.nodeType, this.workflow) || '';
 
 				this.nodeSubtitle = nodeSubtitle.includes(CUSTOM_API_CALL_KEY) ? '' : nodeSubtitle;
 			} catch (e) {
@@ -643,7 +665,7 @@ export default defineComponent({
 		},
 		disableNode() {
 			if (this.data !== null) {
-				this.disableNodes([this.data]);
+				this.nodeHelpers.disableNodes([this.data]);
 				this.historyStore.pushCommandToUndo(
 					new EnableNodeToggleCommand(
 						this.data.name,
@@ -666,30 +688,9 @@ export default defineComponent({
 				workflow_id: this.workflowsStore.workflowId,
 			});
 		},
-		async deleteNode() {
-			this.$telemetry.track('User clicked node hover button', {
-				node_type: this.data.type,
-				button_name: 'delete',
-				workflow_id: this.workflowsStore.workflowId,
-			});
-
-			// Wait a tick else vue causes problems because the data is gone
-			await this.$nextTick();
-			this.$emit('removeNode', this.data.name);
-		},
-		async duplicateNode() {
-			this.$telemetry.track('User clicked node hover button', {
-				node_type: this.data.type,
-				button_name: 'duplicate',
-				workflow_id: this.workflowsStore.workflowId,
-			});
-			// Wait a tick else vue causes problems because the data is gone
-			await this.$nextTick();
-			this.$emit('duplicateNode', this.data.name);
-		},
 
 		onClick(event: MouseEvent) {
-			void this.callDebounced('onClickDebounced', { debounceTime: 50, trailing: true }, event);
+			void this.callDebounced(this.onClickDebounced, { debounceTime: 50, trailing: true }, event);
 		},
 
 		onClickDebounced(event: MouseEvent) {
@@ -706,18 +707,27 @@ export default defineComponent({
 			this.pinDataDiscoveryTooltipVisible = false;
 		},
 		touchStart() {
-			if (this.isTouchDevice === true && !this.isMacOs && !this.isTouchActive) {
+			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;
 	/*
@@ -773,13 +783,17 @@ export default defineComponent({
 		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: $node-background-default;
+			background-color: var(--color-canvas-node-background);
+			--color-background-node-icon-badge: var(--color-canvas-node-background);
 			&.executing {
 				background-color: $node-background-executing !important;
 
@@ -790,13 +804,11 @@ export default defineComponent({
 		}
 
 		&.touch-active,
-		&:hover {
-			.node-execute {
-				display: initial;
-			}
-
+		&:hover,
+		&.menu-open {
 			.node-options {
-				display: initial;
+				pointer-events: all;
+				opacity: 1;
 			}
 		}
 
@@ -858,19 +870,27 @@ export default defineComponent({
 		}
 
 		.node-options {
-			display: none;
+			--node-options-height: 26px;
+			:deep(.button) {
+				--button-font-color: var(--color-text-light);
+			}
 			position: absolute;
-			top: -25px;
-			left: -10px;
-			width: calc(var(--node-width) + 20px);
-			height: 26px;
-			font-size: 0.9em;
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			gap: var(--spacing-2xs);
+			transition: opacity 100ms ease-in;
+			opacity: 0;
+			pointer-events: none;
+			top: calc(-1 * (var(--node-options-height) + var(--spacing-4xs)));
+			left: 0;
+			width: var(--node-width);
+			height: var(--node-options-height);
+			font-size: var(--font-size-s);
 			z-index: 10;
-			color: #aaa;
 			text-align: center;
 
 			.option {
-				width: 28px;
 				display: inline-block;
 
 				&.touch {
@@ -883,8 +903,7 @@ export default defineComponent({
 
 				.execute-icon {
 					position: relative;
-					top: 2px;
-					font-size: 1.2em;
+					font-size: var(----font-size-xl);
 				}
 			}
 
@@ -915,9 +934,6 @@ export default defineComponent({
 		--node-width: 75px;
 		--node-height: 75px;
 
-		& [class*='node-wrapper--connection-type'] {
-			--configurable-node-options: -10px;
-		}
 		.node-default {
 			.node-options {
 				background: color-mix(in srgb, var(--color-canvas-background) 80%, transparent);
@@ -985,7 +1001,6 @@ export default defineComponent({
 		);
 		--configurable-node-icon-offset: 40px;
 		--configurable-node-icon-size: 30px;
-		--configurable-node-options: -10px;
 
 		.node-description {
 			top: calc(50%);
@@ -1002,6 +1017,9 @@ export default defineComponent({
 						--configurable-node-icon-size
 					) - 2 * var(--spacing-s)
 			);
+			.node-name > p {
+				color: var(--color-configurable-node-name);
+			}
 		}
 
 		.node-default {
@@ -1010,7 +1028,7 @@ export default defineComponent({
 			}
 
 			.node-options {
-				left: var(--configurable-node-options, 65px);
+				left: 0;
 				height: 25px;
 			}
 
@@ -1018,6 +1036,11 @@ export default defineComponent({
 				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 {
@@ -1043,12 +1066,7 @@ export default defineComponent({
 	--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;
@@ -1064,12 +1082,6 @@ export default defineComponent({
 	.node-wrapper--config & {
 		--node--selected--box-shadow-radius: 4px;
 		border-radius: 60px;
-		background-color: hsla(
-			var(--color-foreground-base-h),
-			60%,
-			var(--color-foreground-base-l),
-			80%
-		);
 	}
 }
 
@@ -1167,17 +1179,6 @@ export default defineComponent({
 .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='reverse-arrow'],
-	path[jtk-overlay-id='endpoint-arrow'],
-	path[jtk-overlay-id='midpoint-arrow'] {
-		fill: var(--color-success-light);
-	}
-}
 </style>
 
 <style lang="scss">
@@ -1250,7 +1251,6 @@ export default defineComponent({
 		white-space: nowrap;
 		font-size: var(--font-size-s);
 		font-weight: var(--font-weight-regular);
-		color: var(--color-success);
 		margin-top: -15px;
 
 		&.floating {
@@ -1295,6 +1295,15 @@ export default defineComponent({
 		stroke: var(--color-foreground-xdark);
 	}
 
+	&.error {
+		path {
+			fill: var(--node-error-output-color);
+		}
+		rect {
+			stroke: var(--node-error-output-color);
+		}
+	}
+
 	&.small {
 		margin-left: calc((var(--stalk-size) + var(--plus-endpoint-box-size-small) / 2));
 		g {
@@ -1342,6 +1351,10 @@ export default defineComponent({
 		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;
 	}
@@ -1425,6 +1438,10 @@ export default defineComponent({
 	}
 }
 
+.node-output-endpoint-label.node-connection-category-error {
+	color: var(--node-error-output-color);
+}
+
 .node-output-endpoint-label {
 	margin-left: calc(var(--endpoint-size-small) + var(--spacing-2xs));
 
@@ -1434,9 +1451,9 @@ export default defineComponent({
 		margin-left: 0;
 	}
 
-	// Switch node allows for dynamic connection labels
+	// Some nodes allow for dynamic connection labels
 	// so we need to make sure the label does not overflow
-	&[data-endpoint-node-type='n8n-nodes-base.switch'] {
+	&.node-connection-type-main[data-endpoint-label-length='medium'] {
 		max-width: calc(var(--stalk-size) - (var(--endpoint-size-small)));
 		overflow: hidden;
 		text-overflow: ellipsis;
@@ -1493,7 +1510,8 @@ export default defineComponent({
 .ep-success--without-label {
 	--stalk-size: var(--stalk-success-size-without-label);
 }
-[data-endpoint-node-type='n8n-nodes-base.switch'] {
+
+[data-endpoint-label-length='medium'] {
 	--stalk-size: var(--stalk-switch-size);
 }
 </style>
diff --git a/packages/editor-ui/src/components/Node/NodeCreation.vue b/packages/editor-ui/src/components/Node/NodeCreation.vue
index 106a95b148..bb6af1ef47 100644
--- a/packages/editor-ui/src/components/Node/NodeCreation.vue
+++ b/packages/editor-ui/src/components/Node/NodeCreation.vue
@@ -10,13 +10,14 @@ import {
 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/naming-convention, @typescript-eslint/no-unsafe-assignment
+// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
 const NodeCreator = defineAsyncComponent(
 	async () => import('@/components/Node/NodeCreator/NodeCreator.vue'),
 );
@@ -105,24 +106,31 @@ function nodeTypeSelected(nodeTypes: string[]) {
 			@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, state.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="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>
@@ -165,18 +173,18 @@ function nodeTypeSelected(nodeTypes: string[]) {
 .nodeCreatorButton {
 	position: absolute;
 	text-align: center;
-	top: 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/ItemTypes/ActionItem.vue b/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/ActionItem.vue
index 677af52334..5ff5305403 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/ActionItem.vue
+++ b/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/ActionItem.vue
@@ -1,21 +1,21 @@
 <template>
 	<n8n-node-creator-node
-		@dragstart="onDragStart"
-		@dragend="onDragEnd"
 		draggable
 		:class="$style.action"
 		:title="action.displayName"
-		:isTrigger="isTriggerAction(action)"
+		:is-trigger="isTriggerAction(action)"
 		data-keyboard-nav="true"
+		@dragstart="onDragStart"
+		@dragend="onDragEnd"
 	>
 		<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 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>
-			<node-icon :nodeType="action" />
+			<NodeIcon :node-type="action" />
 		</template>
 	</n8n-node-creator-node>
 </template>
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/CategoryItem.vue b/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/CategoryItem.vue
index 329dbba756..ead3d49232 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/CategoryItem.vue
+++ b/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/CategoryItem.vue
@@ -28,11 +28,11 @@ const categoryName = computed(() => {
 		<div :class="{ [$style.category]: true, [$style.active]: active }">
 			<span :class="$style.name">
 				<span v-text="categoryName" />
-				<font-awesome-icon icon="bolt" v-if="isTrigger" size="xs" :class="$style.triggerIcon" />
+				<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 :class="$style.arrow" icon="chevron-up" v-else />
+			<font-awesome-icon v-else :class="$style.arrow" icon="chevron-up" />
 		</div>
 	</div>
 </template>
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/NodeItem.vue b/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/NodeItem.vue
index 951e8969c8..caf8e429c2 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/NodeItem.vue
+++ b/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/NodeItem.vue
@@ -2,23 +2,24 @@
 	<!-- Node Item is draggable only if it doesn't contain actions -->
 	<n8n-node-creator-node
 		:draggable="!showActionArrow"
-		@dragstart="onDragStart"
-		@dragend="onDragEnd"
 		:class="$style.nodeItem"
-		:description="subcategory !== DEFAULT_SUBCATEGORY ? description : ''"
+		:description="description"
 		:title="displayName"
 		:show-action-arrow="showActionArrow"
 		:is-trigger="isTrigger"
 		:data-test-id="dataTestId"
+		@dragstart="onDragStart"
+		@dragend="onDragEnd"
 	>
 		<template #icon>
-			<div v-if="isSubNode" :class="$style.subNodeBackground"></div>
-			<node-icon :class="$style.nodeIcon" :nodeType="nodeType" />
+			<div v-if="isSubNodeType" :class="$style.subNodeBackground"></div>
+			<NodeIcon :class="$style.nodeIcon" :node-type="nodeType" />
 		</template>
 
-		<template #tooltip v-if="isCommunityNode">
+		<template v-if="isCommunityNode" #tooltip>
 			<p
 				:class="$style.communityNodeIcon"
+				@click="onCommunityNodeTooltipClick"
 				v-html="
 					i18n.baseText('generic.communityNode.tooltip', {
 						interpolate: {
@@ -27,13 +28,12 @@
 						},
 					})
 				"
-				@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 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>
@@ -44,18 +44,20 @@ 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';
+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, useTelemetry } from '@/composables';
-import { NodeHelpers, NodeConnectionType } from 'n8n-workflow';
+import { useI18n } from '@/composables/useI18n';
+import { useTelemetry } from '@/composables/useTelemetry';
+import { useNodeType } from '@/composables/useNodeType';
 
 export interface Props {
 	nodeType: SimplifiedNodeType;
@@ -72,12 +74,22 @@ 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,
@@ -106,7 +118,7 @@ const draggableStyle = computed<{ top: string; left: string }>(() => ({
 
 const isCommunityNode = computed<boolean>(() => isCommunityPackageName(props.nodeType.name));
 
-const displayName = computed<any>(() => {
+const displayName = computed<string>(() => {
 	const displayName = props.nodeType.displayName.trimEnd();
 
 	return i18n.headerText({
@@ -115,16 +127,6 @@ const displayName = computed<any>(() => {
 	});
 });
 
-const isSubNode = computed<boolean>(() => {
-	if (!props.nodeType.outputs || typeof props.nodeType.outputs === 'string') {
-		return false;
-	}
-	const outputTypes = NodeHelpers.getConnectionTypes(props.nodeType.outputs);
-	return outputTypes
-		? outputTypes.filter((output) => output !== NodeConnectionType.Main).length > 0
-		: false;
-});
-
 const isTrigger = computed<boolean>(() => {
 	return props.nodeType.group.includes('trigger') && !hasActions.value;
 });
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/SubcategoryItem.vue b/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/SubcategoryItem.vue
index a1279e5bbb..4be5b146d1 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/SubcategoryItem.vue
+++ b/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/SubcategoryItem.vue
@@ -2,16 +2,16 @@
 	<n8n-node-creator-node
 		:class="$style.subCategory"
 		:title="i18n.baseText(`nodeCreator.subcategoryNames.${subcategoryName}`)"
-		:isTrigger="false"
+		:is-trigger="false"
 		:description="i18n.baseText(`nodeCreator.subcategoryDescriptions.${subcategoryName}`)"
-		:showActionArrow="true"
+		:show-action-arrow="true"
 	>
 		<template #icon>
 			<n8n-node-icon
 				type="icon"
 				:name="item.icon"
 				:circle="false"
-				:showTooltip="false"
+				:show-tooltip="false"
 				v-bind="item.iconProps"
 			/>
 		</template>
@@ -22,7 +22,7 @@
 import type { SubcategoryItemProps } from '@/Interface';
 import { camelCase } from 'lodash-es';
 import { computed } from 'vue';
-import { useI18n } from '@/composables';
+import { useI18n } from '@/composables/useI18n';
 
 export interface Props {
 	item: SubcategoryItemProps;
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/ViewItem.vue b/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/ViewItem.vue
index 98fde73d25..ee9edaad11 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/ViewItem.vue
+++ b/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/ViewItem.vue
@@ -2,12 +2,13 @@
 	<n8n-node-creator-node
 		:class="$style.view"
 		:title="view.title"
-		:isTrigger="false"
+		:tag="view.tag"
+		:is-trigger="false"
 		:description="view.description"
-		:showActionArrow="true"
+		:show-action-arrow="true"
 	>
 		<template #icon>
-			<n8n-node-icon type="icon" :name="view.icon" :circle="false" :showTooltip="false" />
+			<n8n-node-icon type="icon" :name="view.icon" :circle="false" :show-tooltip="false" />
 		</template>
 	</n8n-node-creator-node>
 </template>
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/Modes/ActionsMode.vue b/packages/editor-ui/src/components/Node/NodeCreator/Modes/ActionsMode.vue
index 10de4d1375..e6e7381369 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/Modes/ActionsMode.vue
+++ b/packages/editor-ui/src/components/Node/NodeCreator/Modes/ActionsMode.vue
@@ -16,8 +16,7 @@ import {
 } from '@/constants';
 
 import { useUsersStore } from '@/stores/users.store';
-import { useWebhooksStore } from '@/stores/webhooks.store';
-import { runExternalHook } from '@/utils';
+import { useExternalHooks } from '@/composables/useExternalHooks';
 
 import { useActions } from '../composables/useActions';
 import { useKeyboardNavigation } from '../composables/useKeyboardNavigation';
@@ -104,7 +103,7 @@ const containsAPIAction = computed(() => {
 		return ((p as ActionCreateElement).properties.actionKey ?? '') === CUSTOM_API_CALL_KEY;
 	});
 
-	return result === true;
+	return result;
 });
 
 const isTriggerRootView = computed(() => rootView.value === TRIGGER_NODE_CREATOR_VIEW);
@@ -171,7 +170,7 @@ function trackActionsView() {
 		trigger_action_count,
 	};
 
-	void runExternalHook('nodeCreateList.onViewActions', useWebhooksStore(), trackingPayload);
+	void useExternalHooks().run('nodeCreateList.onViewActions', trackingPayload);
 	telemetry?.trackNodesPanel('nodeCreateList.onViewActions', trackingPayload);
 }
 
@@ -192,7 +191,7 @@ function addHttpNode() {
 	if (telemetry) setAddedNodeActionParameters(updateData);
 
 	const app_identifier = actions.value[0].key;
-	void runExternalHook('nodeCreateList.onActionsCustmAPIClicked', useWebhooksStore(), {
+	void useExternalHooks().run('nodeCreateList.onActionsCustmAPIClicked', {
 		app_identifier,
 	});
 	telemetry?.trackNodesPanel('nodeCreateList.onActionsCustmAPIClicked', { app_identifier });
@@ -224,19 +223,19 @@ onMounted(() => {
 
 <template>
 	<div :class="$style.container">
-		<OrderSwitcher :rootView="rootView">
-			<template #triggers v-if="isTriggerRootView || parsedTriggerActionsBaseline.length !== 0">
+		<OrderSwitcher :root-view="rootView">
+			<template v-if="isTriggerRootView || parsedTriggerActionsBaseline.length !== 0" #triggers>
 				<!-- Triggers Category -->
 				<CategorizedItemsRenderer
 					:elements="parsedTriggerActions"
 					:category="triggerCategoryName"
-					:mouseOverTooltip="$locale.baseText('nodeCreator.actionsTooltip.triggersStartWorkflow')"
-					isTriggerCategory
+					:mouse-over-tooltip="$locale.baseText('nodeCreator.actionsTooltip.triggersStartWorkflow')"
+					is-trigger-category
 					:expanded="isTriggerRootView || parsedActionActions.length === 0"
 					@selected="onSelected"
 				>
 					<!-- Empty state -->
-					<template #empty v-if="hasNoTriggerActions">
+					<template v-if="hasNoTriggerActions" #empty>
 						<n8n-callout
 							v-if="hasNoTriggerActions"
 							theme="info"
@@ -252,30 +251,30 @@ onMounted(() => {
 								"
 							/>
 						</n8n-callout>
-						<ItemsRenderer @selected="onSelected" :elements="placeholderTriggerActions" />
+						<ItemsRenderer :elements="placeholderTriggerActions" @selected="onSelected" />
 					</template>
-					<template #empty v-else>
+					<template v-else #empty>
 						<p
 							:class="$style.resetSearch"
-							v-html="$locale.baseText('nodeCreator.actionsCategory.noMatchingTriggers')"
 							@click="resetSearch"
+							v-html="$locale.baseText('nodeCreator.actionsCategory.noMatchingTriggers')"
 						/>
 					</template>
 				</CategorizedItemsRenderer>
 			</template>
-			<template #actions v-if="!isTriggerRootView || parsedActionActionsBaseline.length !== 0">
+			<template v-if="!isTriggerRootView || parsedActionActionsBaseline.length !== 0" #actions>
 				<!-- Actions Category -->
 				<CategorizedItemsRenderer
 					:elements="parsedActionActions"
 					:category="actionsCategoryLocales.actions"
-					:mouseOverTooltip="$locale.baseText('nodeCreator.actionsTooltip.actionsPerformStep')"
+					:mouse-over-tooltip="$locale.baseText('nodeCreator.actionsTooltip.actionsPerformStep')"
 					:expanded="!isTriggerRootView || parsedTriggerActions.length === 0"
 					@selected="onSelected"
 				>
 					<n8n-callout
+						v-if="!userActivated && isTriggerRootView"
 						theme="info"
 						iconless
-						v-if="!userActivated && isTriggerRootView"
 						slim
 						data-test-id="actions-panel-activation-callout"
 					>
@@ -283,7 +282,7 @@ onMounted(() => {
 					</n8n-callout>
 					<!-- Empty state -->
 					<template #empty>
-						<n8n-info-tip theme="info" type="note" v-if="!search" :class="$style.actionsEmpty">
+						<n8n-info-tip v-if="!search" theme="info" type="note" :class="$style.actionsEmpty">
 							<span
 								v-html="
 									$locale.baseText('nodeCreator.actionsCallout.noActionItems', {
@@ -295,15 +294,15 @@ onMounted(() => {
 						<p
 							v-else
 							:class="$style.resetSearch"
-							v-html="$locale.baseText('nodeCreator.actionsCategory.noMatchingActions')"
-							@click="resetSearch"
 							data-test-id="actions-panel-no-matching-actions"
+							@click="resetSearch"
+							v-html="$locale.baseText('nodeCreator.actionsCategory.noMatchingActions')"
 						/>
 					</template>
 				</CategorizedItemsRenderer>
 			</template>
 		</OrderSwitcher>
-		<div :class="$style.apiHint" v-if="containsAPIAction">
+		<div v-if="containsAPIAction" :class="$style.apiHint">
 			<span
 				@click.prevent="addHttpNode"
 				v-html="
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/Modes/NodesMode.vue b/packages/editor-ui/src/components/Node/NodeCreator/Modes/NodesMode.vue
index 164253bd59..bd38c4fcb2 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/Modes/NodesMode.vue
+++ b/packages/editor-ui/src/components/Node/NodeCreator/Modes/NodesMode.vue
@@ -16,13 +16,14 @@ import { useRootStore } from '@/stores/n8nRoot.store';
 import { useNodeCreatorStore } from '@/stores/nodeCreator.store';
 
 import { TriggerView, RegularView, AIView, AINodesView } from '../viewsData';
-import { transformNodeType } from '../utils';
+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, useTelemetry } from '@/composables';
+import { useI18n } from '@/composables/useI18n';
+import { useTelemetry } from '@/composables/useTelemetry';
 
 export interface Props {
 	rootView: 'trigger' | 'action';
@@ -70,6 +71,7 @@ function onSelected(item: INodeCreateElement) {
 			forceIncludeNodes: item.properties.forceIncludeNodes,
 			baseFilter: baseSubcategoriesFilter,
 			itemsMapper: subcategoriesMapper,
+			sections: item.properties.sections,
 		});
 
 		telemetry.trackNodesPanel('nodeCreateList.onSubcategorySelected', {
@@ -159,7 +161,8 @@ function subcategoriesMapper(item: INodeCreateElement) {
 	return item;
 }
 
-function baseSubcategoriesFilter(item: INodeCreateElement) {
+function baseSubcategoriesFilter(item: INodeCreateElement): boolean {
+	if (item.type === 'section') return true;
 	if (item.type !== 'node') return false;
 
 	const hasTriggerGroup = item.properties.group.includes('trigger');
@@ -179,10 +182,10 @@ function arrowLeft() {
 }
 
 function onKeySelect(activeItemId: string) {
-	const mergedItems = [
-		...(activeViewStack.value.items || []),
-		...(globalSearchItemsDiff.value || []),
-	];
+	const mergedItems = flattenCreateElements([
+		...(activeViewStack.value.items ?? []),
+		...(globalSearchItemsDiff.value ?? []),
+	]);
 
 	const item = mergedItems.find((i) => i.uuid === activeItemId);
 	if (!item) return;
@@ -206,15 +209,15 @@ registerKeyHook('MainViewArrowLeft', {
 <template>
 	<span>
 		<!-- Main Node Items -->
-		<ItemsRenderer :elements="activeViewStack.items" @selected="onSelected" :class="$style.items">
+		<ItemsRenderer :elements="activeViewStack.items" :class="$style.items" @selected="onSelected">
 			<template
-				#empty
 				v-if="(activeViewStack.items || []).length === 0 && globalSearchItemsDiff.length === 0"
+				#empty
 			>
 				<NoResults
-					:rootView="activeViewStack.rootView"
-					showIcon
-					showRequest
+					:root-view="activeViewStack.rootView"
+					show-icon
+					show-request
 					@addWebhookNode="selectNodeType([WEBHOOK_NODE_TYPE])"
 					@addHttpNode="selectNodeType([HTTP_REQUEST_NODE_TYPE])"
 				/>
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/NodeCreator.vue b/packages/editor-ui/src/components/Node/NodeCreator/NodeCreator.vue
index 6b72ef4ecc..756a2be48c 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/NodeCreator.vue
+++ b/packages/editor-ui/src/components/Node/NodeCreator/NodeCreator.vue
@@ -1,21 +1,21 @@
 <template>
 	<div>
 		<aside :class="{ [$style.nodeCreatorScrim]: true, [$style.active]: showScrim }" />
-		<slide-transition>
+		<SlideTransition>
 			<div
 				v-if="active"
+				ref="nodeCreator"
 				:class="$style.nodeCreator"
 				:style="nodeCreatorInlineStyle"
-				ref="nodeCreator"
+				data-test-id="node-creator"
 				@dragover="onDragOver"
 				@drop="onDrop"
 				@mousedown="onMouseDown"
 				@mouseup="onMouseUp"
-				data-test-id="node-creator"
 			>
 				<NodesListPanel @nodeTypeSelected="onNodeTypeSelected" />
 			</div>
-		</slide-transition>
+		</SlideTransition>
 	</div>
 </template>
 
@@ -30,7 +30,8 @@ import { useViewStacks } from './composables/useViewStacks';
 import { useKeyboardNavigation } from './composables/useKeyboardNavigation';
 import { useActionsGenerator } from './composables/useActionsGeneration';
 import NodesListPanel from './Panel/NodesListPanel.vue';
-import { useUIStore } from '@/stores';
+import { useCredentialsStore } from '@/stores/credentials.store';
+import { useUIStore } from '@/stores/ui.store';
 import { DRAG_EVENT_DATA_KEY } from '@/constants';
 
 export interface Props {
@@ -110,7 +111,7 @@ function onDrop(event: DragEvent) {
 watch(
 	() => props.active,
 	(isActive) => {
-		if (isActive === false) {
+		if (!isActive) {
 			setShowScrim(false);
 			resetViewStacks();
 		}
@@ -135,9 +136,12 @@ registerKeyHook('NodeCreatorCloseTab', {
 });
 
 watch(
-	() => useNodeTypesStore().visibleNodeTypes,
-	(nodeTypes) => {
-		const { actions, mergedNodes } = generateMergedNodesAndActions(nodeTypes);
+	() => ({
+		httpOnlyCredentials: useCredentialsStore().httpOnlyCredentialTypes,
+		nodeTypes: useNodeTypesStore().visibleNodeTypes,
+	}),
+	({ nodeTypes, httpOnlyCredentials }) => {
+		const { actions, mergedNodes } = generateMergedNodesAndActions(nodeTypes, httpOnlyCredentials);
 
 		setActions(actions);
 		setMergeNodes(mergedNodes);
@@ -174,7 +178,7 @@ onBeforeUnmount(() => {
 	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/Panel/NoResults.vue b/packages/editor-ui/src/components/Node/NodeCreator/Panel/NoResults.vue
index d2a30e0e5f..2f149eae56 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/Panel/NoResults.vue
+++ b/packages/editor-ui/src/components/Node/NodeCreator/Panel/NoResults.vue
@@ -3,8 +3,8 @@
 		:class="{ [$style.noResults]: true, [$style.iconless]: !showIcon }"
 		data-test-id="node-creator-no-results"
 	>
-		<div :class="$style.icon" v-if="showIcon">
-			<no-results-icon />
+		<div v-if="showIcon" :class="$style.icon">
+			<NoResultsIcon />
 		</div>
 		<div :class="$style.title">
 			<slot name="title" />
@@ -22,7 +22,7 @@
 			</div>
 		</div>
 
-		<div :class="$style.request" v-if="showRequest">
+		<div v-if="showRequest" :class="$style.request">
 			<p v-text="$locale.baseText('nodeCreator.noResults.wantUsToMakeItFaster')" />
 			<div>
 				<n8n-link :to="REQUEST_NODE_FORM_URL">
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/Panel/NoResultsIcon.vue b/packages/editor-ui/src/components/Node/NodeCreator/Panel/NoResultsIcon.vue
index 7dc9e10d57..a0d52867e1 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/Panel/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
index fa01cf3fcf..fe22bf8e4c 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/Panel/NodesListPanel.vue
+++ b/packages/editor-ui/src/components/Node/NodeCreator/Panel/NodesListPanel.vue
@@ -16,7 +16,7 @@ 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';
+import { useI18n } from '@/composables/useI18n';
 
 const i18n = useI18n();
 
@@ -39,22 +39,36 @@ const searchPlaceholder = computed(() =>
 
 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(activeViewStack.value.activeIndex ?? 0);
+		void setActiveItemIndex(getDefaultActiveIndex(value));
 	}
 }
 
 function onTransitionEnd() {
-	// For actions, set the active focus to the first action, not category
-	const newStackIndex = activeViewStack.value.mode === 'actions' ? 1 : 0;
-	void setActiveItemIndex(activeViewStack.value.activeIndex || 0 || newStackIndex);
+	void setActiveItemIndex(getDefaultActiveIndex());
 }
 
 onMounted(() => {
 	attachKeydownEvent();
-	void setActiveItemIndex(activeViewStack.value.activeIndex ?? 0);
+	void setActiveItemIndex(getDefaultActiveIndex());
 });
 
 onUnmounted(() => {
@@ -107,9 +121,9 @@ function onBackButton() {
 		@afterLeave="onTransitionEnd"
 	>
 		<aside
+			:key="`${activeViewStack.uuid}`"
 			:class="[$style.nodesListPanel, activeViewStack.panelClass]"
 			@keydown.capture.stop
-			:key="`${activeViewStack.uuid}`"
 		>
 			<header
 				:class="{
@@ -121,9 +135,9 @@ function onBackButton() {
 			>
 				<div :class="$style.top">
 					<button
+						v-if="viewStacks.length > 1 && !activeViewStack.preventBack"
 						:class="$style.backButton"
 						@click="onBackButton"
-						v-if="viewStacks.length > 1 && !activeViewStack.preventBack"
 					>
 						<font-awesome-icon :class="$style.backButtonIcon" icon="arrow-left" size="2x" />
 					</button>
@@ -135,10 +149,10 @@ function onBackButton() {
 						:name="activeViewStack.nodeIcon.icon"
 						:color="activeViewStack.nodeIcon.color"
 						:circle="false"
-						:showTooltip="false"
+						:show-tooltip="false"
 						:size="20"
 					/>
-					<p :class="$style.title" v-text="activeViewStack.title" v-if="activeViewStack.title" />
+					<p v-if="activeViewStack.title" :class="$style.title" v-text="activeViewStack.title" />
 				</div>
 				<p
 					v-if="activeViewStack.subtitle"
@@ -146,7 +160,7 @@ function onBackButton() {
 					v-text="activeViewStack.subtitle"
 				/>
 			</header>
-			<search-bar
+			<SearchBar
 				v-if="activeViewStack.hasSearch"
 				:class="$style.searchBar"
 				:placeholder="
@@ -154,7 +168,7 @@ function onBackButton() {
 						? searchPlaceholder
 						: $locale.baseText('nodeCreator.searchBar.searchNodes')
 				"
-				:modelValue="activeViewStack.search"
+				:model-value="activeViewStack.search"
 				@update:modelValue="onSearch"
 			/>
 			<div :class="$style.renderedItems">
@@ -162,13 +176,13 @@ function onBackButton() {
 					v-if="activeViewStack.info && !activeViewStack.search"
 					:class="$style.info"
 					:content="activeViewStack.info"
-					theme="info"
+					theme="warning"
 				/>
 				<!-- Actions mode -->
 				<ActionsRenderer v-if="isActionsMode && activeViewStack.subcategory" v-bind="$attrs" />
 
 				<!-- Nodes Mode -->
-				<NodesRenderer v-else :rootView="nodeCreatorView" v-bind="$attrs" />
+				<NodesRenderer v-else :root-view="nodeCreatorView" v-bind="$attrs" />
 			</div>
 		</aside>
 	</transition>
@@ -235,6 +249,7 @@ function onBackButton() {
 	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;
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/Panel/SearchBar.vue b/packages/editor-ui/src/components/Node/NodeCreator/Panel/SearchBar.vue
index 003bc48f26..6f2bc8637e 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/Panel/SearchBar.vue
+++ b/packages/editor-ui/src/components/Node/NodeCreator/Panel/SearchBar.vue
@@ -5,17 +5,17 @@
 		</div>
 		<div :class="$style.text">
 			<input
+				ref="inputRef"
 				:placeholder="placeholder"
 				: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="modelValue.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,8 +25,7 @@
 
 <script setup lang="ts">
 import { onMounted, reactive, toRefs, onBeforeUnmount } from 'vue';
-import { useWebhooksStore } from '@/stores/webhooks.store';
-import { runExternalHook } from '@/utils';
+import { useExternalHooks } from '@/composables/useExternalHooks';
 
 export interface Props {
 	placeholder: string;
@@ -46,6 +45,8 @@ const state = reactive({
 	inputRef: null as HTMLInputElement | null,
 });
 
+const externalHooks = useExternalHooks();
+
 function focus() {
 	state.inputRef?.focus();
 }
@@ -60,9 +61,7 @@ function clear() {
 }
 
 onMounted(() => {
-	void runExternalHook('nodeCreator_searchBar.mount', useWebhooksStore(), {
-		inputRef: state.inputRef,
-	});
+	void externalHooks.run('nodeCreatorSearchBar.mount', { inputRef: state.inputRef });
 	setTimeout(focus, 0);
 });
 
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/Renderers/CategorizedItemsRenderer.vue b/packages/editor-ui/src/components/Node/NodeCreator/Renderers/CategorizedItemsRenderer.vue
index 503ee6f54f..ea24e940ea 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/Renderers/CategorizedItemsRenderer.vue
+++ b/packages/editor-ui/src/components/Node/NodeCreator/Renderers/CategorizedItemsRenderer.vue
@@ -97,12 +97,12 @@ registerKeyHook(`CategoryLeft_${props.category}`, {
 			:active="activeItemId === category"
 			:count="actionCount"
 			:expanded="expanded"
-			:isTrigger="isTriggerCategory"
+			:is-trigger="isTriggerCategory"
 			data-keyboard-nav-type="category"
 			:data-keyboard-nav-id="category"
 			@click="toggleExpanded"
 		>
-			<span :class="$style.mouseOverTooltip" v-if="mouseOverTooltip">
+			<span v-if="mouseOverTooltip" :class="$style.mouseOverTooltip">
 				<n8n-tooltip placement="top" :popper-class="$style.tooltipPopper">
 					<n8n-icon icon="question-circle" size="small" />
 					<template #content>
@@ -111,7 +111,7 @@ registerKeyHook(`CategoryLeft_${props.category}`, {
 				</n8n-tooltip>
 			</span>
 		</CategoryItem>
-		<div :class="$style.contentSlot" v-if="expanded && actionCount > 0 && $slots.default">
+		<div v-if="expanded && actionCount > 0 && $slots.default" :class="$style.contentSlot">
 			<slot />
 		</div>
 		<!-- Pass through listeners & empty slot to ItemsRenderer -->
@@ -119,7 +119,7 @@ registerKeyHook(`CategoryLeft_${props.category}`, {
 			v-if="expanded"
 			v-bind="$attrs"
 			:elements="elements"
-			:isTrigger="isTriggerCategory"
+			:is-trigger="isTriggerCategory"
 		>
 			<template #default> </template>
 			<template #empty>
@@ -133,6 +133,7 @@ registerKeyHook(`CategoryLeft_${props.category}`, {
 .mouseOverTooltip {
 	opacity: 0;
 	margin-left: var(--spacing-3xs);
+	color: var(--color-foreground-xdark);
 	&:hover {
 		color: var(--color-primary);
 	}
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/Renderers/ItemsRenderer.vue b/packages/editor-ui/src/components/Node/NodeCreator/Renderers/ItemsRenderer.vue
index 72743a34c0..abcc29d78d 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/Renderers/ItemsRenderer.vue
+++ b/packages/editor-ui/src/components/Node/NodeCreator/Renderers/ItemsRenderer.vue
@@ -8,6 +8,8 @@ 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;
@@ -59,7 +61,7 @@ function wrappedEmit(
 ) {
 	if (props.disabled) return;
 
-	emit((event as 'selected') || 'dragstart' || 'dragend', element, $e);
+	emit(event, element, $e);
 }
 
 function beforeEnter(el: HTMLElement) {
@@ -110,50 +112,59 @@ watch(
 		@leave="leave"
 	>
 		<slot />
-		<div
-			v-for="item in elements"
-			:key="item.uuid"
-			data-test-id="item-iterator-item"
-			:class="{
-				clickable: !disabled,
-				[$style.active]: activeItemId === item.uuid,
-				[$style.iteratorItem]: true,
-				[$style[item.type]]: true,
-			}"
-			ref="iteratorItems"
-			:data-keyboard-nav-type="item.type !== 'label' ? item.type : undefined"
-			:data-keyboard-nav-id="item.uuid"
-			@click="wrappedEmit('selected', item)"
-		>
+		<div v-for="item in elements" :key="item.uuid">
 			<div v-if="renderedItems.includes(item)">
-				<label-item v-if="item.type === 'label'" :item="item" />
-				<subcategory-item v-if="item.type === 'subcategory'" :item="item.properties" />
+				<CategorizedItemsRenderer
+					v-if="item.type === 'section'"
+					:elements="item.children"
+					expanded
+					:category="item.title"
+					@selected="(child) => wrappedEmit('selected', child)"
+				>
+				</CategorizedItemsRenderer>
 
-				<node-item
-					v-if="item.type === 'node'"
-					:nodeType="item.properties"
-					:active="true"
-					:subcategory="item.subcategory"
-				/>
+				<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" />
 
-				<action-item
-					v-if="item.type === 'action'"
-					:nodeType="item.properties"
-					:action="item.properties"
-					:active="true"
-				/>
+					<NodeItem
+						v-if="item.type === 'node'"
+						:node-type="item.properties"
+						:active="true"
+						:subcategory="item.subcategory"
+					/>
 
-				<view-item
-					v-else-if="item.type === 'view'"
-					:view="item.properties"
-					:class="$style.viewItem"
-				/>
+					<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 :loading="true" :rows="1" variant="p" :class="$style.itemSkeleton" v-else />
+			<n8n-loading v-else :loading="true" :rows="1" variant="p" :class="$style.itemSkeleton" />
 		</div>
 	</div>
-	<div :class="$style.empty" v-else>
+	<div v-else :class="$style.empty">
 		<slot name="empty" />
 	</div>
 </template>
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
index 27c9516588..e799015503 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/__tests__/ItemsRenderer.test.ts
+++ b/packages/editor-ui/src/components/Node/NodeCreator/__tests__/ItemsRenderer.test.ts
@@ -5,10 +5,11 @@ import {
 	mockSubcategoryCreateElement,
 	mockLabelCreateElement,
 	mockNodeCreateElement,
+	mockActionCreateElement,
+	mockViewCreateElement,
+	mockSectionCreateElement,
 } from './utils';
 import ItemsRenderer from '../Renderers/ItemsRenderer.vue';
-import { mockActionCreateElement } from './utils';
-import { mockViewCreateElement } from './utils';
 import { createComponentRenderer } from '@/__tests__/render';
 
 const renderComponent = createComponentRenderer(ItemsRenderer);
@@ -18,13 +19,29 @@ describe('ItemsRenderer', () => {
 		const items = [
 			mockSubcategoryCreateElement({ title: 'Subcategory 1' }),
 			mockLabelCreateElement('subcategory', { key: 'label1' }),
-			mockNodeCreateElement('subcategory', { displayName: 'Node 1', name: 'node1' }),
-			mockNodeCreateElement('subcategory', { displayName: 'Node 2', name: 'node2' }),
-			mockNodeCreateElement('subcategory', { displayName: 'Node 3', name: 'node3' }),
+			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', { displayName: 'Node 2', name: 'node2' }),
-			mockNodeCreateElement('subcategory', { displayName: 'Node 3', name: 'node3' }),
+			mockNodeCreateElement(
+				{ subcategory: 'subcategory' },
+				{ displayName: 'Node 2', name: 'node2' },
+			),
+			mockNodeCreateElement(
+				{ subcategory: 'subcategory' },
+				{ displayName: 'Node 3', name: 'node3' },
+			),
 			mockSubcategoryCreateElement({ title: 'Subcategory 2' }),
+			mockSectionCreateElement(),
 		];
 
 		const { container } = renderComponent({
@@ -40,8 +57,10 @@ describe('ItemsRenderer', () => {
 		const nodeItems = container.querySelectorAll('.iteratorItem .nodeItem');
 		const labels = container.querySelectorAll('.iteratorItem .label');
 		const subCategories = container.querySelectorAll('.iteratorItem .subCategory');
+		const sections = container.querySelectorAll('.categoryItem');
 
-		expect(nodeItems.length).toBe(5);
+		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);
 	});
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
index 408927bab3..3c36faa611 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/__tests__/NodesListPanel.test.ts
+++ b/packages/editor-ui/src/components/Node/NodeCreator/__tests__/NodesListPanel.test.ts
@@ -12,15 +12,15 @@ import { createComponentRenderer } from '@/__tests__/render';
 
 function getWrapperComponent(setup: () => void) {
 	const wrapperComponent = defineComponent({
+		components: {
+			NodesListPanel,
+		},
 		props: {
 			nodeTypes: {
 				type: Array as PropType<INodeTypeDescription[]>,
 				required: false,
 			},
 		},
-		components: {
-			NodesListPanel,
-		},
 		setup,
 		template: '<NodesListPanel @nodeTypeSelected="e => $emit(\'nodeTypeSelected\', e)" />',
 	});
@@ -89,6 +89,9 @@ describe('NodesListPanel', () => {
 			);
 
 			const wrapperComponent = defineComponent({
+				components: {
+					NodesListPanel,
+				},
 				props: {
 					nodeTypes: {
 						type: Array as PropType<INodeTypeDescription[]>,
@@ -100,9 +103,6 @@ describe('NodesListPanel', () => {
 						required: false,
 					},
 				},
-				components: {
-					NodesListPanel,
-				},
 				setup(props) {
 					const { setActions, setMergeNodes, setSelectedView } = useNodeCreatorStore();
 
@@ -156,15 +156,15 @@ describe('NodesListPanel', () => {
 		);
 
 		const wrapperComponent = defineComponent({
+			components: {
+				NodesListPanel,
+			},
 			props: {
 				nodeTypes: {
 					type: Array as PropType<INodeTypeDescription[]>,
 					required: true,
 				},
 			},
-			components: {
-				NodesListPanel,
-			},
 			setup(props) {
 				const { setMergeNodes } = useNodeCreatorStore();
 
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
index 105d4443a4..b53190db39 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/__tests__/useKeyboardNavigation.test.ts
+++ b/packages/editor-ui/src/components/Node/NodeCreator/__tests__/useKeyboardNavigation.test.ts
@@ -21,6 +21,9 @@ describe('useKeyboardNavigation', () => {
 
 			return { attachKeydownEvent, detachKeydownEvent, setActiveItemId, activeItemId };
 		},
+		mounted() {
+			this.attachKeydownEvent();
+		},
 		template: `
 			<span>
 				<div
@@ -33,9 +36,6 @@ describe('useKeyboardNavigation', () => {
 				/>
 			</span>
 		`,
-		mounted() {
-			this.attachKeydownEvent();
-		},
 	});
 
 	const renderComponent = createComponentRenderer(TestComponent, {
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 0000000000..6f7b45cc5c
--- /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
index 0acb65fa7d..f847021868 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/__tests__/utils.ts
+++ b/packages/editor-ui/src/components/Node/NodeCreator/__tests__/utils.ts
@@ -9,6 +9,7 @@ import type {
 	ViewCreateElement,
 	LabelCreateElement,
 	ActionCreateElement,
+	SectionCreateElement,
 } from '@/Interface';
 import { v4 as uuidv4 } from 'uuid';
 
@@ -74,14 +75,15 @@ const mockLabelItemProps = (overrides?: Partial<LabelItemProps>): LabelItemProps
 });
 
 export const mockNodeCreateElement = (
-	subcategory?: string,
-	overrides?: Partial<SimplifiedNodeType>,
+	overrides?: Partial<NodeCreateElement>,
+	nodeTypeOverrides?: Partial<SimplifiedNodeType>,
 ): NodeCreateElement => ({
 	uuid: uuidv4(),
 	key: uuidv4(),
 	type: 'node',
-	subcategory: subcategory || 'sampleSubcategory',
-	properties: mockSimplifiedNodeType(overrides),
+	subcategory: 'sampleSubcategory',
+	properties: mockSimplifiedNodeType(nodeTypeOverrides),
+	...overrides,
 });
 
 export const mockSubcategoryCreateElement = (
@@ -93,6 +95,17 @@ export const mockSubcategoryCreateElement = (
 	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 => ({
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/composables/useActions.ts b/packages/editor-ui/src/components/Node/NodeCreator/composables/useActions.ts
index 41a91f34ad..a36719a8af 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/composables/useActions.ts
+++ b/packages/editor-ui/src/components/Node/NodeCreator/composables/useActions.ts
@@ -10,9 +10,15 @@ import type {
 	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,
+	QA_CHAIN_NODE_TYPE,
 	SCHEDULE_TRIGGER_NODE_TYPE,
 	SPLIT_IN_BATCHES_NODE_TYPE,
 	STICKY_NODE_TYPE,
@@ -26,8 +32,7 @@ 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 { runExternalHook } from '@/utils';
-import { useWebhooksStore } from '@/stores/webhooks.store';
+import { useExternalHooks } from '@/composables/useExternalHooks';
 
 import { sortNodeCreateElements, transformNodeType } from '../utils';
 
@@ -35,6 +40,12 @@ 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') ?? '',
@@ -145,7 +156,7 @@ export const useActions = () => {
 
 		return {
 			name: actionItem.displayName,
-			key: actionItem.name as string,
+			key: actionItem.name,
 			value: { ...actionItem.values, ...displayConditions } as INodeParameters,
 		};
 	}
@@ -157,11 +168,6 @@ export const useActions = () => {
 		const workflowContainsTrigger = workflowTriggerNodes.length > 0;
 		const isTriggerPanel = selectedView === TRIGGER_NODE_CREATOR_VIEW;
 		const onlyStickyNodes = addedNodes.every((node) => node.type === 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
@@ -174,6 +180,24 @@ export const useActions = () => {
 			!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,
+		];
+
+		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) {
@@ -189,7 +213,13 @@ export const useActions = () => {
 			nodeToAutoOpen.openDetail = true;
 		}
 
-		if (shouldPrependManualTrigger(addedNodes)) {
+		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 },
@@ -256,7 +286,7 @@ export const useActions = () => {
 			source_mode: rootView.toLowerCase(),
 			resource: (action.value as INodeParameters).resource || '',
 		};
-		void runExternalHook('nodeCreateList.addAction', useWebhooksStore(), payload);
+		void useExternalHooks().run('nodeCreateList.addAction', payload);
 		telemetry?.trackNodesPanel('nodeCreateList.addAction', payload);
 	}
 
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/composables/useActionsGeneration.ts b/packages/editor-ui/src/components/Node/NodeCreator/composables/useActionsGeneration.ts
index 20562e9526..490fc97b13 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/composables/useActionsGeneration.ts
+++ b/packages/editor-ui/src/components/Node/NodeCreator/composables/useActionsGeneration.ts
@@ -1,15 +1,18 @@
+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,
-	INodeProperties,
 	INodeTypeDescription,
 } from 'n8n-workflow';
-import { CUSTOM_API_CALL_KEY } from '@/constants';
-import type { ActionTypeDescription, SimplifiedNodeType, ActionsRecord } from '@/Interface';
 
 import { i18n } from '@/plugins/i18n';
 
+import { getCredentialOnlyNodeType } from '@/utils/credentialOnlyNodes';
+
 const PLACEHOLDER_RECOMMENDED_ACTION_KEY = 'placeholder_recommended';
 
 function translate(...args: Parameters<typeof i18n.baseText>) {
@@ -70,7 +73,7 @@ function operationsCategory(nodeTypeDescription: INodeTypeDescription): ActionTy
 		(property) => property.name?.toLowerCase() === 'operation',
 	);
 
-	if (!matchedProperty || !matchedProperty.options) return [];
+	if (!matchedProperty?.options) return [];
 
 	const filteredOutItems = (matchedProperty.options as INodePropertyOptions[]).filter(
 		(categoryItem: INodePropertyOptions) => !['*', '', ' '].includes(categoryItem.name),
@@ -104,7 +107,7 @@ function triggersCategory(nodeTypeDescription: INodeTypeDescription): ActionType
 
 	// 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) {
+	if (!matchedProperty?.options) {
 		return [
 			{
 				...getNodeTypeBase(nodeTypeDescription),
@@ -191,7 +194,7 @@ function resourceCategories(nodeTypeDescription: INodeTypeDescription): ActionTy
 						// 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] } }
+							? { show: { resource: [options[0]?.value] } }
 							: operations?.displayOptions;
 
 						return {
@@ -241,7 +244,18 @@ export function useActionsGenerator() {
 	}
 
 	function getSimplifiedNodeType(node: INodeTypeDescription): SimplifiedNodeType {
-		const { displayName, defaults, description, name, group, icon, iconUrl, outputs, codex } = node;
+		const {
+			displayName,
+			defaults,
+			description,
+			name,
+			group,
+			icon,
+			iconUrl,
+			badgeIconUrl,
+			outputs,
+			codex,
+		} = node;
 
 		return {
 			displayName,
@@ -251,12 +265,16 @@ export function useActionsGenerator() {
 			group,
 			icon,
 			iconUrl,
+			badgeIconUrl,
 			outputs,
 			codex,
 		};
 	}
 
-	function generateMergedNodesAndActions(nodeTypes: INodeTypeDescription[]) {
+	function generateMergedNodesAndActions(
+		nodeTypes: INodeTypeDescription[],
+		httpOnlyCredentials: ICredentialType[],
+	) {
 		const visibleNodeTypes = [...nodeTypes];
 		const actions: ActionsRecord<typeof mergedNodes> = {};
 		const mergedNodes: SimplifiedNodeType[] = [];
@@ -267,6 +285,13 @@ export function useActionsGenerator() {
 				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));
 			});
 
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/composables/useViewStacks.ts b/packages/editor-ui/src/components/Node/NodeCreator/composables/useViewStacks.ts
index e584bd4760..1f2eeb0cee 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/composables/useViewStacks.ts
+++ b/packages/editor-ui/src/components/Node/NodeCreator/composables/useViewStacks.ts
@@ -1,32 +1,32 @@
-import { computed, nextTick, ref } from 'vue';
-import { defineStore } from 'pinia';
-import { v4 as uuid } from 'uuid';
-import type {
-	NodeConnectionType,
-	INodeCreateElement,
-	NodeFilterType,
-	SimplifiedNodeType,
-} from '@/Interface';
+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 { useKeyboardNavigation } from './useKeyboardNavigation';
 import {
-	transformNodeType,
-	subcategorizeItems,
-	sortNodeCreateElements,
+	flattenCreateElements,
+	groupItemsInSections,
 	searchNodes,
+	sortNodeCreateElements,
+	subcategorizeItems,
+	transformNodeType,
 } from '../utils';
-import { useI18n } from '@/composables';
 
-import type { INodeInputFilter } from 'n8n-workflow';
-import { useNodeTypesStore } from '@/stores';
-import { AINodesView, type NodeViewItem } from '@/components/Node/NodeCreator/viewsData';
+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;
@@ -54,6 +54,7 @@ interface ViewStack {
 	baseFilter?: (item: INodeCreateElement) => boolean;
 	itemsMapper?: (item: INodeCreateElement) => INodeCreateElement;
 	panelClass?: string;
+	sections?: NodeViewItemSection[];
 }
 
 export const useViewStacks = defineStore('nodeCreatorViewStacks', () => {
@@ -71,7 +72,9 @@ export const useViewStacks = defineStore('nodeCreatorViewStacks', () => {
 
 		if (stack.search && searchBaseItems.value) {
 			const searchBase =
-				searchBaseItems.value.length > 0 ? searchBaseItems.value : stack.baselineItems;
+				searchBaseItems.value.length > 0
+					? searchBaseItems.value
+					: flattenCreateElements(stack.baselineItems ?? []);
 
 			return extendItemsWithUUID(searchNodes(stack.search || '', searchBase));
 		}
@@ -82,10 +85,12 @@ export const useViewStacks = defineStore('nodeCreatorViewStacks', () => {
 		const stack = viewStacks.value[viewStacks.value.length - 1];
 		if (!stack) return {};
 
+		const flatBaselineItems = flattenCreateElements(stack.baselineItems ?? []);
+
 		return {
 			...stack,
 			items: activeStackItems.value,
-			hasSearch: (stack.baselineItems || []).length > 8 || stack?.hasSearch,
+			hasSearch: flatBaselineItems.length > 8 || stack?.hasSearch,
 		};
 	});
 
@@ -113,6 +118,8 @@ export const useViewStacks = defineStore('nodeCreatorViewStacks', () => {
 		});
 	});
 
+	const itemsBySubcategory = computed(() => subcategorizeItems(nodeCreatorStore.mergedNodes));
+
 	async function gotoCompatibleConnectionView(
 		connectionType: NodeConnectionType,
 		isOutput?: boolean,
@@ -152,6 +159,9 @@ export const useViewStacks = defineStore('nodeCreatorViewStacks', () => {
 			},
 			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
@@ -178,10 +188,19 @@ export const useViewStacks = defineStore('nodeCreatorViewStacks', () => {
 		const stack = viewStacks.value[viewStacks.value.length - 1];
 		if (!stack || !activeViewStack.value.uuid) return;
 
-		let stackItems =
-			stack?.items ??
-			subcategorizeItems(nodeCreatorStore.mergedNodes)[stack?.subcategory ?? DEFAULT_SUBCATEGORY] ??
-			[];
+		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
@@ -203,7 +222,7 @@ export const useViewStacks = defineStore('nodeCreatorViewStacks', () => {
 
 		// Sort only if non-root view
 		if (!stack.items) {
-			sortNodeCreateElements(stackItems);
+			stackItems = sortNodeCreateElements(stackItems);
 		}
 
 		updateCurrentViewStack({ baselineItems: stackItems });
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/utils.ts b/packages/editor-ui/src/components/Node/NodeCreator/utils.ts
index 617dcc8192..237a253c90 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/utils.ts
+++ b/packages/editor-ui/src/components/Node/NodeCreator/utils.ts
@@ -4,10 +4,14 @@ import type {
 	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';
+
+import { sublimeSearch } from '@/utils/sortUtils';
+import { i18n } from '@/plugins/i18n';
+import type { NodeViewItemSection } from './viewsData';
 
 export function transformNodeType(
 	node: SimplifiedNodeType,
@@ -55,7 +59,7 @@ export function subcategorizeItems(items: SimplifiedNodeType[]) {
 
 export function sortNodeCreateElements(nodes: INodeCreateElement[]) {
 	return nodes.sort((a, b) => {
-		if (a.type !== 'node' || b.type !== 'node') return -1;
+		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;
 
@@ -75,3 +79,42 @@ export function searchNodes(searchFilter: string, items: INodeCreateElement[]) {
 
 	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
index e767ccdd48..109f21ad62 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/viewsData.ts
+++ b/packages/editor-ui/src/components/Node/NodeCreator/viewsData.ts
@@ -10,7 +10,6 @@ import {
 	TRANSFORM_DATA_SUBCATEGORY,
 	FILES_SUBCATEGORY,
 	FLOWS_CONTROL_SUBCATEGORY,
-	HELPERS_SUBCATEGORY,
 	TRIGGER_NODE_CREATOR_VIEW,
 	EMAIL_IMAP_NODE_TYPE,
 	DEFAULT_SUBCATEGORY,
@@ -29,13 +28,43 @@ import {
 	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';
-import { useNodeTypesStore } from '@/stores';
+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';
 
+export interface NodeViewItemSection {
+	key: string;
+	title: string;
+	items: string[];
+}
+
 export interface NodeViewItem {
 	key: string;
 	type: string;
@@ -49,7 +78,9 @@ export interface NodeViewItem {
 		connectionType?: NodeConnectionType;
 		panelClass?: string;
 		group?: string[];
+		sections?: NodeViewItemSection[];
 		description?: string;
+		tag?: string;
 		forceIncludeNodes?: string[];
 	};
 	category?: string | string[];
@@ -317,18 +348,6 @@ export function TriggerView(nodes: SimplifiedNodeType[]) {
 		],
 	};
 
-	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'),
-			},
-		});
-
 	return view;
 }
 
@@ -345,6 +364,7 @@ export function RegularView(nodes: SimplifiedNodeType[]) {
 				properties: {
 					title: 'App Regular Nodes',
 					icon: 'globe',
+					forceIncludeNodes: [RSS_READ_NODE_TYPE, EMAIL_SEND_NODE_TYPE],
 				},
 			},
 			{
@@ -354,15 +374,42 @@ export function RegularView(nodes: SimplifiedNodeType[]) {
 				properties: {
 					title: TRANSFORM_DATA_SUBCATEGORY,
 					icon: 'pen',
-				},
-			},
-			{
-				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: [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,
+							],
+						},
+					],
 				},
 			},
 			{
@@ -372,6 +419,13 @@ export function RegularView(nodes: SimplifiedNodeType[]) {
 				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],
+						},
+					],
 				},
 			},
 			{
@@ -381,6 +435,29 @@ export function RegularView(nodes: SimplifiedNodeType[]) {
 				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],
+						},
+					],
 				},
 			},
 		],
@@ -395,6 +472,7 @@ export function RegularView(nodes: SimplifiedNodeType[]) {
 				title: i18n.baseText('nodeCreator.aiPanel.langchainAiNodes'),
 				icon: 'robot',
 				description: i18n.baseText('nodeCreator.aiPanel.nodesForAi'),
+				tag: i18n.baseText('nodeCreator.aiPanel.newTag'),
 			},
 		});
 
diff --git a/packages/editor-ui/src/components/NodeCredentials.vue b/packages/editor-ui/src/components/NodeCredentials.vue
index c58729d9d4..65c9555e4a 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 || isReadOnlyRoute">
+				<div v-if="readonly">
 					<n8n-input
-						:modelValue="getSelectedName(credentialTypeDescription.name)"
+						:model-value="getSelectedName(credentialTypeDescription.name)"
 						disabled
 						size="small"
 						data-test-id="node-credentials-select"
@@ -29,7 +29,9 @@
 					data-test-id="node-credentials-select"
 				>
 					<n8n-select
-						:modelValue="getSelectedId(credentialTypeDescription.name)"
+						:model-value="getSelectedId(credentialTypeDescription.name)"
+						:placeholder="getSelectPlaceholder(credentialTypeDescription.name, issues)"
+						size="small"
 						@update:modelValue="
 							(value) =>
 								onCredentialSelected(
@@ -39,15 +41,13 @@
 								)
 						"
 						@blur="$emit('blur', 'credentials')"
-						:placeholder="getSelectPlaceholder(credentialTypeDescription.name, issues)"
-						size="small"
 					>
 						<n8n-option
 							v-for="item in getCredentialOptions(
 								getAllRelatedCredentialTypes(credentialTypeDescription),
 							)"
-							:data-test-id="`node-credentials-select-item-${item.id}`"
 							:key="item.id"
+							:data-test-id="`node-credentials-select-item-${item.id}`"
 							:label="item.name"
 							:value="item.id"
 						>
@@ -57,18 +57,18 @@
 							</div>
 						</n8n-option>
 						<n8n-option
-							data-test-id="node-credentials-select-item-new"
 							: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"
 								/>
@@ -78,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>
@@ -117,9 +117,8 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 
-import { genericHelpers } from '@/mixins/genericHelpers';
-import { nodeHelpers } from '@/mixins/nodeHelpers';
-import { useToast } from '@/composables';
+import { useNodeHelpers } from '@/composables/useNodeHelpers';
+import { useToast } from '@/composables/useToast';
 
 import TitledList from '@/components/TitledList.vue';
 import { useUIStore } from '@/stores/ui.store';
@@ -128,7 +127,7 @@ 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 { KEEP_AUTH_IN_NDV_FOR_NODES } from '@/constants';
+import { CREDENTIAL_ONLY_NODE_PREFIX, KEEP_AUTH_IN_NDV_FOR_NODES } from '@/constants';
 import {
 	getAuthTypeForNodeCredential,
 	getMainAuthField,
@@ -136,7 +135,7 @@ import {
 	getAllNodeCredentialForAuthType,
 	updateNodeAuthType,
 	isRequiredCredential,
-} from '@/utils';
+} from '@/utils/nodeTypesUtils';
 
 interface CredentialDropdownOption extends ICredentialsResponse {
 	typeDisplayName: string;
@@ -144,7 +143,9 @@ interface CredentialDropdownOption extends ICredentialsResponse {
 
 export default defineComponent({
 	name: 'NodeCredentials',
-	mixins: [genericHelpers, nodeHelpers],
+	components: {
+		TitledList,
+	},
 	props: {
 		readonly: {
 			type: Boolean,
@@ -166,12 +167,12 @@ export default defineComponent({
 			default: false,
 		},
 	},
-	components: {
-		TitledList,
-	},
 	setup() {
+		const nodeHelpers = useNodeHelpers();
+
 		return {
 			...useToast(),
+			nodeHelpers,
 		};
 	},
 	data() {
@@ -181,6 +182,34 @@ export default defineComponent({
 			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 }) => {
@@ -240,34 +269,6 @@ export default defineComponent({
 			});
 		});
 	},
-	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,
@@ -291,13 +292,11 @@ export default defineComponent({
 			});
 		},
 		credentialTypesNodeDescription(): INodeCredentialDescription[] {
-			const node = this.node;
-
 			const credType = this.credentialsStore.getCredentialTypeByName(this.overrideCredType);
 
 			if (credType) return [credType];
 
-			const activeNodeType = this.nodeTypesStore.getNodeType(node.type, node.typeVersion);
+			const activeNodeType = this.nodeType;
 			if (activeNodeType?.credentials) {
 				return activeNodeType.credentials;
 			}
@@ -346,10 +345,13 @@ export default defineComponent({
 			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;
@@ -430,7 +432,7 @@ export default defineComponent({
 			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,
 			});
@@ -458,7 +460,7 @@ export default defineComponent({
 					invalid: oldCredentials,
 					type: selectedCredentialsType,
 				});
-				this.updateNodesCredentialsIssues();
+				this.nodeHelpers.updateNodesCredentialsIssues();
 				this.showMessage({
 					title: this.$locale.baseText('nodeCredentials.showMessage.title'),
 					message: this.$locale.baseText('nodeCredentials.showMessage.message', {
@@ -509,7 +511,12 @@ export default defineComponent({
 				// 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[] {
@@ -548,19 +555,24 @@ export default defineComponent({
 			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 {
 			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 ca27cdb395..e27744d387 100644
--- a/packages/editor-ui/src/components/NodeDetailsView.vue
+++ b/packages/editor-ui/src/components/NodeDetailsView.vue
@@ -1,6 +1,6 @@
 <template>
 	<el-dialog
-		:modelValue="(!!activeNode || renaming) && !isActiveStickyNode"
+		:model-value="(!!activeNode || renaming) && !isActiveStickyNode"
 		:before-close="close"
 		:show-close="false"
 		class="data-display-wrapper ndv-wrapper"
@@ -8,6 +8,7 @@
 		width="auto"
 		append-to-body
 		data-test-id="ndv"
+		:data-has-output-connection="hasOutputConnection"
 	>
 		<n8n-tooltip
 			placement="bottom-start"
@@ -19,7 +20,7 @@
 					{{ $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') }}
@@ -29,90 +30,99 @@
 
 		<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"
-				:hasDoubleWidth="activeNodeType?.parameterPane === 'wide'"
-				:nodeType="activeNodeType"
+				:is-draggable="!isTriggerNode"
+				:has-double-width="activeNodeType?.parameterPane === 'wide'"
+				:node-type="activeNodeType"
+				@switchSelectedNode="onSwitchSelectedNode"
 				@close="close"
 				@init="onPanelsInit"
 				@dragstart="onDragStart"
 				@dragend="onDragEnd"
 			>
-				<template #input v-if="showTriggerPanel || !isTriggerNode">
+				<template v-if="showTriggerPanel || !isTriggerNode" #input>
 					<TriggerPanel
 						v-if="showTriggerPanel"
-						:nodeName="activeNode.name"
-						:sessionId="sessionId"
+						:node-name="activeNode.name"
+						:session-id="sessionId"
 						@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"
+						:can-link-runs="canLinkRuns"
+						:run-index="inputRun"
+						:linked-runs="linked"
+						:current-node-name="inputNodeName"
+						:session-id="sessionId"
+						:read-only="readOnly || hasForeignCredential"
+						:is-production-execution-preview="isProductionExecutionPreview"
+						:is-pane-active="isInputPaneActive"
+						@activatePane="activateInputPane"
 						@linkRun="onLinkRunToInput"
 						@unlinkRun="() => onUnlinkRun('input')"
 						@runChange="onRunInputIndexChange"
 						@openSettings="openSettings"
-						@select="onInputSelect"
+						@changeInputNode="onInputNodeChange"
 						@execute="onNodeExecute"
 						@tableMounted="onInputTableMounted"
 						@itemHover="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"
+						:can-link-runs="canLinkRuns"
+						:run-index="outputRun"
+						:linked-runs="linked"
+						:session-id="sessionId"
+						:is-read-only="readOnly || hasForeignCredential"
+						:block-u-i="blockUi && isTriggerNode && !isExecutableTriggerNode"
+						:is-production-execution-preview="isProductionExecutionPreview"
+						:is-pane-active="isOutputPaneActive"
+						@activatePane="activateOutputPane"
 						@linkRun="onLinkRunToOutput"
 						@unlinkRun="() => onUnlinkRun('output')"
 						@runChange="onRunOutputIndexChange"
 						@openSettings="openSettings"
 						@tableMounted="onOutputTableMounted"
 						@itemHover="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"
+						:session-id="sessionId"
+						:node-type="activeNodeType"
+						:foreign-credentials="foreignCredentials"
+						:read-only="readOnly"
+						:block-u-i="blockUi && showTriggerPanel"
 						:executable="!readOnly"
 						@valueChanged="valueChanged"
 						@execute="onNodeExecute"
 						@stopExecution="onStopExecution"
+						@redrawRequired="redrawRequired = true"
 						@activate="onWorkflowActivate"
 					/>
 					<a
 						v-if="featureRequestUrl"
-						@click="onFeatureRequestClick"
 						:class="$style.featureRequest"
 						target="_blank"
+						@click="onFeatureRequestClick"
 					>
 						<font-awesome-icon icon="lightbulb" />
 						{{ $locale.baseText('ndv.featureRequest') }}
@@ -125,7 +135,7 @@
 
 <script lang="ts">
 import { defineComponent } from 'vue';
-import { mapStores } from 'pinia';
+import { mapStores, storeToRefs } from 'pinia';
 import { createEventBus } from 'n8n-design-system/utils';
 import type {
 	INodeConnections,
@@ -136,9 +146,6 @@ import type {
 } 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';
@@ -156,19 +163,20 @@ import {
 	STICKY_NODE_TYPE,
 } from '@/constants';
 import { workflowActivate } from '@/mixins/workflowActivate';
-import { pinData } from '@/mixins/pinData';
 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 '@/composables/useDeviceSupport';
-import { useMessage } from '@/composables';
+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';
 
 export default defineComponent({
 	name: 'NodeDetailsView',
-	mixins: [externalHooks, nodeHelpers, workflowHelpers, workflowActivate, pinData],
 	components: {
 		NodeSettings,
 		InputPanel,
@@ -176,6 +184,7 @@ export default defineComponent({
 		NDVDraggablePanels,
 		TriggerPanel,
 	},
+	mixins: [workflowHelpers, workflowActivate],
 	props: {
 		readOnly: {
 			type: Boolean,
@@ -188,17 +197,27 @@ export default defineComponent({
 			default: false,
 		},
 	},
-	setup(props) {
+	setup(props, ctx) {
+		const ndvStore = useNDVStore();
+		const externalHooks = useExternalHooks();
+		const nodeHelpers = useNodeHelpers();
+		const { activeNode } = storeToRefs(ndvStore);
+		const pinnedData = usePinnedData(activeNode);
+
 		return {
+			externalHooks,
+			nodeHelpers,
+			pinnedData,
 			...useDeviceSupport(),
 			...useMessage(),
 			// eslint-disable-next-line @typescript-eslint/no-misused-promises
-			...workflowActivate.setup?.(props),
+			...workflowActivate.setup?.(props, ctx),
 		};
 	},
 	data() {
 		return {
 			settingsEventBus: createEventBus(),
+			redrawRequired: false,
 			runInputIndex: -1,
 			runOutputIndex: -1,
 			isLinkingEnabled: true,
@@ -209,6 +228,9 @@ export default defineComponent({
 			pinDataDiscoveryTooltipVisible: false,
 			avgInputRowHeight: 0,
 			avgOutputRowHeight: 0,
+			isInputPaneActive: false,
+			isOutputPaneActive: false,
+			isPairedItemHoveringEnabled: true,
 		};
 	},
 	mounted() {
@@ -254,9 +276,14 @@ export default defineComponent({
 			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)
 			);
@@ -264,6 +291,15 @@ export default defineComponent({
 		workflow(): Workflow {
 			return this.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) {
 				return (
@@ -274,12 +310,10 @@ export default defineComponent({
 			return [];
 		},
 		parentNode(): string | undefined {
-			const pinData = this.workflowsStore.getPinData;
-
 			// Return the first parent node that contains data
 			for (const parentNodeName of this.parentNodes) {
 				// Check first for pinned data
-				if (pinData[parentNodeName]) {
+				if (this.workflowsStore.pinnedWorkflowData[parentNodeName]) {
 					return parentNodeName;
 				}
 
@@ -344,7 +378,7 @@ export default defineComponent({
 			return Math.min(this.runOutputIndex, this.maxOutputRun);
 		},
 		maxInputRun(): number {
-			if (this.inputNode === null && this.activeNode === null) {
+			if (this.inputNode === null || this.activeNode === null) {
 				return 0;
 			}
 
@@ -355,7 +389,7 @@ export default defineComponent({
 
 			const runData: IRunData | null = this.workflowRunData;
 
-			if (outputs.filter((output) => output !== NodeConnectionType.Main).length) {
+			if (outputs.some((output) => output !== NodeConnectionType.Main)) {
 				node = this.activeNode;
 			}
 
@@ -444,15 +478,19 @@ export default defineComponent({
 				this.avgInputRowHeight = 0;
 
 				setTimeout(() => this.ndvStore.setNDVSessionId(), 0);
-				void this.$externalHooks().run('dataDisplay.nodeTypeChanged', {
-					nodeSubtitle: this.getNodeSubtitle(node, this.activeNodeType, this.getCurrentWorkflow()),
+				void this.externalHooks.run('dataDisplay.nodeTypeChanged', {
+					nodeSubtitle: this.nodeHelpers.getNodeSubtitle(
+						node,
+						this.activeNodeType,
+						this.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 : '',
@@ -467,8 +505,7 @@ export default defineComponent({
 								: 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,
@@ -514,10 +551,7 @@ export default defineComponent({
 			}
 		},
 		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;
 			}
@@ -531,7 +565,7 @@ export default defineComponent({
 			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;
 			}
@@ -626,14 +660,19 @@ export default defineComponent({
 		nodeTypeSelected(nodeTypeName: string) {
 			this.$emit('nodeTypeSelected', nodeTypeName);
 		},
+		async onSwitchSelectedNode(nodeTypeName: string) {
+			this.$emit('switchSelectedNode', nodeTypeName);
+		},
 		async close() {
 			if (this.isDragging) {
 				return;
 			}
 
 			if (
-				typeof this.activeNodeType?.outputs === 'string' ||
-				typeof this.activeNodeType?.inputs === 'string'
+				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
@@ -644,7 +683,7 @@ export default defineComponent({
 				}, 1);
 			}
 
-			if (this.outputPanelEditMode.enabled) {
+			if (this.outputPanelEditMode.enabled && this.activeNode) {
 				const shouldPinDataBeforeClosing = await this.confirm(
 					'',
 					this.$locale.baseText('ndv.pinData.beforeClosing.title'),
@@ -656,32 +695,17 @@ export default defineComponent({
 
 				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);
 			}
 
-			await 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,
@@ -710,7 +734,7 @@ export default defineComponent({
 				pane,
 			});
 		},
-		onInputSelect(value: string, index: number) {
+		onInputNodeChange(value: string, index: number) {
 			this.runInputIndex = -1;
 			this.isLinkingEnabled = true;
 			this.selectedInput = value;
@@ -726,11 +750,26 @@ export default defineComponent({
 		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: visible;
 	margin-top: 0;
@@ -780,6 +819,10 @@ $main-panel-width: 360px;
 	top: var(--spacing-xs);
 	left: var(--spacing-l);
 
+	span {
+		color: var(--color-ndv-back-font);
+	}
+
 	&:hover {
 		cursor: pointer;
 	}
@@ -800,7 +843,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 a724f9b1b4..794bc89032 100644
--- a/packages/editor-ui/src/components/NodeExecuteButton.vue
+++ b/packages/editor-ui/src/components/NodeExecuteButton.vue
@@ -12,9 +12,10 @@
 					:label="buttonLabel"
 					:type="type"
 					:size="size"
-					:icon="isFormTriggerNode && 'flask'"
-					:transparentBackground="transparent"
+					:icon="!isListeningForEvents && 'flask'"
+					:transparent-background="transparent"
 					@click="onClick"
+					:title="!isTriggerNode ? $locale.baseText('ndv.execute.testNode.description') : ''"
 				/>
 			</div>
 		</n8n-tooltip>
@@ -29,23 +30,27 @@ import {
 	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 { workflowRun } from '@/mixins/workflowRun';
-import { pinData } from '@/mixins/pinData';
-import { dataPinningEventBus } from '@/event-bus';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { useNDVStore } from '@/stores/ndv.store';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
-import { useToast, useMessage } from '@/composables';
+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';
 
 export default defineComponent({
+	mixins: [workflowRun],
 	inheritAttrs: false,
-	mixins: [workflowRun, pinData],
 	props: {
 		nodeName: {
 			type: String,
+			required: true,
 		},
 		disabled: {
 			type: Boolean,
@@ -68,12 +73,19 @@ export default defineComponent({
 			type: String,
 		},
 	},
-	setup(props) {
+	setup(props, ctx) {
+		const workflowsStore = useWorkflowsStore();
+		const node = workflowsStore.getNodeByName(props.nodeName);
+		const pinnedData = usePinnedData(node);
+		const externalHooks = useExternalHooks();
+
 		return {
+			externalHooks,
+			pinnedData,
 			...useToast(),
 			...useMessage(),
 			// eslint-disable-next-line @typescript-eslint/no-misused-promises
-			...workflowRun.setup?.(props),
+			...workflowRun.setup?.(props, ctx),
 		};
 	},
 	computed: {
@@ -106,6 +118,9 @@ export default defineComponent({
 		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);
+		},
 		isFormTriggerNode(): boolean {
 			return Boolean(this.nodeType && this.nodeType.name === FORM_TRIGGER_NODE_TYPE);
 		},
@@ -176,6 +191,10 @@ export default defineComponent({
 				return this.label;
 			}
 
+			if (this.isChatNode) {
+				return this.$locale.baseText('ndv.execute.testChat');
+			}
+
 			if (this.isWebhookNode) {
 				return this.$locale.baseText('ndv.execute.listenForTestEvent');
 			}
@@ -188,16 +207,7 @@ export default defineComponent({
 				return this.$locale.baseText('ndv.execute.fetchEvent');
 			}
 
-			if (
-				this.isTriggerNode &&
-				!this.isScheduleTrigger &&
-				!this.isManualTriggerNode &&
-				!this.isFormTriggerNode
-			) {
-				return this.$locale.baseText('ndv.execute.listenForEvent');
-			}
-
-			return this.$locale.baseText('ndv.execute.executeNode');
+			return this.$locale.baseText('ndv.execute.testNode');
 		},
 	},
 	methods: {
@@ -211,13 +221,16 @@ export default defineComponent({
 		},
 
 		async onClick() {
-			if (this.isListeningForEvents) {
+			if (this.isChatNode) {
+				this.ndvStore.setActiveNodeName(null);
+				nodeViewEventBus.emit('openChat');
+			} else if (this.isListeningForEvents) {
 				await this.stopWaitingForWebhook();
 			} else if (this.isListeningForWorkflowEvents) {
 				this.$emit('stopExecution');
 			} else {
 				let shouldUnpinAndExecute = false;
-				if (this.hasPinData) {
+				if (this.pinnedData.hasData.value) {
 					const confirmResult = await this.confirm(
 						this.$locale.baseText('ndv.pinData.unpinAndExecute.description'),
 						this.$locale.baseText('ndv.pinData.unpinAndExecute.title'),
@@ -228,13 +241,12 @@ export default defineComponent({
 					);
 					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,
@@ -242,7 +254,7 @@ export default defineComponent({
 						session_id: this.ndvStore.sessionId,
 					};
 					this.$telemetry.track('User clicked execute node button', telemetryPayload);
-					await this.$externalHooks().run('nodeExecuteButton.onClick', telemetryPayload);
+					await this.externalHooks.run('nodeExecuteButton.onClick', telemetryPayload);
 
 					await this.runWorkflow({
 						destinationNode: this.nodeName,
diff --git a/packages/editor-ui/src/components/NodeIcon.vue b/packages/editor-ui/src/components/NodeIcon.vue
index 1275260d07..edab9b4688 100644
--- a/packages/editor-ui/src/components/NodeIcon.vue
+++ b/packages/editor-ui/src/components/NodeIcon.vue
@@ -7,8 +7,10 @@
 		: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>
@@ -18,7 +20,7 @@ import type { IVersionNode } from '@/Interface';
 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,
@@ -50,11 +54,19 @@ export default defineComponent({
 			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';
@@ -67,8 +79,8 @@ 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) {
@@ -77,7 +89,7 @@ export default defineComponent({
 			return '';
 		},
 		iconSource(): NodeIconSource {
-			const nodeType = this.nodeType as INodeTypeDescription | IVersionNode | null;
+			const nodeType = this.nodeType;
 			const baseUrl = this.rootStore.getBaseUrl;
 			const iconSource = {} as NodeIconSource;
 
@@ -104,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 dcaf54b022..53d710ad15 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>
@@ -15,13 +15,14 @@
 <script lang="ts">
 import { defineComponent } from 'vue';
 import NodeIcon from '@/components/NodeIcon.vue';
-import { genericHelpers } from '@/mixins/genericHelpers';
 import type { ITemplatesNode } from '@/Interface';
-import { filterTemplateNodes } from '@/utils';
+import { filterTemplateNodes } from '@/utils/nodeTypesUtils';
 
 export default defineComponent({
 	name: 'NodeList',
-	mixins: [genericHelpers],
+	components: {
+		NodeIcon,
+	},
 	props: {
 		nodes: {
 			type: Array,
@@ -35,9 +36,6 @@ export default defineComponent({
 			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 b9b5b66487..79a0e6c8f3 100644
--- a/packages/editor-ui/src/components/NodeSettings.vue
+++ b/packages/editor-ui/src/components/NodeSettings.vue
@@ -11,19 +11,19 @@
 				<NodeTitle
 					v-if="node"
 					class="node-name"
-					:modelValue="node.name"
-					:nodeType="nodeType"
-					:readOnly="isReadOnly"
+					:model-value="node.name"
+					:node-type="nodeType"
+					:read-only="isReadOnly"
 					@update:modelValue="nameChanged"
 				></NodeTitle>
 				<div v-if="isExecutable">
 					<NodeExecuteButton
 						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"
 					/>
@@ -32,11 +32,11 @@
 			<NodeSettingsTabs
 				v-if="node && nodeValid"
 				v-model="openPanel"
-				:nodeType="nodeType"
-				:sessionId="sessionId"
+				:node-type="nodeType"
+				:session-id="sessionId"
 			/>
 		</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>
@@ -78,7 +78,7 @@
 				</template>
 			</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="
@@ -88,30 +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"
 					@activate="onWorkflowActivate"
 					@parameterBlur="onParameterBlur"
 				>
-					<node-credentials
+					<NodeCredentials
 						:node="node"
 						:readonly="isReadOnly"
-						:showAll="true"
+						:show-all="true"
+						:hide-issues="hiddenIssuesInputs.includes('credentials')"
 						@credentialSelected="credentialSelected"
 						@valueChanged="valueChanged"
 						@blur="onParameterBlur"
-						:hide-issues="hiddenIssuesInputs.includes('credentials')"
 					/>
-				</parameter-input-list>
+				</ParameterInputList>
 				<div v-if="parametersNoneSetting.length === 0" class="no-parameters">
 					<n8n-text>
 						{{ $locale.baseText('nodeSettings.thisNodeDoesNotHaveAnyParameters') }}
@@ -119,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"
 				>
@@ -133,25 +133,36 @@
 				</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"
 				/>
-				<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"
 				/>
+				<div class="node-version" data-test-id="node-version">
+					{{
+						$locale.baseText('nodeSettings.nodeVersion', {
+							interpolate: {
+								node: nodeType?.displayName as string,
+								version: node.typeVersion.toString(),
+							},
+						})
+					}}
+					<span>({{ nodeVersionTag }})</span>
+				</div>
 			</div>
 		</div>
 		<n8n-block-ui :show="blockUI" />
@@ -190,11 +201,8 @@ import NodeSettingsTabs from '@/components/NodeSettingsTabs.vue';
 import NodeWebhooks from '@/components/NodeWebhooks.vue';
 import { get, set, unset } from 'lodash-es';
 
-import { externalHooks } from '@/mixins/externalHooks';
-import { nodeHelpers } from '@/mixins/nodeHelpers';
-
 import NodeExecuteButton from './NodeExecuteButton.vue';
-import { isCommunityPackageName } from '@/utils';
+import { isCommunityPackageName } from '@/utils/nodeTypesUtils';
 import { useUIStore } from '@/stores/ui.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { useNDVStore } from '@/stores/ndv.store';
@@ -204,10 +212,11 @@ import { RenameNodeCommand } from '@/models/history';
 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';
 
 export default defineComponent({
 	name: 'NodeSettings',
-	mixins: [externalHooks, nodeHelpers],
 	components: {
 		NodeTitle,
 		NodeCredentials,
@@ -216,6 +225,15 @@ export default defineComponent({
 		NodeWebhooks,
 		NodeExecuteButton,
 	},
+	setup() {
+		const nodeHelpers = useNodeHelpers();
+		const externalHooks = useExternalHooks();
+
+		return {
+			externalHooks,
+			nodeHelpers,
+		};
+	},
 	computed: {
 		...mapStores(
 			useHistoryStore,
@@ -236,7 +254,7 @@ export default defineComponent({
 			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 inputs = NodeHelpers.getNodeInputs(workflow, workflowNode!, this.nodeType);
 				const inputNames = NodeHelpers.getConnectionTypes(inputs);
 
 				if (!inputNames.includes(NodeConnectionType.Main) && !this.isTriggerNode) {
@@ -258,6 +276,29 @@ export default defineComponent({
 
 			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.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?.description) {
 				const shortNodeType = this.$locale.shortNodeType(this.nodeType.name);
@@ -371,7 +412,7 @@ export default defineComponent({
 				alwaysOutputData: false,
 				executeOnce: false,
 				notesInFlow: false,
-				continueOnFail: false,
+				onError: 'stopWorkflow',
 				retryOnFail: false,
 				maxTries: 3,
 				waitBetweenTries: 1000,
@@ -380,93 +421,7 @@ export default defineComponent({
 			} 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,
@@ -485,7 +440,7 @@ export default defineComponent({
 
 				try {
 					parameters = JSON.parse(parameters) as {
-						[key: string]: any;
+						[key: string]: unknown;
 					};
 
 					//@ts-ignore
@@ -500,6 +455,17 @@ export default defineComponent({
 			}
 		},
 	},
+	mounted() {
+		this.populateHiddenIssuesSet();
+		this.populateSettings();
+		this.setNodeValues();
+		this.eventBus?.on('openSettings', this.openSettings);
+
+		this.nodeHelpers.updateNodeParameterIssues(this.node as INodeUi, this.nodeType);
+	},
+	beforeUnmount() {
+		this.eventBus?.off('openSettings', this.openSettings);
+	},
 	methods: {
 		populateHiddenIssuesSet() {
 			if (!this.node || !this.workflowsStore.isNodePristine(this.node.name)) return;
@@ -511,6 +477,132 @@ export default defineComponent({
 
 			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);
 		},
@@ -599,10 +691,10 @@ export default defineComponent({
 
 			if (node) {
 				// Update the issues
-				this.updateNodeCredentialIssues(node);
+				this.nodeHelpers.updateNodeCredentialIssues(node);
 			}
 
-			void this.$externalHooks().run('nodeSettings.credentialSelected', { updateInformation });
+			void this.externalHooks.run('nodeSettings.credentialSelected', { updateInformation });
 		},
 		nameChanged(name: string) {
 			if (this.node) {
@@ -633,6 +725,11 @@ export default defineComponent({
 				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
 
@@ -696,7 +793,7 @@ export default defineComponent({
 						}
 					}
 
-					void this.$externalHooks().run('nodeSettings.valueChanged', {
+					void this.externalHooks.run('nodeSettings.valueChanged', {
 						parameterPath,
 						newValue,
 						parameters: this.parameters,
@@ -728,8 +825,8 @@ export default defineComponent({
 
 					this.workflowsStore.setNodeParameters(updateInformation);
 
-					this.updateNodeParameterIssuesByName(node.name);
-					this.updateNodeCredentialIssuesByName(node.name);
+					this.nodeHelpers.updateNodeParameterIssuesByName(node.name);
+					this.nodeHelpers.updateNodeCredentialIssuesByName(node.name);
 				}
 			} else if (parameterData.name.startsWith('parameters.')) {
 				// A node parameter changed
@@ -778,6 +875,12 @@ export default defineComponent({
 					} 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
@@ -804,15 +907,15 @@ export default defineComponent({
 
 				this.workflowsStore.setNodeParameters(updateInformation);
 
-				void this.$externalHooks().run('nodeSettings.valueChanged', {
+				void this.externalHooks.run('nodeSettings.valueChanged', {
 					parameterPath,
 					newValue,
 					parameters: this.parameters,
 					oldNodeParameters,
 				});
 
-				this.updateNodeParameterIssuesByName(node.name);
-				this.updateNodeCredentialIssuesByName(node.name);
+				this.nodeHelpers.updateNodeParameterIssuesByName(node.name);
+				this.nodeHelpers.updateNodeCredentialIssuesByName(node.name);
 				this.$telemetry.trackNodeParametersValuesChange(nodeType.name, parameterData);
 			} else {
 				// A property on the node itself changed
@@ -833,6 +936,44 @@ export default defineComponent({
 				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 should be hidden
+				const showCondition = displayOptions.show?.[updatedParameter.name];
+				const hideCondition = displayOptions.hide?.[updatedParameter.name];
+				if (showCondition === undefined && hideCondition === undefined) {
+					return;
+				}
+				// Every value should be a possible option
+				const hasValidOptions = Object.keys(nodeParameterValues).every(
+					(key) => (prop.options ?? []).find((option) => option.name === key) !== undefined,
+				);
+				if (
+					!hasValidOptions ||
+					showCondition !== updatedParameter.value ||
+					hideCondition === updatedParameter.value
+				) {
+					unset(nodeParameterValues as object, prop.name);
+				}
+			});
+		},
 		/**
 		 * Sets the values of the active node in the internal settings variables
 		 */
@@ -880,10 +1021,18 @@ export default defineComponent({
 				}
 
 				if (this.node.continueOnFail) {
-					foundNodeSettings.push('continueOnFail');
+					foundNodeSettings.push('onError');
 					this.nodeValues = {
 						...this.nodeValues,
-						continueOnFail: this.node.continueOnFail,
+						onError: 'continueRegularOutput',
+					};
+				}
+
+				if (this.node.onError) {
+					foundNodeSettings.push('onError');
+					this.nodeValues = {
+						...this.nodeValues,
+						onError: this.node.onError,
 					};
 				}
 
@@ -961,16 +1110,6 @@ export default defineComponent({
 			this.openPanel = 'settings';
 		},
 	},
-	mounted() {
-		this.populateHiddenIssuesSet();
-		this.setNodeValues();
-		this.eventBus?.on('openSettings', this.openSettings);
-
-		this.updateNodeParameterIssues(this.node as INodeUi, this.nodeType);
-	},
-	beforeUnmount() {
-		this.eventBus?.off('openSettings', this.openSettings);
-	},
 });
 </script>
 
@@ -1027,7 +1166,8 @@ export default defineComponent({
 
 	.node-parameters-wrapper {
 		overflow-y: auto;
-		padding: 0 var(--spacing-m) 200px var(--spacing-m);
+		padding: 0 var(--spacing-m) var(--spacing-l) var(--spacing-m);
+		flex-grow: 1;
 	}
 
 	&.dragging {
@@ -1071,6 +1211,14 @@ export default defineComponent({
 	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 2abbaf0f2b..365afa0c01 100644
--- a/packages/editor-ui/src/components/NodeSettingsTabs.vue
+++ b/packages/editor-ui/src/components/NodeSettingsTabs.vue
@@ -1,7 +1,7 @@
 <template>
 	<n8n-tabs
 		:options="options"
-		:modelValue="modelValue"
+		:model-value="modelValue"
 		@update:modelValue="onTabSelect"
 		@tooltipClick="onTooltipClick"
 	/>
@@ -10,7 +10,6 @@
 <script lang="ts">
 import { defineComponent } from 'vue';
 import { mapStores } from 'pinia';
-import { externalHooks } from '@/mixins/externalHooks';
 import {
 	BUILTIN_NODES_DOCS_URL,
 	COMMUNITY_NODES_INSTALLATION_DOCS_URL,
@@ -22,11 +21,11 @@ import { useWorkflowsStore } from '@/stores/workflows.store';
 import type { INodeTypeDescription } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import { isCommunityPackageName } from '@/utils';
+import { isCommunityPackageName } from '@/utils/nodeTypesUtils';
+import { useExternalHooks } from '@/composables/useExternalHooks';
 
 export default defineComponent({
 	name: 'NodeSettingsTabs',
-	mixins: [externalHooks],
 	props: {
 		modelValue: {
 			type: String,
@@ -37,6 +36,12 @@ export default defineComponent({
 			type: String,
 		},
 	},
+	setup() {
+		const externalHooks = useExternalHooks();
+		return {
+			externalHooks,
+		};
+	},
 	computed: {
 		...mapStores(useNDVStore, useWorkflowsStore),
 		activeNode(): INodeUi | null {
@@ -123,7 +128,7 @@ export default defineComponent({
 	methods: {
 		onTabSelect(tab: string) {
 			if (tab === 'docs' && this.nodeType) {
-				void this.$externalHooks().run('dataDisplay.onDocumentationUrlClick', {
+				void this.externalHooks.run('dataDisplay.onDocumentationUrlClick', {
 					nodeType: this.nodeType as INodeTypeDescription,
 					documentationUrl: this.documentationUrl,
 				});
diff --git a/packages/editor-ui/src/components/NodeTitle.vue b/packages/editor-ui/src/components/NodeTitle.vue
index ed01152ede..a38609d136 100644
--- a/packages/editor-ui/src/components/NodeTitle.vue
+++ b/packages/editor-ui/src/components/NodeTitle.vue
@@ -1,6 +1,6 @@
 <template>
 	<span :class="$style.container" data-test-id="node-title-container" @click="onEdit">
-		<span :class="$style.iconWrapper"><NodeIcon :nodeType="nodeType" :size="18" /></span>
+		<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"
@@ -11,19 +11,19 @@
 				<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>
@@ -31,7 +31,7 @@
 				<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,8 +40,8 @@
 </template>
 
 <script lang="ts">
-import { defineComponent } from 'vue';
 import NodeIcon from '@/components/NodeIcon.vue';
+import { defineComponent } from 'vue';
 
 export default defineComponent({
 	name: 'NodeTitle',
diff --git a/packages/editor-ui/src/components/NodeWebhooks.vue b/packages/editor-ui/src/components/NodeWebhooks.vue
index 0fec295a7f..ab54748d17 100644
--- a/packages/editor-ui/src/components/NodeWebhooks.vue
+++ b/packages/editor-ui/src/components/NodeWebhooks.vue
@@ -1,41 +1,32 @@
 <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 }"
-			@click="isMinimized = !isMinimized"
 			:title="isMinimized ? baseText.clickToDisplay : baseText.clickToHide"
+			@click="isMinimized = !isMinimized"
 		>
-			<font-awesome-icon icon="angle-down" class="minimize-button minimize-icon" />
+			<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: baseText.testUrl, value: 'test' },
-									{
-										label: baseText.productionUrl,
-										value: 'production',
-									},
-								]"
-							/>
+							<n8n-radio-buttons v-model="showUrlFor" :options="urlOptions" />
 						</el-col>
 					</el-row>
 				</div>
 
 				<n8n-tooltip
-					v-for="(webhook, index) in webhooksNode.filter((webhook) => !webhook.ndvHideUrl)"
+					v-for="(webhook, index) in visibleWebhookUrls"
 					:key="index"
 					class="item"
 					:content="baseText.clickToCopy"
 					placement="left"
 				>
-					<div v-if="!webhook.ndvHideMethod" class="webhook-wrapper">
+					<div v-if="isWebhookMethodVisible(webhook)" class="webhook-wrapper">
 						<div class="http-field">
 							<div class="http-method">
 								{{ getWebhookExpressionValue(webhook, 'httpMethod') }}<br />
@@ -64,20 +55,28 @@
 import type { INodeTypeDescription, IWebhookDescription } from 'n8n-workflow';
 import { defineComponent } from 'vue';
 
-import { useToast } from '@/composables';
-import { FORM_TRIGGER_NODE_TYPE, OPEN_URL_PANEL_TRIGGER_NODE_TYPES } from '@/constants';
-import { copyPaste } from '@/mixins/copyPaste';
+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 { workflowHelpers } from '@/mixins/workflowHelpers';
+import { useClipboard } from '@/composables/useClipboard';
 
 export default defineComponent({
 	name: 'NodeWebhooks',
-	mixins: [copyPaste, workflowHelpers],
+	mixins: [workflowHelpers],
 	props: [
 		'node', // NodeUi
 		'nodeType', // INodeTypeDescription
 	],
 	setup() {
+		const clipboard = useClipboard();
+
 		return {
+			clipboard,
 			...useToast(),
 		};
 	},
@@ -88,18 +87,53 @@ export default defineComponent({
 		};
 	},
 	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.getWebhookExpressionValue(webhook, 'ndvHideUrl');
+				}
+
+				return !webhook.ndvHideUrl;
+			});
+		},
 		webhooksNode(): IWebhookDescription[] {
 			if (this.nodeType === null || this.nodeType.webhooks === undefined) {
 				return [];
 			}
 
 			return (this.nodeType as INodeTypeDescription).webhooks!.filter(
-				(webhookData) => webhookData.restartWebhook !== true && !webhookData.hasLifecycleMethods,
+				(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'),
@@ -128,10 +162,15 @@ export default defineComponent({
 			}
 		},
 	},
+	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.baseText.copyTitle,
@@ -145,14 +184,20 @@ export default defineComponent({
 		},
 		getWebhookUrlDisplay(webhookData: IWebhookDescription): string {
 			if (this.node) {
-				return this.getWebhookUrl(webhookData, this.node, this.showUrlFor);
+				return this.getWebhookUrl(
+					webhookData,
+					this.node,
+					this.isProductionOnly ? 'production' : this.showUrlFor,
+				);
 			}
 			return '';
 		},
-	},
-	watch: {
-		node() {
-			this.isMinimized = !OPEN_URL_PANEL_TRIGGER_NODE_TYPES.includes(this.nodeType.name);
+		isWebhookMethodVisible(webhook: IWebhookDescription): boolean {
+			if (typeof webhook.ndvHideMethod === 'string') {
+				return !this.getWebhookExpressionValue(webhook, 'ndvHideMethod');
+			}
+
+			return !webhook.ndvHideMethod;
 		},
 	},
 });
@@ -211,7 +256,7 @@ export default defineComponent({
 }
 .url-field-full-width {
 	display: inline-block;
-	width: 100%;
+	margin: 5px 10px;
 }
 
 .url-selection {
@@ -231,10 +276,10 @@ export default defineComponent({
 	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 e2bb8aa60e..d8c6702050 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>
@@ -50,7 +50,7 @@ import { ONBOARDING_CALL_SIGNUP_MODAL_KEY, VALID_EMAIL_REGEX } from '@/constants
 import Modal from './Modal.vue';
 
 import { defineComponent } from 'vue';
-import { useToast } from '@/composables';
+import { useToast } from '@/composables/useToast';
 import { mapStores } from 'pinia';
 import { useUIStore } from '@/stores/ui.store';
 import { createEventBus } from 'n8n-design-system/utils';
diff --git a/packages/editor-ui/src/components/OutputPanel.vue b/packages/editor-ui/src/components/OutputPanel.vue
index f6d9966dd6..61fcd57677 100644
--- a/packages/editor-ui/src/components/OutputPanel.vue
+++ b/packages/editor-ui/src/components/OutputPanel.vue
@@ -1,59 +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"
+		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')"
+		:session-id="sessionId"
+		:block-u-i="blockUI"
+		:is-production-execution-preview="isProductionExecutionPreview"
+		:is-pane-active="isPaneActive"
+		pane-type="output"
+		:data-output-type="outputMode"
+		@activatePane="activatePane"
 		@runChange="onRunIndexChange"
 		@linkRun="onLinkRun"
 		@unlinkRun="onUnlinkRun"
 		@tableMounted="$emit('tableMounted', $event)"
 		@itemHover="$emit('itemHover', $event)"
-		ref="runData"
-		:data-output-type="outputMode"
+		@search="$emit('search', $event)"
 	>
 		<template #header>
 			<div :class="$style.titleSection">
 				<template v-if="hasAiMetadata">
 					<n8n-radio-buttons
-						:options="outputTypes"
 						v-model="outputMode"
+						:options="outputTypes"
 						@update:modelValue="onUpdateOutputMode"
 					/>
 				</template>
-				<span :class="$style.title" v-else>
+				<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"
-				>
-					<span
-						v-html="
-							$locale.baseText(
-								hasPinData
-									? 'ndv.output.staleDataWarning.pinData'
-									: 'ndv.output.staleDataWarning.regular',
-							)
-						"
-					></span>
-				</n8n-info-tip>
 			</div>
 		</template>
 
@@ -62,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>
 
@@ -86,8 +79,8 @@
 			</n8n-text>
 		</template>
 
-		<template #content v-if="outputMode === 'logs'">
-			<run-data-ai :node="node" :run-index="runIndex" />
+		<template v-if="outputMode === 'logs'" #content>
+			<RunDataAi :node="node" :run-index="runIndex" />
 		</template>
 		<template #recovered-artificial-output-data>
 			<div :class="$style.recoveredOutputData">
@@ -100,8 +93,8 @@
 			</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>
@@ -112,14 +105,15 @@ import type { IExecutionResponse, INodeUi } from '@/Interface';
 import type { INodeTypeDescription, IRunData, IRunExecutionData, ITaskData } from 'n8n-workflow';
 import RunData from './RunData.vue';
 import RunInfo from './RunInfo.vue';
-import { pinData } from '@/mixins/pinData';
-import { mapStores } from 'pinia';
+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>;
 
@@ -130,20 +124,11 @@ const OUTPUT_TYPE = {
 
 export default defineComponent({
 	name: 'OutputPanel',
-	mixins: [pinData],
 	components: { RunData, RunInfo, RunDataAi },
-	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 },
-			],
-		};
-	},
 	props: {
 		runIndex: {
 			type: Number,
+			required: true,
 		},
 		isReadOnly: {
 			type: Boolean,
@@ -165,6 +150,35 @@ export default defineComponent({
 			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),
@@ -193,7 +207,7 @@ export default defineComponent({
 			return false;
 		},
 		isPollingTypeNode(): boolean {
-			return !!(this.nodeType && this.nodeType.polling);
+			return !!this.nodeType?.polling;
 		},
 		isScheduleTrigger(): boolean {
 			return !!(this.nodeType && this.nodeType.group.includes('schedule'));
@@ -273,7 +287,7 @@ export default defineComponent({
 			return this.ndvStore.outputPanelEditMode;
 		},
 		canPinData(): boolean {
-			return this.isPinDataNodeType && !this.isReadOnly;
+			return this.pinnedData.isValidNodeType.value && !this.isReadOnly;
 		},
 	},
 	methods: {
@@ -319,6 +333,9 @@ export default defineComponent({
 				ndvEventBus.emit('setPositionByName', 'initial');
 			}
 		},
+		activatePane() {
+			this.$emit('activatePane');
+		},
 	},
 });
 </script>
@@ -336,6 +353,7 @@ export default defineComponent({
 }
 .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 d2c4fdc35b..5c3b463a69 100644
--- a/packages/editor-ui/src/components/PageAlert.vue
+++ b/packages/editor-ui/src/components/PageAlert.vue
@@ -5,8 +5,8 @@
 <script lang="ts">
 import { defineComponent } from 'vue';
 import type { NotificationInstance } from 'element-plus';
-import { sanitizeHtml } from '@/utils';
-import { useToast } from '@/composables';
+import { sanitizeHtml } from '@/utils/htmlUtils';
+import { useToast } from '@/composables/useToast';
 
 export default defineComponent({
 	name: 'PageAlert',
diff --git a/packages/editor-ui/src/components/PanelDragButton.vue b/packages/editor-ui/src/components/PanelDragButton.vue
index 58acc80d9f..e50d1cbeca 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 4ed650c55c..54f36b0738 100644
--- a/packages/editor-ui/src/components/ParameterInput.vue
+++ b/packages/editor-ui/src/components/ParameterInput.vue
@@ -1,8 +1,8 @@
 <template>
-	<div @keydown.stop :class="parameterInputClasses">
-		<expression-edit
-			:dialogVisible="expressionEditDialogVisible"
-			:modelValue="
+	<div :class="parameterInputClasses" @keydown.stop>
+		<ExpressionEdit
+			:dialog-visible="expressionEditDialogVisible"
+			:model-value="
 				isResourceLocatorParameter && typeof modelValue !== 'string'
 					? modelValue
 						? modelValue.value
@@ -11,30 +11,30 @@
 			"
 			:parameter="parameter"
 			:path="path"
-			:eventSource="eventSource || 'ndv'"
-			:isReadOnly="isReadOnly"
-			:redactValues="shouldRedactValue"
+			:event-source="eventSource || 'ndv'"
+			:is-read-only="isReadOnly"
+			:redact-values="shouldRedactValue"
 			@closeDialog="closeExpressionEditDialog"
-			@update:modelValue="expressionUpdated"
-		></expression-edit>
+			@update:model-value="expressionUpdated"
+		></ExpressionEdit>
 		<div class="parameter-input ignore-key-press" :style="parameterInputWrapperStyle">
-			<resource-locator
+			<ResourceLocator
 				v-if="isResourceLocatorParameter"
 				ref="resourceLocator"
 				:parameter="parameter"
-				:modelValue="modelValue"
-				:dependentParametersValues="dependentParametersValues"
-				:displayTitle="displayTitle"
-				:expressionDisplayValue="expressionDisplayValue"
-				:expressionComputedValue="expressionEvaluated"
-				:isValueExpression="isValueExpression"
-				:isReadOnly="isReadOnly"
-				:parameterIssues="getIssues"
+				:model-value="modelValue"
+				:dependent-parameters-values="dependentParametersValues"
+				:display-title="displayTitle"
+				:expression-display-value="expressionDisplayValue"
+				:expression-computed-value="expressionEvaluated"
+				:is-value-expression="isValueExpression"
+				:is-read-only="isReadOnly"
+				:parameter-issues="getIssues"
 				:droppable="droppable"
 				:node="node"
 				:path="path"
 				:event-bus="eventBus"
-				@update:modelValue="valueChanged"
+				@update:model-value="valueChanged"
 				@modalOpenerClick="openExpressionEditorModal"
 				@focus="setFocus"
 				@blur="onBlur"
@@ -42,17 +42,18 @@
 			/>
 			<ExpressionParameterInput
 				v-else-if="isValueExpression || forceShowExpression"
-				:modelValue="expressionDisplayValue"
+				ref="inputField"
+				:model-value="expressionDisplayValue"
 				:title="displayTitle"
-				:isReadOnly="isReadOnly"
+				:is-read-only="isReadOnly"
+				:is-single-line="isSingleLine"
 				:path="path"
 				:additional-expression-data="additionalExpressionData"
 				:class="{ 'ph-no-capture': shouldRedactValue }"
-				@update:modelValue="expressionUpdated"
+				@update:model-value="expressionUpdated"
 				@modalOpenerClick="openExpressionEditorModal"
 				@focus="setFocus"
 				@blur="onBlur"
-				ref="inputField"
 			/>
 			<div
 				v-else-if="
@@ -61,105 +62,206 @@
 				"
 			>
 				<el-dialog
-					v-if="codeEditDialogVisible"
-					:modelValue="true"
+					:model-value="codeEditDialogVisible"
 					append-to-body
-					:close-on-click-modal="false"
 					width="80%"
 					:title="`${i18n.baseText('codeEdit.edit')} ${$locale
 						.nodeText()
 						.inputLabelDisplayName(parameter, path)}`"
 					:before-close="closeCodeEditDialog"
+					data-test-id="code-editor-fullscreen"
 				>
-					<div class="ignore-key-press">
-						<code-node-editor
-							:modelValue="modelValue"
-							:defaultValue="parameter.default"
+					<div :key="codeEditDialogVisible" class="ignore-key-press code-edit-dialog">
+						<CodeNodeEditor
+							v-if="editorType === 'codeNodeEditor'"
+							:model-value="modelValue"
+							:default-value="parameter.default"
 							:language="editorLanguage"
-							:isReadOnly="isReadOnly"
-							@update:modelValue="expressionUpdated"
+							:is-read-only="isReadOnly"
+							fill-parent
+							@update:model-value="valueChangedDebounced"
+						/>
+						<HtmlEditor
+							v-else-if="editorType === 'htmlEditor'"
+							:model-value="modelValue"
+							:is-read-only="isReadOnly"
+							:rows="getArgument('rows')"
+							:disable-expression-coloring="!isHtmlNode(node)"
+							:disable-expression-completions="!isHtmlNode(node)"
+							fill-parent
+							@update:model-value="valueChangedDebounced"
+						/>
+						<SqlEditor
+							v-else-if="editorType === 'sqlEditor'"
+							:model-value="modelValue"
+							:dialect="getArgument('sqlDialect')"
+							:is-read-only="isReadOnly"
+							:rows="getArgument('rows')"
+							fill-parent
+							@update:model-value="valueChangedDebounced"
+						/>
+						<JsEditor
+							v-else-if="editorType === 'jsEditor'"
+							:model-value="modelValue"
+							:is-read-only="isReadOnly"
+							:rows="getArgument('rows')"
+							fill-parent
+							@update:model-value="valueChangedDebounced"
+						/>
+
+						<JsonEditor
+							v-else-if="parameter.type === 'json'"
+							:model-value="modelValue"
+							:is-read-only="isReadOnly"
+							:rows="getArgument('rows')"
+							fill-parent
+							@update:model-value="valueChangedDebounced"
 						/>
 					</div>
 				</el-dialog>
 
-				<text-edit
-					:dialogVisible="textEditDialogVisible"
-					:modelValue="modelValue"
+				<TextEdit
+					:dialog-visible="textEditDialogVisible"
+					:model-value="modelValue"
 					:parameter="parameter"
 					:path="path"
-					:isReadOnly="isReadOnly"
+					:is-read-only="isReadOnly"
 					@closeDialog="closeTextEditDialog"
-					@update:modelValue="expressionUpdated"
-				></text-edit>
+					@update:model-value="expressionUpdated"
+				></TextEdit>
 
-				<code-node-editor
+				<CodeNodeEditor
 					v-if="editorType === 'codeNodeEditor' && isCodeNode(node)"
+					:key="codeEditDialogVisible"
 					:mode="node.parameters.mode"
-					:modelValue="modelValue"
-					:defaultValue="parameter.default"
+					:model-value="modelValue"
+					:default-value="parameter.default"
 					:language="editorLanguage"
-					:isReadOnly="isReadOnly"
+					:is-read-only="isReadOnly"
 					:rows="getArgument('rows')"
-					:aiButtonEnabled="settingsStore.isCloudDeployment"
-					@update:modelValue="valueChangedDebounced"
-				/>
+					: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>
 
-				<html-editor
+				<HtmlEditor
 					v-else-if="editorType === 'htmlEditor'"
-					:modelValue="modelValue"
-					:isReadOnly="isReadOnly"
+					:key="codeEditDialogVisible"
+					:model-value="modelValue"
+					:is-read-only="isReadOnly"
 					:rows="getArgument('rows')"
-					:disableExpressionColoring="!isHtmlNode(node)"
-					:disableExpressionCompletions="!isHtmlNode(node)"
-					@update:modelValue="valueChangedDebounced"
-				/>
+					:disable-expression-coloring="!isHtmlNode(node)"
+					:disable-expression-completions="!isHtmlNode(node)"
+					@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>
 
-				<sql-editor
+				<SqlEditor
 					v-else-if="editorType === 'sqlEditor'"
-					:modelValue="modelValue"
+					:key="codeEditDialogVisible"
+					:model-value="modelValue"
 					:dialect="getArgument('sqlDialect')"
-					:isReadOnly="isReadOnly"
+					:is-read-only="isReadOnly"
 					:rows="getArgument('rows')"
-					@update:modelValue="valueChangedDebounced"
-				/>
+					@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>
 
-				<code-node-editor
-					v-else-if="editorType === 'json' && !isExecuteWorkflowNode(node)"
-					:mode="node.parameters.mode"
-					:modelValue="modelValue"
-					:defaultValue="parameter.default"
-					:language="editorLanguage"
-					:isReadOnly="isReadOnly"
-					:aiButtonEnabled="false"
-					@update:modelValue="valueChangedDebounced"
+				<JsEditor
+					v-else-if="editorType === 'jsEditor'"
+					:key="codeEditDialogVisible"
+					:model-value="modelValue"
+					:is-read-only="isReadOnly"
 					:rows="getArgument('rows')"
-				/>
+					@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="codeEditDialogVisible"
+					:model-value="modelValue"
+					:is-read-only="isReadOnly"
+					:rows="getArgument('rows')"
+					@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>
+				</JsonEditor>
 
 				<div v-else-if="editorType" class="readonly-code clickable" @click="displayEditDialog()">
-					<code-node-editor
+					<CodeNodeEditor
 						v-if="!codeEditDialogVisible"
-						:modelValue="modelValue"
+						:model-value="modelValue"
 						:language="editorLanguage"
-						:isReadOnly="true"
+						:is-read-only="true"
 						:rows="getArgument('rows')"
 					/>
 				</div>
 
 				<n8n-input
 					v-else
-					v-model="tempValue"
 					ref="inputField"
+					v-model="tempValue"
 					:class="{ 'input-with-opener': true, 'ph-no-capture': shouldRedactValue }"
 					:size="inputSize"
 					:type="getStringInputType"
 					:rows="getArgument('rows')"
 					:disabled="isReadOnly"
-					@update:modelValue="valueChanged($event) && onUpdateTextInput($event)"
+					:title="displayTitle"
+					:placeholder="getPlaceholder()"
+					@update:model-value="valueChanged($event) && onUpdateTextInput($event)"
 					@keydown.stop
 					@focus="setFocus"
 					@blur="onBlur"
-					:title="displayTitle"
-					:placeholder="getPlaceholder()"
 				>
 					<template #suffix>
 						<n8n-icon
@@ -183,34 +285,35 @@
 				<el-color-picker
 					size="small"
 					class="color-picker"
-					:modelValue="displayValue"
+					:model-value="displayValue"
 					:disabled="isReadOnly"
-					@focus="setFocus"
-					@blur="onBlur"
-					@update:modelValue="valueChanged"
 					:title="displayTitle"
 					:show-alpha="getArgument('showAlpha')"
+					@focus="setFocus"
+					@blur="onBlur"
+					@update:model-value="valueChanged"
 				/>
 				<n8n-input
 					v-model="tempValue"
 					:size="inputSize"
 					type="text"
 					:disabled="isReadOnly"
-					@update:modelValue="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"
-				:modelValue="displayValue"
+				:model-value="displayValue"
 				:title="displayTitle"
 				:disabled="isReadOnly"
 				:placeholder="
@@ -220,7 +323,7 @@
 				"
 				:picker-options="dateTimePickerOptions"
 				:class="{ 'ph-no-capture': shouldRedactValue }"
-				@update:modelValue="valueChanged"
+				@update:model-value="valueChanged"
 				@focus="setFocus"
 				@blur="onBlur"
 				@keydown.stop
@@ -230,62 +333,62 @@
 				v-else-if="parameter.type === 'number'"
 				ref="inputField"
 				:size="inputSize"
-				:modelValue="displayValue"
+				:model-value="displayValue"
 				:controls="false"
 				:max="getArgument('maxValue')"
 				:min="getArgument('minValue')"
 				:precision="getArgument('numberPrecision')"
 				:disabled="isReadOnly"
 				:class="{ 'ph-no-capture': shouldRedactValue }"
-				@update:modelValue="onUpdateTextInput"
+				: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"
+				:active-credential-type="activeCredentialType"
+				:input-size="inputSize"
+				:display-value="displayValue"
+				:is-read-only="isReadOnly"
+				:display-title="displayTitle"
 				@credentialSelected="credentialSelected"
-				@update:modelValue="valueChanged"
+				@update:model-value="valueChanged"
 				@setFocus="setFocus"
 				@onBlur="onBlur"
 			>
 				<template #issues-and-options>
-					<parameter-issues :issues="getIssues" />
+					<ParameterIssues :issues="getIssues" />
 				</template>
-			</credentials-select>
+			</CredentialsSelect>
 
 			<n8n-select
 				v-else-if="parameter.type === 'options'"
 				ref="inputField"
 				:size="inputSize"
 				filterable
-				:modelValue="displayValue"
+				:model-value="displayValue"
 				:placeholder="
 					parameter.placeholder ? getPlaceholder() : i18n.baseText('parameterInput.select')
 				"
 				:loading="remoteParameterOptionsLoading"
 				:disabled="isReadOnly || remoteParameterOptionsLoading"
 				:title="displayTitle"
-				@update:modelValue="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">
@@ -310,20 +413,20 @@
 				:size="inputSize"
 				filterable
 				multiple
-				:modelValue="displayValue"
+				:model-value="displayValue"
 				:loading="remoteParameterOptionsLoading"
 				:disabled="isReadOnly || remoteParameterOptionsLoading"
 				:title="displayTitle"
 				:placeholder="i18n.baseText('parameterInput.select')"
-				@update:modelValue="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">
@@ -341,22 +444,22 @@
 			<n8n-input
 				v-else-if="parameter.type === 'boolean' && droppable"
 				:size="inputSize"
-				:modelValue="JSON.stringify(displayValue)"
+				:model-value="JSON.stringify(displayValue)"
 				:disabled="isReadOnly"
 				:title="displayTitle"
 			/>
 			<el-switch
 				v-else-if="parameter.type === 'boolean'"
-				:class="{ 'switch-input': true, 'ph-no-capture': shouldRedactValue }"
 				ref="inputField"
+				:class="{ 'switch-input': true, 'ph-no-capture': shouldRedactValue }"
 				active-color="#13ce66"
-				:modelValue="displayValue"
+				:model-value="displayValue"
 				:disabled="isReadOnly"
-				@update:modelValue="valueChanged"
+				@update:model-value="valueChanged"
 			/>
 		</div>
 
-		<parameter-issues
+		<ParameterIssues
 			v-if="parameter.type !== 'credentialsSelect' && !isResourceLocatorParameter"
 			:issues="getIssues"
 		/>
@@ -394,21 +497,17 @@ import ExpressionParameterInput from '@/components/ExpressionParameterInput.vue'
 import TextEdit from '@/components/TextEdit.vue';
 import CodeNodeEditor from '@/components/CodeNodeEditor/CodeNodeEditor.vue';
 import HtmlEditor from '@/components/HtmlEditor/HtmlEditor.vue';
+import JsEditor from '@/components/JsEditor/JsEditor.vue';
+import JsonEditor from '@/components/JsonEditor/JsonEditor.vue';
 import SqlEditor from '@/components/SqlEditor/SqlEditor.vue';
-import { externalHooks } from '@/mixins/externalHooks';
-import { nodeHelpers } from '@/mixins/nodeHelpers';
-import { workflowHelpers } from '@/mixins/workflowHelpers';
-import { hasExpressionMapping, isValueExpression, isResourceLocatorValue } from '@/utils';
 
-import {
-	CUSTOM_API_CALL_KEY,
-	EXECUTE_WORKFLOW_NODE_TYPE,
-	HTML_NODE_TYPE,
-	NODES_USING_CODE_NODE_EDITOR,
-} from '@/constants';
+import { workflowHelpers } from '@/mixins/workflowHelpers';
+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 type { PropType } from 'vue';
-import { debounceHelper } from '@/mixins/debounce';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { useNDVStore } from '@/stores/ndv.store';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
@@ -417,15 +516,22 @@ import { useSettingsStore } from '@/stores/settings.store';
 import { htmlEditorEventBus } from '@/event-bus';
 import type { EventBus } from 'n8n-design-system/utils';
 import { createEventBus } from 'n8n-design-system/utils';
-import { useI18n } from '@/composables';
+import { useNodeHelpers } from '@/composables/useNodeHelpers';
+import { useI18n } from '@/composables/useI18n';
 import type { N8nInput } from 'n8n-design-system';
+import { isCredentialOnlyNodeType } from '@/utils/credentialOnlyNodes';
+import { useExternalHooks } from '@/composables/useExternalHooks';
+import { useDebounce } from '@/composables/useDebounce';
+
+type Picker = { $emit: (arg0: string, arg1: Date) => void };
 
 export default defineComponent({
-	name: 'parameter-input',
-	mixins: [externalHooks, nodeHelpers, workflowHelpers, debounceHelper],
+	name: 'ParameterInput',
 	components: {
 		CodeNodeEditor,
 		HtmlEditor,
+		JsEditor,
+		JsonEditor,
 		SqlEditor,
 		ExpressionEdit,
 		ExpressionParameterInput,
@@ -434,6 +540,7 @@ export default defineComponent({
 		ResourceLocator,
 		TextEdit,
 	},
+	mixins: [workflowHelpers],
 	props: {
 		additionalExpressionData: {
 			type: Object as PropType<IDataObject>,
@@ -442,6 +549,9 @@ export default defineComponent({
 		isReadOnly: {
 			type: Boolean,
 		},
+		isSingleLine: {
+			type: Boolean,
+		},
 		parameter: {
 			type: Object as PropType<INodeProperties>,
 		},
@@ -499,10 +609,16 @@ export default defineComponent({
 		},
 	},
 	setup() {
+		const externalHooks = useExternalHooks();
 		const i18n = useI18n();
+		const nodeHelpers = useNodeHelpers();
+		const { callDebounced } = useDebounce();
 
 		return {
+			externalHooks,
 			i18n,
+			nodeHelpers,
+			callDebounced,
 		};
 	},
 	data() {
@@ -524,14 +640,14 @@ export default defineComponent({
 					{
 						text: 'Today', // TODO
 
-						onClick(picker: any) {
+						onClick(picker: Picker) {
 							picker.$emit('pick', new Date());
 						},
 					},
 					{
 						text: 'Yesterday', // TODO
 
-						onClick(picker: any) {
+						onClick(picker: Picker) {
 							const date = new Date();
 							date.setTime(date.getTime() - 3600 * 1000 * 24);
 							picker.$emit('pick', date);
@@ -540,7 +656,7 @@ export default defineComponent({
 					{
 						text: 'A week ago', // TODO
 
-						onClick(picker: any) {
+						onClick(picker: Picker) {
 							const date = new Date();
 							date.setTime(date.getTime() - 3600 * 1000 * 24 * 7);
 							picker.$emit('pick', date);
@@ -632,7 +748,7 @@ export default defineComponent({
 			return this.i18n.baseText('parameterInput.parameter', interpolation);
 		},
 		displayValue(): string | number | boolean | null {
-			if (this.remoteParameterOptionsLoading === true) {
+			if (this.remoteParameterOptionsLoading) {
 				// 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
@@ -646,7 +762,7 @@ export default defineComponent({
 			}
 
 			let returnValue;
-			if (this.isValueExpression === false) {
+			if (!this.isValueExpression) {
 				returnValue = this.isResourceLocatorParameter
 					? isResourceLocatorValue(this.modelValue)
 						? this.modelValue.value
@@ -706,7 +822,7 @@ export default defineComponent({
 			return 'text';
 		},
 		getIssues(): string[] {
-			if (this.hideIssues === true || this.node === null) {
+			if (this.hideIssues || this.node === null) {
 				return [];
 			}
 
@@ -728,7 +844,7 @@ export default defineComponent({
 				issues.parameters[this.parameter.name] = [issue];
 			} else if (
 				['options', 'multiOptions'].includes(this.parameter.type) &&
-				this.remoteParameterOptionsLoading === false &&
+				!this.remoteParameterOptionsLoading &&
 				this.remoteParameterOptionsLoadingIssues === null &&
 				this.parameterOptions
 			) {
@@ -772,11 +888,7 @@ export default defineComponent({
 				];
 			}
 
-			if (
-				issues !== undefined &&
-				issues.parameters !== undefined &&
-				issues.parameters[this.parameter.name] !== undefined
-			) {
+			if (issues?.parameters?.[this.parameter.name] !== undefined) {
 				return issues.parameters[this.parameter.name];
 			}
 
@@ -792,7 +904,7 @@ export default defineComponent({
 		parameterOptions():
 			| Array<INodePropertyOptions | INodeProperties | INodePropertyCollection>
 			| undefined {
-			if (this.hasRemoteMethod === false) {
+			if (!this.hasRemoteMethod) {
 				// Options are already given
 				return this.parameter.options;
 			}
@@ -867,6 +979,58 @@ export default defineComponent({
 			return this.getStringInputType === 'password' || this.isForCredential;
 		},
 	},
+	async updated() {
+		await this.$nextTick();
+		const remoteParameterOptions = this.$el.querySelectorAll('.remote-parameter-option');
+
+		if (remoteParameterOptions.length > 0) {
+			void this.externalHooks.run('parameterInput.updated', { remoteParameterOptions });
+		}
+	},
+	mounted() {
+		this.eventBus.on('optionSelected', this.optionSelected);
+
+		this.tempValue = this.displayValue as string;
+		if (this.node !== null) {
+			this.nodeName = this.node.name;
+		}
+
+		if (this.node && this.node.parameters.authentication === 'predefinedCredentialType') {
+			this.activeCredentialType = this.node.parameters.nodeCredentialType as string;
+		}
+
+		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;
+			}
+		}
+
+		if (this.hasRemoteMethod && this.node !== null) {
+			// Make sure to load the parameter options
+			// directly and whenever the credentials change
+			this.$watch(
+				() => this.node?.credentials,
+				() => {
+					void this.loadRemoteParameterOptions();
+				},
+				{ immediate: true },
+			);
+		}
+
+		void this.externalHooks.run('parameterInput.mount', {
+			parameter: this.parameter,
+			inputFieldRef: this.$refs.inputField as InstanceType<typeof N8nInput>,
+		});
+	},
+	beforeUnmount() {
+		this.eventBus.off('optionSelected', this.optionSelected);
+	},
 	methods: {
 		isRemoteParameterOption(option: INodePropertyOptions) {
 			return this.remoteParameterOptionsKeys.includes(option.name);
@@ -879,10 +1043,10 @@ export default defineComponent({
 
 			if (node) {
 				// Update the issues
-				this.updateNodeCredentialIssues(node);
+				this.nodeHelpers.updateNodeCredentialIssues(node);
 			}
 
-			void this.$externalHooks().run('nodeSettings.credentialSelected', { updateInformation });
+			void this.externalHooks.run('nodeSettings.credentialSelected', { updateInformation });
 		},
 		/**
 		 * Check whether a param value must be skipped when collecting node param issues for validation.
@@ -909,7 +1073,7 @@ export default defineComponent({
 		async loadRemoteParameterOptions() {
 			if (
 				this.node === null ||
-				this.hasRemoteMethod === false ||
+				!this.hasRemoteMethod ||
 				this.remoteParameterOptionsLoading ||
 				!this.parameter
 			) {
@@ -965,7 +1129,7 @@ export default defineComponent({
 				return;
 			}
 
-			if ((this.node.type as string).startsWith('n8n-nodes-base')) {
+			if (this.node.type.startsWith('n8n-nodes-base') || isCredentialOnlyNodeType(this.node.type)) {
 				this.$telemetry.track('User opened Expression Editor', {
 					node_type: this.node.type,
 					parameter_name: this.parameter.displayName,
@@ -991,7 +1155,7 @@ export default defineComponent({
 				return;
 			}
 
-			if (this.editorType) {
+			if (this.editorType || this.parameter.type === 'json') {
 				this.codeEditDialogVisible = true;
 			} else {
 				this.textEditDialogVisible = true;
@@ -1057,14 +1221,9 @@ export default defineComponent({
 		isHtmlNode(node: INodeUi): boolean {
 			return node.type === HTML_NODE_TYPE;
 		},
-		isExecuteWorkflowNode(node: INodeUi): boolean {
-			return node.type === EXECUTE_WORKFLOW_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+)?)\)$/,
-			);
+			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;
@@ -1086,7 +1245,7 @@ export default defineComponent({
 			this.$emit('textInput', parameterData);
 		},
 		valueChangedDebounced(value: NodeParameterValueType | {} | Date) {
-			void this.callDebounced('valueChanged', { debounceTime: 100 }, value);
+			void this.callDebounced(this.valueChanged, { debounceTime: 100 }, value);
 		},
 		onUpdateTextInput(value: string) {
 			this.valueChanged(value);
@@ -1209,62 +1368,10 @@ export default defineComponent({
 					had_parameter: typeof prevValue === 'string' && prevValue.includes('$parameter'),
 				};
 				this.$telemetry.track('User switched parameter mode', telemetryPayload);
-				void this.$externalHooks().run('parameterInput.modeSwitch', telemetryPayload);
+				void this.externalHooks.run('parameterInput.modeSwitch', telemetryPayload);
 			}
 		},
 	},
-	async updated() {
-		await this.$nextTick();
-		const remoteParameterOptions = this.$el.querySelectorAll('.remote-parameter-option');
-
-		if (remoteParameterOptions.length > 0) {
-			void this.$externalHooks().run('parameterInput.updated', { remoteParameterOptions });
-		}
-	},
-	mounted() {
-		this.eventBus.on('optionSelected', this.optionSelected);
-
-		this.tempValue = this.displayValue as string;
-		if (this.node !== null) {
-			this.nodeName = this.node.name;
-		}
-
-		if (this.node && this.node.parameters.authentication === 'predefinedCredentialType') {
-			this.activeCredentialType = this.node.parameters.nodeCredentialType as string;
-		}
-
-		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;
-			}
-		}
-
-		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,
-				() => {
-					void this.loadRemoteParameterOptions();
-				},
-				{ immediate: true },
-			);
-		}
-
-		void this.$externalHooks().run('parameterInput.mount', {
-			parameter: this.parameter,
-			inputFieldRef: this.$refs['inputField'],
-		});
-	},
-	beforeUnmount() {
-		this.eventBus.off('optionSelected', this.optionSelected);
-	},
 });
 </script>
 
@@ -1308,7 +1415,7 @@ export default defineComponent({
 }
 
 .droppable {
-	--input-border-color: var(--color-secondary);
+	--input-border-color: var(--color-ndv-droppable-parameter);
 	--input-border-style: dashed;
 
 	textarea,
@@ -1376,11 +1483,15 @@ export default defineComponent({
 	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);
@@ -1406,4 +1517,12 @@ export default defineComponent({
 .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 20a0984eaa..2e117a9412 100644
--- a/packages/editor-ui/src/components/ParameterInputExpanded.vue
+++ b/packages/editor-ui/src/components/ParameterInputExpanded.vue
@@ -1,35 +1,35 @@
 <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"
+				:is-read-only="false"
+				:show-options="true"
+				:is-value-expression="isValueExpression"
 				@update:modelValue="optionSelected"
 				@menu-expanded="onMenuExpanded"
 			/>
 		</template>
-		<parameter-input-wrapper
+		<ParameterInputWrapper
 			ref="param"
-			inputSize="large"
+			input-size="large"
 			:parameter="parameter"
-			:modelValue="value"
+			:model-value="value"
 			:path="parameter.name"
-			:hideIssues="true"
-			:documentationUrl="documentationUrl"
-			:errorHighlight="showRequiredErrors"
-			:isForCredential="true"
-			:eventSource="eventSource"
+			:hide-issues="true"
+			:documentation-url="documentationUrl"
+			:error-highlight="showRequiredErrors"
+			:is-for-credential="true"
+			:event-source="eventSource"
 			:hint="!showRequiredErrors ? hint : ''"
 			:event-bus="eventBus"
 			@focus="onFocus"
@@ -37,7 +37,7 @@
 			@textInput="valueChanged"
 			@update="valueChanged"
 		/>
-		<div :class="$style.errors" v-if="showRequiredErrors">
+		<div v-if="showRequiredErrors" :class="$style.errors">
 			<n8n-text color="danger" size="small">
 				{{ $locale.baseText('parameterInputExpanded.thisFieldIsRequired') }}
 				<n8n-link
@@ -60,14 +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.store';
 import { createEventBus } from 'n8n-design-system/utils';
 
 export default defineComponent({
-	name: 'parameter-input-expanded',
+	name: 'ParameterInputExpanded',
 	components: {
 		ParameterOptions,
 		ParameterInputWrapper,
diff --git a/packages/editor-ui/src/components/ParameterInputFull.vue b/packages/editor-ui/src/components/ParameterInputFull.vue
index 85ad5b9408..d3a892e069 100644
--- a/packages/editor-ui/src/components/ParameterInputFull.vue
+++ b/packages/editor-ui/src/components/ParameterInputFull.vue
@@ -1,30 +1,31 @@
 <template>
 	<n8n-input-label
+		:class="$style.wrapper"
 		:label="hideLabel ? '' : i18n.nodeText().inputLabelDisplayName(parameter, path)"
-		:tooltipText="hideLabel ? '' : i18n.nodeText().inputLabelDescription(parameter, path)"
-		:showTooltip="focused"
-		:showOptions="menuExpanded || focused || forceShowExpression"
+		: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
-				v-if="displayOptions"
+		<template v-if="displayOptions && optionsPosition === 'top'" #options>
+			<ParameterOptions
 				:parameter="parameter"
 				:value="value"
-				:isReadOnly="isReadOnly"
-				:showOptions="displayOptions"
-				:showExpressionSelector="showExpressionSelector"
+				:is-read-only="isReadOnly"
+				:show-options="displayOptions"
+				:show-expression-selector="showExpressionSelector"
 				@update:modelValue="optionSelected"
 				@menu-expanded="onMenuExpanded"
 			/>
 		</template>
-		<draggable-target
+		<DraggableTarget
 			type="mapping"
 			:disabled="isDropDisabled"
 			:sticky="true"
-			:stickyOffset="isValueExpression ? [26, 3] : [3, 3]"
+			:sticky-offset="isValueExpression ? [26, 3] : [3, 3]"
 			@drop="onDrop"
 		>
 			<template #default="{ droppable, activeDrop }">
@@ -42,29 +43,48 @@
 							"
 						/>
 					</template>
-					<parameter-input-wrapper
+					<ParameterInputWrapper
 						ref="param"
 						:parameter="parameter"
-						:modelValue="value"
+						:model-value="value"
 						:path="path"
-						:isReadOnly="isReadOnly"
+						:is-read-only="isReadOnly"
+						:is-single-line="isSingleLine"
 						:droppable="droppable"
-						:activeDrop="activeDrop"
-						:forceShowExpression="forceShowExpression"
+						: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"
 						@textInput="onTextInput"
 						@focus="onFocus"
 						@blur="onBlur"
 						@drop="onDrop"
-						inputSize="small"
 					/>
 				</n8n-tooltip>
 			</template>
-		</draggable-target>
+		</DraggableTarget>
+		<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:modelValue="optionSelected"
+				@menu-expanded="onMenuExpanded"
+			/>
+		</div>
 	</n8n-input-label>
 </template>
 
@@ -77,37 +97,81 @@ import type { IN8nButton, INodeUi, IRunDataDisplayMode, IUpdateInformation } fro
 
 import ParameterOptions from '@/components/ParameterOptions.vue';
 import DraggableTarget from '@/components/DraggableTarget.vue';
-import { useI18n, useToast } from '@/composables';
-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 { useNDVStore } from '@/stores/ndv.store';
 import { useSegment } from '@/stores/segment.store';
-import { externalHooks } from '@/mixins/externalHooks';
 import { getMappedResult } from '@/utils/mappingUtils';
 import { createEventBus } from 'n8n-design-system/utils';
 
 const DISPLAY_MODES_WITH_DATA_MAPPING = ['table', 'json', 'schema'];
 
 export default defineComponent({
-	name: 'parameter-input-full',
-	mixins: [externalHooks],
+	name: 'ParameterInputFull',
 	components: {
 		ParameterOptions,
 		DraggableTarget,
 		ParameterInputWrapper,
 	},
+	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,
+		},
+		isSingleLine: {
+			type: Boolean,
+			default: false,
+		},
+		hideLabel: {
+			type: Boolean,
+			default: false,
+		},
+		hideIssues: {
+			type: Boolean,
+			default: false,
+		},
+		parameter: {
+			type: Object as PropType<INodeProperties>,
+		},
+		path: {
+			type: String,
+		},
+		value: {
+			type: [Number, String, Boolean, Array, Object] as PropType<NodeParameterValueType>,
+		},
+		label: {
+			type: Object as PropType<IParameterLabel>,
+			default: () => ({
+				size: 'small',
+			}),
+		},
+		entryIndex: {
+			type: Number,
+			default: undefined,
+		},
+	},
 	setup() {
 		const eventBus = createEventBus();
 		const i18n = useI18n();
@@ -127,39 +191,6 @@ export default defineComponent({
 			mappingTooltipEnabled: false,
 		};
 	},
-	props: {
-		displayOptions: {
-			type: Boolean,
-			default: false,
-		},
-		isReadOnly: {
-			type: Boolean,
-			default: false,
-		},
-		hideLabel: {
-			type: Boolean,
-			default: false,
-		},
-		hideIssues: {
-			type: Boolean,
-			default: false,
-		},
-		parameter: {
-			type: Object as PropType<INodeProperties>,
-		},
-		path: {
-			type: String,
-		},
-		value: {
-			type: [Number, String, Boolean, Array, Object] as PropType<INodeParameters>,
-		},
-		label: {
-			type: Object as PropType<IParameterLabel>,
-			default: () => ({
-				size: 'small',
-			}),
-		},
-	},
 	mounted() {
 		const mappingTooltipDismissHandler = this.onMappingTooltipDismissed.bind(this);
 		this.dataMappingTooltipButtons = [
@@ -341,3 +372,26 @@ export default defineComponent({
 	},
 });
 </script>
+
+<style module>
+.wrapper {
+	position: relative;
+
+	&:hover {
+		.options {
+			opacity: 1;
+		}
+	}
+}
+.options {
+	position: absolute;
+	bottom: -22px;
+	right: 0;
+	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 21b840693a..4f6ef5c1e7 100644
--- a/packages/editor-ui/src/components/ParameterInputHint.vue
+++ b/packages/editor-ui/src/components/ParameterInputHint.vue
@@ -1,5 +1,5 @@
 <template>
-	<n8n-text size="small" color="text-base" tag="div" v-if="hint">
+	<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
@@ -12,7 +12,7 @@
 
 <script lang="ts">
 import { defineComponent } from 'vue';
-import { sanitizeHtml } from '@/utils';
+import { sanitizeHtml } from '@/utils/htmlUtils';
 
 export default defineComponent({
 	name: 'InputHint',
@@ -31,9 +31,6 @@ export default defineComponent({
 			default: false,
 		},
 	},
-	methods: {
-		sanitizeHtml,
-	},
 	computed: {
 		classes() {
 			return {
@@ -59,6 +56,9 @@ export default defineComponent({
 			(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 f537730fa8..2b29a1458a 100644
--- a/packages/editor-ui/src/components/ParameterInputList.vue
+++ b/packages/editor-ui/src/components/ParameterInputList.vue
@@ -12,29 +12,25 @@
 				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"
+					:is-read-only="isReadOnly"
 					@valueChanged="valueChanged"
 				/>
 			</div>
 
-			<import-parameter
-				v-else-if="
-					parameter.type === 'curlImport' &&
-					nodeTypeName === 'n8n-nodes-base.httpRequest' &&
-					nodeTypeVersion >= 3
-				"
-				:isReadOnly="isReadOnly"
+			<ImportParameter
+				v-else-if="parameter.type === 'curlImport'"
+				:is-read-only="isReadOnly"
 				@valueChanged="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"
 			/>
@@ -52,94 +48,99 @@
 				v-else-if="['collection', 'fixedCollection'].includes(parameter.type)"
 				class="multi-parameter"
 			>
-				<div
-					class="delete-option clickable"
-					:title="$locale.baseText('parameterInputList.delete')"
+				<n8n-icon-button
 					v-if="hideDelete !== true && !isReadOnly"
-				>
-					<font-awesome-icon
-						icon="trash"
-						class="reset-icon clickable"
-						:title="$locale.baseText('parameterInputList.parameterOptions')"
-						@click="deleteOption(parameter.name)"
-					/>
-				</div>
+					type="tertiary"
+					text
+					size="mini"
+					icon="trash"
+					class="delete-option"
+					:title="$locale.baseText('parameterInputList.delete')"
+					@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"
 				/>
 				<Suspense>
-					<collection-parameter
+					<CollectionParameter
 						v-if="parameter.type === 'collection'"
 						: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"
+						:is-read-only="isReadOnly"
 						@valueChanged="valueChanged"
 					/>
-					<fixed-collection-parameter
+					<FixedCollectionParameter
 						v-else-if="parameter.type === 'fixedCollection'"
 						: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"
+						:is-read-only="isReadOnly"
 						@valueChanged="valueChanged"
 					/>
 				</Suspense>
 			</div>
-			<resource-mapper
+			<ResourceMapper
 				v-else-if="parameter.type === 'resourceMapper'"
 				:parameter="parameter"
 				:node="node"
 				:path="getPath(parameter.name)"
-				:dependentParametersValues="getDependentParametersValues(parameter)"
-				inputSize="small"
-				labelSize="small"
+				:dependent-parameters-values="getDependentParametersValues(parameter)"
+				input-size="small"
+				label-size="small"
 				@valueChanged="valueChanged"
 			/>
-			<div v-else-if="displayNodeParameter(parameter)" class="parameter-item">
-				<div
-					class="delete-option clickable"
-					:title="$locale.baseText('parameterInputList.delete')"
+			<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"
+				@valueChanged="valueChanged"
+			/>
+			<div
+				v-else-if="displayNodeParameter(parameter) && credentialsParameterIndex !== index"
+				class="parameter-item"
+			>
+				<n8n-icon-button
 					v-if="hideDelete !== true && !isReadOnly"
-				>
-					<font-awesome-icon
-						icon="trash"
-						class="reset-icon clickable"
-						:title="$locale.baseText('parameterInputList.deleteParameter')"
-						@click="deleteOption(parameter.name)"
-					/>
-				</div>
+					type="tertiary"
+					text
+					size="mini"
+					icon="trash"
+					class="delete-option"
+					:title="$locale.baseText('parameterInputList.delete')"
+					@click="deleteOption(parameter.name)"
+				></n8n-icon-button>
 
-				<parameter-input-full
+				<ParameterInputFull
 					:parameter="parameter"
 					:hide-issues="hiddenIssuesInputs.includes(parameter.name)"
-					:value="getParameterValue(nodeValues, parameter.name, path)"
-					:displayOptions="shouldShowOptions(parameter)"
+					:value="nodeHelpers.getParameterValue(nodeValues, parameter.name, path)"
+					:display-options="shouldShowOptions(parameter)"
 					:path="getPath(parameter.name)"
-					:isReadOnly="isReadOnly"
-					:hideLabel="false"
-					:nodeValues="nodeValues"
+					: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>
 </template>
 
 <script lang="ts">
-import { defineAsyncComponent, defineComponent } from 'vue';
-import type { PropType } from 'vue';
-import { mapStores } from 'pinia';
 import type {
 	INodeParameters,
 	INodeProperties,
@@ -147,20 +148,28 @@ import type {
 	NodeParameterValue,
 } from 'n8n-workflow';
 import { deepCopy } from 'n8n-workflow';
+import { mapStores } from 'pinia';
+import type { PropType } from 'vue';
+import { defineAsyncComponent, defineComponent } from 'vue';
 
 import type { INodeUi, IUpdateInformation } from '@/Interface';
 
-import MultipleParameter from '@/components/MultipleParameter.vue';
-import { workflowHelpers } from '@/mixins/workflowHelpers';
-import ParameterInputFull from '@/components/ParameterInputFull.vue';
 import ImportParameter from '@/components/ImportParameter.vue';
+import MultipleParameter from '@/components/MultipleParameter.vue';
+import ParameterInputFull from '@/components/ParameterInputFull.vue';
 import ResourceMapper from '@/components/ResourceMapper/ResourceMapper.vue';
-import { get, set } from 'lodash-es';
+import Conditions from '@/components/FilterConditions/FilterConditions.vue';
+import { KEEP_AUTH_IN_NDV_FOR_NODES } from '@/constants';
+import { workflowHelpers } from '@/mixins/workflowHelpers';
 import { useNDVStore } from '@/stores/ndv.store';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
-import { isAuthRelatedParameter, getNodeAuthFields, getMainAuthField } from '@/utils';
-import { KEEP_AUTH_IN_NDV_FOR_NODES } from '@/constants';
-import { nodeViewEventBus } from '@/event-bus';
+import {
+	getMainAuthField,
+	getNodeAuthFields,
+	isAuthRelatedParameter,
+} from '@/utils/nodeTypesUtils';
+import { get, set } from 'lodash-es';
+import { useNodeHelpers } from '@/composables/useNodeHelpers';
 
 const FixedCollectionParameter = defineAsyncComponent(
 	async () => import('./FixedCollectionParameter.vue'),
@@ -169,7 +178,6 @@ const CollectionParameter = defineAsyncComponent(async () => import('./Collectio
 
 export default defineComponent({
 	name: 'ParameterInputList',
-	mixins: [workflowHelpers],
 	components: {
 		MultipleParameter,
 		ParameterInputFull,
@@ -177,7 +185,9 @@ export default defineComponent({
 		CollectionParameter,
 		ImportParameter,
 		ResourceMapper,
+		FilterConditions: Conditions,
 	},
+	mixins: [workflowHelpers],
 	props: {
 		nodeValues: {
 			type: Object as PropType<INodeParameters>,
@@ -207,6 +217,17 @@ export default defineComponent({
 			type: Array as PropType<string[]>,
 			default: () => [],
 		},
+		entryIndex: {
+			type: Number,
+			default: undefined,
+		},
+	},
+	setup() {
+		const nodeHelpers = useNodeHelpers();
+
+		return {
+			nodeHelpers,
+		};
 	},
 	computed: {
 		...mapStores(useNodeTypesStore, useNDVStore),
@@ -242,7 +263,16 @@ export default defineComponent({
 		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
@@ -255,12 +285,32 @@ export default defineComponent({
 				}
 			});
 
-			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 || 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: {
 		onParameterBlur(parameterName: string) {
 			this.$emit('parameterBlur', parameterName);
@@ -336,7 +386,7 @@ export default defineComponent({
 			}
 
 			if (
-				this.isCustomApiCallSelected(this.nodeValues) &&
+				this.nodeHelpers.isCustomApiCallSelected(this.nodeValues) &&
 				this.mustHideDuringCustomApiCall(parameter, this.nodeValues)
 			) {
 				return false;
@@ -410,13 +460,13 @@ export default defineComponent({
 				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);
@@ -426,14 +476,16 @@ export default defineComponent({
 				this.$emit('activate');
 			}
 		},
+		/**
+		 * Handles default node button parameter type actions
+		 * @param parameter
+		 */
 		onButtonAction(parameter: INodeProperties) {
 			const action: string | undefined = parameter.typeOptions?.action;
 
 			switch (action) {
-				case 'openChat':
-					this.ndvStore.setActiveNodeName(null);
-					nodeViewEventBus.emit('openChat');
-					break;
+				default:
+					return;
 			}
 		},
 		isNodeAuthField(name: string): boolean {
@@ -473,41 +525,17 @@ export default defineComponent({
 			}
 		},
 	},
-	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);
-				}
-			}
-		},
-	},
 });
 </script>
 
 <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 {
@@ -518,11 +546,6 @@ export default defineComponent({
 		position: relative;
 		margin: var(--spacing-xs) 0;
 
-		.delete-option {
-			top: 0;
-			left: 0;
-		}
-
 		.parameter-info {
 			display: none;
 		}
@@ -531,15 +554,10 @@ export default defineComponent({
 	.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 {
diff --git a/packages/editor-ui/src/components/ParameterInputWrapper.vue b/packages/editor-ui/src/components/ParameterInputWrapper.vue
index 4318932e8f..a2e98626a6 100644
--- a/packages/editor-ui/src/components/ParameterInputWrapper.vue
+++ b/packages/editor-ui/src/components/ParameterInputWrapper.vue
@@ -1,23 +1,24 @@
 <template>
-	<div data-test-id="parameter-input">
-		<parameter-input
+	<div :class="$style.parameterInput" data-test-id="parameter-input">
+		<ParameterInput
 			ref="param"
-			:inputSize="inputSize"
+			:input-size="inputSize"
 			:parameter="parameter"
-			:modelValue="modelValue"
+			:model-value="modelValue"
 			:path="path"
-			:isReadOnly="isReadOnly"
+			:is-read-only="isReadOnly"
 			:droppable="droppable"
-			:activeDrop="activeDrop"
-			:forceShowExpression="forceShowExpression"
-			:hideIssues="hideIssues"
-			:documentationUrl="documentationUrl"
-			:errorHighlight="errorHighlight"
-			:isForCredential="isForCredential"
-			:eventSource="eventSource"
-			:expressionEvaluated="expressionValueComputed"
-			:additionalExpressionData="resolvedAdditionalExpressionData"
+			: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="expressionValueComputed"
+			:additional-expression-data="resolvedAdditionalExpressionData"
 			:label="label"
+			:is-single-line="isSingleLine"
 			:data-test-id="`parameter-input-${parsedParameterName}`"
 			:event-bus="eventBus"
 			@focus="onFocus"
@@ -26,20 +27,20 @@
 			@textInput="onTextInput"
 			@update="onValueChanged"
 		/>
-		<input-hint
-			v-if="expressionOutput"
-			:class="{ [$style.hint]: true, 'ph-no-capture': isForCredential }"
-			data-test-id="parameter-expression-preview"
-			:highlight="!!(expressionOutput && targetItem) && isInputParentOfActiveNode"
-			:hint="expressionOutput"
-			:singleLine="true"
-		/>
-		<input-hint
-			v-else-if="parameterHint"
-			:class="$style.hint"
-			:renderHTML="true"
-			:hint="parameterHint"
-		/>
+		<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>
 
@@ -61,20 +62,21 @@ import type {
 import { isResourceLocatorValue } from 'n8n-workflow';
 import type { INodeUi, IUpdateInformation, TargetItem } from '@/Interface';
 import { workflowHelpers } from '@/mixins/workflowHelpers';
-import { isValueExpression, parseResourceMapperFieldName } from '@/utils';
+import { isValueExpression, parseResourceMapperFieldName } from '@/utils/nodeTypesUtils';
 import { useNDVStore } from '@/stores/ndv.store';
-import { useEnvironmentsStore, useExternalSecretsStore } from '@/stores';
+import { useEnvironmentsStore } from '@/stores/environments.ee.store';
+import { useExternalSecretsStore } from '@/stores/externalSecrets.ee.store';
 
 import type { EventBus } from 'n8n-design-system/utils';
 import { createEventBus } from 'n8n-design-system/utils';
 
 export default defineComponent({
-	name: 'parameter-input-wrapper',
-	mixins: [workflowHelpers],
+	name: 'ParameterInputWrapper',
 	components: {
 		ParameterInput,
 		InputHint,
 	},
+	mixins: [workflowHelpers],
 	props: {
 		additionalExpressionData: {
 			type: Object as PropType<IDataObject>,
@@ -83,6 +85,9 @@ export default defineComponent({
 		isReadOnly: {
 			type: Boolean,
 		},
+		isSingleLine: {
+			type: Boolean,
+		},
 		parameter: {
 			type: Object as PropType<INodeProperties>,
 		},
@@ -105,6 +110,10 @@ export default defineComponent({
 			type: String,
 			required: false,
 		},
+		hideHint: {
+			type: Boolean,
+			required: false,
+		},
 		inputSize: {
 			type: String,
 		},
@@ -162,7 +171,7 @@ export default defineComponent({
 			if (this.isValueExpression) {
 				return undefined;
 			}
-			if (this.selectedRLMode && this.selectedRLMode.hint) {
+			if (this.selectedRLMode?.hint) {
 				return this.selectedRLMode.hint;
 			}
 
@@ -251,8 +260,10 @@ export default defineComponent({
 </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 8cbb73cb95..6e6388cdbf 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']" data-test-id="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 934457803e..248d65e1b0 100644
--- a/packages/editor-ui/src/components/ParameterOptions.vue
+++ b/packages/editor-ui/src/components/ParameterOptions.vue
@@ -17,9 +17,9 @@
 					placement="bottom-end"
 					size="small"
 					color="foreground-xdark"
-					iconSize="small"
+					icon-size="small"
 					:actions="actions"
-					:iconOrientation="iconOrientation"
+					:icon-orientation="iconOrientation"
 					@action="(action) => $emit('update:modelValue', action)"
 					@visible-change="onMenuToggle"
 				/>
@@ -27,7 +27,7 @@
 			<n8n-radio-buttons
 				v-if="shouldShowExpressionSelector"
 				size="small"
-				:modelValue="selectedView"
+				:model-value="selectedView"
 				:disabled="isReadOnly"
 				:options="[
 					{ label: $locale.baseText('parameterInput.fixed'), value: 'fixed' },
@@ -43,11 +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,
@@ -100,7 +101,7 @@ export default defineComponent({
 			return this.parameter.noDataExpression !== true && this.showExpressionSelector;
 		},
 		shouldShowOptions(): boolean {
-			if (this.isReadOnly === true) {
+			if (this.isReadOnly) {
 				return false;
 			}
 
@@ -112,7 +113,7 @@ export default defineComponent({
 				return false;
 			}
 
-			if (this.showOptions === true) {
+			if (this.showOptions) {
 				return true;
 			}
 
diff --git a/packages/editor-ui/src/components/PersonalizationModal.vue b/packages/editor-ui/src/components/PersonalizationModal.vue
index b3566d424c..1c5ce8e07b 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,22 +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"
-					tagSize="small"
+					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>
@@ -128,46 +143,91 @@ import {
 	VIEWS,
 } from '@/constants';
 import { workflowHelpers } from '@/mixins/workflowHelpers';
-import { useToast } from '@/composables';
+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 { 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';
+import { usePostHog } from '@/stores/posthog.store';
+import { useExternalHooks } from '@/composables/useExternalHooks';
+import { useUsageStore } from '@/stores/usage.store';
+import { useMessage } from '@/composables/useMessage';
 
 export default defineComponent({
 	name: 'PersonalizationModal',
-	mixins: [workflowHelpers],
 	components: { Modal },
+	mixins: [workflowHelpers],
 	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(),
 		};
 	},
-	setup() {
-		return {
-			...useToast(),
-		};
-	},
 	computed: {
-		...mapStores(useRootStore, useSettingsStore, useUIStore, useUsersStore, usePostHog),
+		...mapStores(
+			useRootStore,
+			useSettingsStore,
+			useUIStore,
+			useUsersStore,
+			useUsageStore,
+			usePostHog,
+		),
+		currentUser() {
+			return this.usersStore.currentUser;
+		},
+		canRegisterForEnterpriseTrial() {
+			if (this.settingsStore.isCloudDeployment) {
+				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 emailDomainParts = emailDomain.split('.');
+			const isEmailEligible = ![
+				'gmail',
+				'yahoo',
+				'hotmail',
+				'aol',
+				'live',
+				'outlook',
+				'icloud',
+				'mail',
+				'email',
+			].find((provider) => emailDomainParts.includes(provider));
+
+			return isSizeEligible && isEmailEligible;
+		},
 		survey() {
 			const survey: IFormInputs = [
 				{
@@ -642,7 +702,10 @@ export default defineComponent({
 					personalization_survey_n8n_version: this.rootStore.versionCli,
 				};
 
-				await this.$externalHooks().run('personalizationModal.onSubmit', survey);
+				await this.externalHooks.run(
+					'personalizationModal.onSubmit',
+					survey as IPersonalizationLatestVersion,
+				);
 
 				await this.usersStore.submitPersonalizationSurvey(survey as IPersonalizationLatestVersion);
 
@@ -657,8 +720,35 @@ export default defineComponent({
 				this.showError(e, 'Error while submitting results');
 			}
 
+			let licenseRequestSucceeded = false;
+			try {
+				if (this.registerForEnterpriseTrial && this.canRegisterForEnterpriseTrial) {
+					await this.usageStore.requestEnterpriseLicenseTrial();
+					licenseRequestSucceeded = true;
+				}
+			} 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 (
diff --git a/packages/editor-ui/src/components/PushConnectionTracker.vue b/packages/editor-ui/src/components/PushConnectionTracker.vue
index 5722c1500b..fb55b39c20 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>
diff --git a/packages/editor-ui/src/components/RBAC.vue b/packages/editor-ui/src/components/RBAC.vue
new file mode 100644
index 0000000000..042cd6a888
--- /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 4cb9f98b3e..27b49a9d1d 100644
--- a/packages/editor-ui/src/components/ResourceLocator/ResourceLocator.vue
+++ b/packages/editor-ui/src/components/ResourceLocator/ResourceLocator.vue
@@ -1,23 +1,23 @@
 <template>
 	<div
-		class="resource-locator"
 		ref="container"
+		class="resource-locator"
 		:data-test-id="`resource-locator-${parameter.name}`"
 	>
-		<resource-locator-dropdown
+		<ResourceLocatorDropdown
 			ref="dropdown"
-			:modelValue="modelValue ? modelValue.value : ''"
+			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"
 			:event-bus="eventBus"
-			v-on-click-outside="hideResourceDropdown"
 			@update:modelValue="onListItemSelected"
 			@filter="onSearchFilter"
 			@loadMore="loadResourcesDebounced"
@@ -27,7 +27,7 @@
 					<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 || credentialsNotSet">
+					<n8n-text v-if="hasCredential || credentialsNotSet" size="small" color="text-base">
 						{{ $locale.baseText('resourceLocator.mode.list.error.description.part1') }}
 						<a v-if="credentialsNotSet" @click="createNewCredential">{{
 							$locale.baseText('resourceLocator.mode.list.error.description.part2.noCredentials')
@@ -46,13 +46,13 @@
 			>
 				<div v-if="hasMultipleModes" :class="$style.modeSelector">
 					<n8n-select
-						:modelValue="selectedMode"
+						:model-value="selectedMode"
 						filterable
 						:size="inputSize"
 						:disabled="isReadOnly"
-						@update:modelValue="onModeSelected"
 						:placeholder="$locale.baseText('resourceLocator.modeSelector.placeholder')"
 						data-test-id="rlc-mode-selector"
+						@update:modelValue="onModeSelected"
 					>
 						<n8n-option
 							v-for="mode in parameter.modes"
@@ -72,11 +72,11 @@
 				</div>
 
 				<div :class="$style.inputContainer" data-test-id="rlc-input-container">
-					<draggable-target
+					<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 }">
@@ -90,24 +90,24 @@
 							>
 								<ExpressionParameterInput
 									v-if="isValueExpression || forceShowExpression"
-									:modelValue="expressionDisplayValue"
+									ref="input"
+									:model-value="expressionDisplayValue"
 									:path="path"
-									isForRecordLocator
+									is-single-line
 									@update:modelValue="onInputChange"
 									@modalOpenerClick="$emit('modalOpenerClick')"
-									ref="input"
 								/>
 								<n8n-input
 									v-else
+									ref="input"
 									:class="{ [$style.selectInput]: isListMode }"
 									:size="inputSize"
-									:modelValue="valueToDisplay"
+									:model-value="valueToDisplay"
 									:disabled="isReadOnly"
 									:readonly="isListMode"
 									:title="displayTitle"
 									:placeholder="inputPlaceholder"
 									type="text"
-									ref="input"
 									data-test-id="rlc-input"
 									@update:modelValue="onInputChange"
 									@focus="onInputFocus"
@@ -126,8 +126,8 @@
 								</n8n-input>
 							</div>
 						</template>
-					</draggable-target>
-					<parameter-issues
+					</DraggableTarget>
+					<ParameterIssues
 						v-if="parameterIssues && parameterIssues.length"
 						:issues="parameterIssues"
 						:class="$style['parameter-issues']"
@@ -139,7 +139,7 @@
 					</div>
 				</div>
 			</div>
-		</resource-locator-dropdown>
+		</ResourceLocatorDropdown>
 	</div>
 </template>
 
@@ -148,25 +148,18 @@ import type { IResourceLocatorReqParams, IResourceLocatorResultExpanded } from '
 import DraggableTarget from '@/components/DraggableTarget.vue';
 import ExpressionParameterInput from '@/components/ExpressionParameterInput.vue';
 import ParameterIssues from '@/components/ParameterIssues.vue';
-import { debounceHelper } from '@/mixins/debounce';
-import { nodeHelpers } from '@/mixins/nodeHelpers';
 import { workflowHelpers } from '@/mixins/workflowHelpers';
 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,
-	isResourceLocatorValue,
-} from '@/utils';
+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,
@@ -180,6 +173,7 @@ import { mapStores } from 'pinia';
 import type { PropType } from 'vue';
 import { defineComponent } from 'vue';
 import ResourceLocatorDropdown from './ResourceLocatorDropdown.vue';
+import { useDebounce } from '@/composables/useDebounce';
 
 interface IResourceLocatorQuery {
 	results: INodeListSearchItems[];
@@ -189,14 +183,14 @@ interface IResourceLocatorQuery {
 }
 
 export default defineComponent({
-	name: 'resource-locator',
-	mixins: [debounceHelper, workflowHelpers, nodeHelpers],
+	name: 'ResourceLocator',
 	components: {
 		DraggableTarget,
 		ExpressionParameterInput,
 		ParameterIssues,
 		ResourceLocatorDropdown,
 	},
+	mixins: [workflowHelpers],
 	props: {
 		parameter: {
 			type: Object as PropType<INodeProperties>,
@@ -273,6 +267,11 @@ export default defineComponent({
 			width: 0,
 		};
 	},
+	setup() {
+		const { callDebounced } = useDebounce();
+
+		return { callDebounced };
+	},
 	computed: {
 		...mapStores(useNodeTypesStore, useNDVStore, useRootStore, useUIStore, useWorkflowsStore),
 		appName(): string {
@@ -303,7 +302,7 @@ export default defineComponent({
 			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);
@@ -350,7 +349,7 @@ export default defineComponent({
 		},
 		urlValue(): string | null {
 			if (this.isListMode && typeof this.modelValue === 'object') {
-				return (this.modelValue && this.modelValue.cachedResultUrl) || null;
+				return this.modelValue?.cachedResultUrl || null;
 			}
 
 			if (this.selectedMode === 'url') {
@@ -394,7 +393,7 @@ export default defineComponent({
 			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];
 					}
 
@@ -418,7 +417,7 @@ export default defineComponent({
 			);
 		},
 		currentQueryHasMore(): boolean {
-			return !!(this.currentResponse && this.currentResponse.nextPageToken);
+			return !!this.currentResponse?.nextPageToken;
 		},
 		currentQueryLoading(): boolean {
 			if (this.requiresSearchFilter && this.searchFilter === '') {
@@ -449,14 +448,13 @@ export default defineComponent({
 			}
 		},
 		isValueExpression(newValue: boolean) {
-			if (newValue === true) {
+			if (newValue) {
 				this.switchFromListMode();
 			}
 		},
 		currentMode(mode: INodePropertyMode) {
 			if (
-				mode.extractValue &&
-				mode.extractValue.regex &&
+				mode.extractValue?.regex &&
 				isResourceLocatorValue(this.modelValue) &&
 				this.modelValue.__regex !== mode.extractValue.regex
 			) {
@@ -546,7 +544,7 @@ export default defineComponent({
 		},
 		openCredential(): void {
 			const node = this.ndvStore.activeNode;
-			if (!node || !node.credentials) {
+			if (!node?.credentials) {
 				return;
 			}
 			const credentialKey = Object.keys(node.credentials)[0];
@@ -585,11 +583,11 @@ export default defineComponent({
 			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;
 				}
 			}
@@ -598,7 +596,7 @@ export default defineComponent({
 		onModeSelected(value: string): void {
 			if (typeof this.modelValue !== 'object') {
 				this.$emit('update:modelValue', { __rl: true, value: this.modelValue, mode: value });
-			} else if (value === 'url' && this.modelValue && this.modelValue.cachedResultUrl) {
+			} else if (value === 'url' && this.modelValue?.cachedResultUrl) {
 				this.$emit('update:modelValue', {
 					__rl: true,
 					mode: value,
@@ -621,9 +619,9 @@ export default defineComponent({
 			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,
 			});
@@ -643,7 +641,10 @@ export default defineComponent({
 			}
 		},
 		loadResourcesDebounced() {
-			void this.callDebounced('loadResources', { debounceTime: 1000, trailing: true });
+			void this.callDebounced(this.loadResources, {
+				debounceTime: 1000,
+				trailing: true,
+			});
 		},
 		setResponse(paramsKey: string, props: Partial<IResourceLocatorQuery>) {
 			this.cachedResponses = {
@@ -689,9 +690,6 @@ export default defineComponent({
 				const loadOptionsMethod = this.getPropertyArgument(this.currentMode, 'searchListMethod') as
 					| string
 					| undefined;
-				const searchList = this.getPropertyArgument(this.currentMode, 'searchList') as
-					| ILoadOptions
-					| undefined;
 
 				const requestParams: IResourceLocatorReqParams = {
 					nodeTypeAndVersion: {
@@ -700,7 +698,6 @@ export default defineComponent({
 					},
 					path: this.path,
 					methodName: loadOptionsMethod,
-					searchList,
 					currentNodeParameters: resolvedNodeParameters,
 					credentials: this.node.credentials,
 					...(params.filter ? { filter: params.filter } : {}),
diff --git a/packages/editor-ui/src/components/ResourceLocator/ResourceLocatorDropdown.vue b/packages/editor-ui/src/components/ResourceLocator/ResourceLocatorDropdown.vue
index e773b0f023..a6444287a0 100644
--- a/packages/editor-ui/src/components/ResourceLocator/ResourceLocatorDropdown.vue
+++ b/packages/editor-ui/src/components/ResourceLocator/ResourceLocatorDropdown.vue
@@ -1,24 +1,23 @@
 <template>
 	<n8n-popover
 		placement="bottom"
-		:teleported="false"
 		:width="width"
 		:popper-class="$style.popover"
 		:visible="show"
 		trigger="manual"
 		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
-				:modelValue="filter"
-				:clearable="true"
-				@update:modelValue="onFilterInput"
 				ref="search"
+				:model-value="filter"
+				:clearable="true"
 				:placeholder="$locale.baseText('resourceLocator.search.placeholder')"
 				data-test-id="rlc-search"
+				@update:modelValue="onFilterInput"
 			>
 				<template #prefix>
 					<font-awesome-icon :class="$style.searchIcon" icon="search" />
@@ -29,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>
@@ -43,6 +42,7 @@
 			<div
 				v-for="(result, i) in sortedResources"
 				:key="result.value"
+				:ref="`item-${i}`"
 				:class="{
 					[$style.resourceItem]: true,
 					[$style.selected]: result.value === modelValue,
@@ -52,7 +52,6 @@
 				@click="() => onItemClick(result.value)"
 				@mouseenter="() => onItemHover(i)"
 				@mouseleave="() => onItemHoverLeave()"
-				:ref="`item-${i}`"
 			>
 				<div :class="$style.resourceNameContainer">
 					<span>{{ result.name }}</span>
@@ -89,7 +88,7 @@ const SEARCH_BAR_HEIGHT_PX = 40;
 const SCROLL_MARGIN_PX = 10;
 
 export default defineComponent({
-	name: 'resource-locator-dropdown',
+	name: 'ResourceLocatorDropdown',
 	props: {
 		modelValue: {
 			type: [String, Number],
@@ -133,12 +132,6 @@ export default defineComponent({
 			showHoverUrl: false,
 		};
 	},
-	mounted() {
-		this.eventBus.on('keyDown', this.onKeyDown);
-	},
-	beforeUnmount() {
-		this.eventBus.off('keyDown', this.onKeyDown);
-	},
 	computed: {
 		sortedResources(): IResourceLocatorResultExpanded[] {
 			const seen = new Set();
@@ -170,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();
@@ -246,23 +262,6 @@ export default defineComponent({
 			}
 		},
 	},
-	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
-		},
-	},
 });
 </script>
 
diff --git a/packages/editor-ui/src/components/ResourceMapper/MappingFields.vue b/packages/editor-ui/src/components/ResourceMapper/MappingFields.vue
index 1ba56e0bcd..ae55093b83 100644
--- a/packages/editor-ui/src/components/ResourceMapper/MappingFields.vue
+++ b/packages/editor-ui/src/components/ResourceMapper/MappingFields.vue
@@ -14,9 +14,13 @@ 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';
-import { fieldCannotBeDeleted, isMatchingField, parseResourceMapperFieldName } from '@/utils';
-import { useNodeSpecificationValues } from '@/composables';
+import { useNDVStore } from '@/stores/ndv.store';
+import {
+	fieldCannotBeDeleted,
+	isMatchingField,
+	parseResourceMapperFieldName,
+} from '@/utils/nodeTypesUtils';
+import { useNodeSpecificationValues } from '@/composables/useNodeSpecificationValues';
 
 interface Props {
 	parameter: INodeProperties;
@@ -65,7 +69,7 @@ function markAsReadOnly(field: ResourceMapperField): boolean {
 
 const fieldsUi = computed<Array<Partial<INodeProperties> & { readOnly?: boolean }>>(() => {
 	return props.fieldsToMap
-		.filter((field) => field.display !== false && field.removed !== true)
+		.filter((field) => field.display && field.removed !== true)
 		.map((field) => {
 			return {
 				displayName: getFieldLabel(field),
@@ -98,7 +102,7 @@ const orderedFields = computed<Array<Partial<INodeProperties> & { readOnly?: boo
 });
 
 const removedFields = computed<ResourceMapperField[]>(() => {
-	return props.fieldsToMap.filter((field) => field.removed === true && field.display !== false);
+	return props.fieldsToMap.filter((field) => field.removed === true && field.display);
 });
 
 const addFieldOptions = computed<Array<{ name: string; value: string; disabled?: boolean }>>(() => {
@@ -132,7 +136,7 @@ const parameterActions = computed<Array<{ label: string; value: string; disabled
 					interpolate: { fieldWord: pluralFieldWordCapitalized.value },
 				}),
 				value: 'removeAllFields',
-				disabled: isRemoveAllAvailable.value === false,
+				disabled: !isRemoveAllAvailable.value,
 			},
 		];
 	},
@@ -229,8 +233,8 @@ function getFieldIssues(field: INodeProperties): string[] {
 
 	let fieldIssues: string[] = [];
 	const key = `${props.parameter.name}.${fieldName}`;
-	if (nodeIssues['parameters'] && key in nodeIssues['parameters']) {
-		fieldIssues = fieldIssues.concat(nodeIssues['parameters'][key]);
+	if (nodeIssues.parameters && key in nodeIssues.parameters) {
+		fieldIssues = fieldIssues.concat(nodeIssues.parameters[key]);
 	}
 	return fieldIssues;
 }
@@ -285,17 +289,17 @@ defineExpose({
 			:label="valuesLabel"
 			:underline="true"
 			:size="labelSize"
-			:showOptions="true"
-			:showExpressionSelector="false"
-			inputName="columns"
+			:show-options="true"
+			:show-expression-selector="false"
+			input-name="columns"
 			color="text-dark"
 		>
 			<template #options>
-				<parameter-options
+				<ParameterOptions
 					:parameter="parameter"
-					:customActions="parameterActions"
+					:custom-actions="parameterActions"
 					:loading="props.refreshInProgress"
-					:loadingMessage="fetchingFieldsLabel"
+					:loading-message="fetchingFieldsLabel"
 					@update:modelValue="onParameterActionSelected"
 				/>
 			</template>
@@ -337,10 +341,14 @@ defineExpose({
 						props.showMatchingColumnsSelector,
 					)
 				"
-				:class="['delete-option', 'clickable', 'mt-5xs']"
+				:class="['delete-option', 'mt-5xs']"
 			>
-				<font-awesome-icon
+				<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: {
@@ -348,24 +356,23 @@ defineExpose({
 							},
 						})
 					"
-					:data-test-id="`remove-field-button-${getParsedFieldName(field.name)}`"
 					@click="removeField(field.name)"
-				/>
+				></n8n-icon-button>
 			</div>
 			<div :class="$style.parameterInput">
-				<parameter-input-full
+				<ParameterInputFull
 					:parameter="field"
 					:value="getParameterValue(field.name)"
-					:displayOptions="true"
+					:display-options="true"
 					:path="`${props.path}.${field.name}`"
-					:isReadOnly="refreshInProgress || field.readOnly"
-					:hideIssues="true"
-					:nodeValues="nodeValues"
+					:is-read-only="refreshInProgress || field.readOnly"
+					:hide-issues="true"
+					:node-values="nodeValues"
 					:class="$style.parameterInputFull"
 					@update="onValueChanged"
 				/>
 			</div>
-			<parameter-issues
+			<ParameterIssues
 				v-if="getFieldIssues(field).length > 0"
 				:issues="getFieldIssues(field)"
 				:class="[$style.parameterIssues, 'ml-5xs']"
diff --git a/packages/editor-ui/src/components/ResourceMapper/MappingModeSelect.vue b/packages/editor-ui/src/components/ResourceMapper/MappingModeSelect.vue
index b37cdb5c1c..4f070a8da1 100644
--- a/packages/editor-ui/src/components/ResourceMapper/MappingModeSelect.vue
+++ b/packages/editor-ui/src/components/ResourceMapper/MappingModeSelect.vue
@@ -2,7 +2,7 @@
 import type { INodePropertyTypeOptions, ResourceMapperFields } from 'n8n-workflow';
 import { computed, ref, watch } from 'vue';
 import { i18n as locale } from '@/plugins/i18n';
-import { useNodeSpecificationValues } from '@/composables';
+import { useNodeSpecificationValues } from '@/composables/useNodeSpecificationValues';
 
 interface Props {
 	initialValue: string;
@@ -112,7 +112,7 @@ defineExpose({
 		>
 			<div class="mt-5xs">
 				<n8n-select
-					:modelValue="selected"
+					:model-value="selected"
 					:teleported="teleported"
 					:size="props.inputSize"
 					@update:modelValue="onModeChanged"
diff --git a/packages/editor-ui/src/components/ResourceMapper/MatchingColumnsSelect.vue b/packages/editor-ui/src/components/ResourceMapper/MatchingColumnsSelect.vue
index 70fc0cd745..da4cb8d45f 100644
--- a/packages/editor-ui/src/components/ResourceMapper/MatchingColumnsSelect.vue
+++ b/packages/editor-ui/src/components/ResourceMapper/MatchingColumnsSelect.vue
@@ -7,7 +7,7 @@ import type {
 } from 'n8n-workflow';
 import { computed, reactive, watch } from 'vue';
 import { i18n as locale } from '@/plugins/i18n';
-import { useNodeSpecificationValues } from '@/composables';
+import { useNodeSpecificationValues } from '@/composables/useNodeSpecificationValues';
 import ParameterOptions from '@/components/ParameterOptions.vue';
 
 interface Props {
@@ -59,7 +59,7 @@ const emit = defineEmits<{
 
 const availableMatchingFields = computed<ResourceMapperField[]>(() => {
 	return props.fieldsToMap.filter((field) => {
-		return (field.canBeUsedToMatch || field.defaultMatch) && field.display !== false;
+		return (field.canBeUsedToMatch || field.defaultMatch) && field.display;
 	});
 });
 
@@ -170,24 +170,24 @@ defineExpose({
 		<n8n-input-label
 			v-if="availableMatchingFields.length > 0"
 			:label="fieldLabel"
-			:tooltipText="fieldTooltip"
+			:tooltip-text="fieldTooltip"
 			:bold="false"
 			:required="false"
 			:size="labelSize"
 			color="text-dark"
 		>
 			<template #options>
-				<parameter-options
+				<ParameterOptions
 					:parameter="parameter"
-					:customActions="parameterActions"
+					:custom-actions="parameterActions"
 					:loading="props.refreshInProgress"
-					:loadingMessage="fetchingFieldsLabel"
+					:loading-message="fetchingFieldsLabel"
 					@update:modelValue="onParameterActionSelected"
 				/>
 			</template>
 			<n8n-select
 				:multiple="resourceMapperTypeOptions?.multiKeyMatch === true"
-				:modelValue="state.selected"
+				:model-value="state.selected"
 				:size="props.inputSize"
 				:disabled="loading"
 				:teleported="teleported"
diff --git a/packages/editor-ui/src/components/ResourceMapper/ResourceMapper.vue b/packages/editor-ui/src/components/ResourceMapper/ResourceMapper.vue
index a794048fff..cfb17dbcb2 100644
--- a/packages/editor-ui/src/components/ResourceMapper/ResourceMapper.vue
+++ b/packages/editor-ui/src/components/ResourceMapper/ResourceMapper.vue
@@ -15,7 +15,8 @@ import { computed, onMounted, reactive, watch } from 'vue';
 import MappingModeSelect from './MappingModeSelect.vue';
 import MatchingColumnsSelect from './MatchingColumnsSelect.vue';
 import MappingFields from './MappingFields.vue';
-import { fieldCannotBeDeleted, isResourceMapperValue, parseResourceMapperFieldName } from '@/utils';
+import { fieldCannotBeDeleted, parseResourceMapperFieldName } from '@/utils/nodeTypesUtils';
+import { isResourceMapperValue } from '@/utils/typeGuards';
 import { i18n as locale } from '@/plugins/i18n';
 import { useNDVStore } from '@/stores/ndv.store';
 
@@ -173,9 +174,7 @@ const hasAvailableMatchingColumns = computed<boolean>(() => {
 		return (
 			state.paramValue.schema.filter(
 				(field) =>
-					(field.canBeUsedToMatch || field.defaultMatch) &&
-					field.display !== false &&
-					field.removed !== true,
+					(field.canBeUsedToMatch || field.defaultMatch) && field.display && field.removed !== true,
 			).length > 0
 		);
 	}
@@ -449,32 +448,32 @@ defineExpose({
 
 <template>
 	<div class="mt-4xs" data-test-id="resource-mapper-container">
-		<mapping-mode-select
+		<MappingModeSelect
 			v-if="showMappingModeSelect"
-			:inputSize="inputSize"
-			:labelSize="labelSize"
-			:initialValue="state.paramValue.mappingMode || 'defineBelow'"
-			:typeOptions="props.parameter.typeOptions"
-			:serviceName="nodeType?.displayName || locale.baseText('generic.service')"
+			: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"
-			:loadingError="state.loadingError"
-			:fieldsToMap="state.paramValue.schema"
+			:loading-error="state.loadingError"
+			:fields-to-map="state.paramValue.schema"
 			:teleported="teleported"
 			@modeChanged="onModeChanged"
 			@retryFetch="initFetching"
 		/>
-		<matching-columns-select
+		<MatchingColumnsSelect
 			v-if="showMatchingColumnsSelector"
 			:parameter="props.parameter"
 			:label-size="labelSize"
-			:fieldsToMap="state.paramValue.schema"
-			:typeOptions="props.parameter.typeOptions"
-			:inputSize="inputSize"
+			:fields-to-map="state.paramValue.schema"
+			:type-options="props.parameter.typeOptions"
+			:input-size="inputSize"
 			:loading="state.loading"
-			:initialValue="matchingColumns"
-			:serviceName="nodeType?.displayName || locale.baseText('generic.service')"
+			:initial-value="matchingColumns"
+			:service-name="nodeType?.displayName || locale.baseText('generic.service')"
 			:teleported="teleported"
-			:refreshInProgress="state.refreshInProgress"
+			:refresh-in-progress="state.refreshInProgress"
 			@matchingColumnsChanged="onMatchingColumnsChanged"
 			@refreshFieldList="initFetching(true)"
 		/>
@@ -488,19 +487,19 @@ defineExpose({
 				})
 			}}
 		</n8n-text>
-		<mapping-fields
+		<MappingFields
 			v-if="showMappingFields"
 			:parameter="props.parameter"
 			:path="props.path"
-			:nodeValues="state.parameterValues"
-			:fieldsToMap="state.paramValue.schema"
-			:paramValue="state.paramValue"
-			:labelSize="labelSize"
-			:showMatchingColumnsSelector="showMatchingColumnsSelector"
-			:showMappingModeSelect="showMappingModeSelect"
+			: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"
-			:refreshInProgress="state.refreshInProgress"
+			:refresh-in-progress="state.refreshInProgress"
 			@fieldValueChanged="fieldValueChanged"
 			@removeField="removeField"
 			@addField="addField"
diff --git a/packages/editor-ui/src/components/RunData.vue b/packages/editor-ui/src/components/RunData.vue
index 976161ea5f..9ee34cec09 100644
--- a/packages/editor-ui/src/components/RunData.vue
+++ b/packages/editor-ui/src/components/RunData.vue
@@ -1,13 +1,15 @@
 <template>
-	<div :class="['run-data', $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="!isReadOnlyRoute && !readOnlyEnv">
+			<span v-if="!isReadOnlyRoute && !readOnlyEnv" class="ml-4xs">
 				<n8n-link
 					theme="secondary"
 					size="small"
@@ -33,8 +35,8 @@
 		</n8n-callout>
 
 		<BinaryDataDisplay
-			:windowVisible="binaryDataDisplayVisible"
-			:displayData="binaryDataDisplayData"
+			:window-visible="binaryDataDisplayVisible"
+			:display-data="binaryDataDisplayData"
 			@close="closeBinaryDataDisplay"
 		/>
 
@@ -43,17 +45,15 @@
 
 			<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
 					"
-					:modelValue="displayMode"
+					:model-value="displayMode"
 					:options="buttons"
 					data-test-id="ndv-run-data-display-mode"
 					@update:modelValue="onDisplayModeChange"
@@ -71,16 +71,16 @@
 					@click="enterEditMode({ origin: 'editIconButton' })"
 				/>
 				<n8n-tooltip
-					placement="bottom-end"
-					v-if="canPinData && jsonData && jsonData.length > 0"
+					v-if="canPinData && rawInputData.length"
 					v-show="!editMode.enabled"
+					placement="bottom-end"
 					:visible="
 						isControlledPinDataTooltip
 							? isControlledPinDataTooltip && pinDataDiscoveryTooltipVisible
 							: undefined
 					"
 				>
-					<template #content v-if="!isControlledPinDataTooltip">
+					<template v-if="!isControlledPinDataTooltip" #content>
 						<div :class="$style.tooltipContainer">
 							<strong>{{ $locale.baseText('ndv.pinData.pin.title') }}</strong>
 							<n8n-text size="small" tag="p">
@@ -92,7 +92,7 @@
 							</n8n-text>
 						</div>
 					</template>
-					<template #content v-else>
+					<template v-else #content>
 						<div :class="$style.tooltipContainer">
 							{{ $locale.baseText('node.discovery.pinData.ndv') }}
 						</div>
@@ -100,20 +100,20 @@
 					<n8n-icon-button
 						:class="['ml-2xs', $style.pinDataButton]"
 						type="tertiary"
-						:active="hasPinData"
+						:active="pinnedData.hasData.value"
 						icon="thumbtack"
 						:disabled="
 							editMode.enabled ||
-							(inputData.length === 0 && !hasPinData) ||
+							(rawInputData.length === 0 && !pinnedData.hasData.value) ||
 							isReadOnlyRoute ||
 							readOnlyEnv
 						"
-						@click="onTogglePinData({ source: 'pin-icon-click' })"
 						data-test-id="ndv-pin-data"
+						@click="onTogglePinData({ source: 'pin-icon-click' })"
 					/>
 				</n8n-tooltip>
 
-				<div :class="$style.editModeActions" v-show="editMode.enabled">
+				<div v-show="editMode.enabled" :class="$style.editModeActions">
 					<n8n-button
 						type="tertiary"
 						:label="$locale.baseText('runData.editor.cancel')"
@@ -130,42 +130,49 @@
 		</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"
-				:modelValue="runIndex"
-				@update:modelValue="onRunIndexChange"
-				@click.stop
-				teleported
-			>
-				<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">
-				<template #content>
-					{{ $locale.baseText(linkedRuns ? 'runData.unlinking.hint' : 'runData.linking.hint') }}
-				</template>
-				<n8n-icon-button
-					class="linkRun"
-					:icon="linkedRuns ? 'unlink' : 'link'"
-					text
-					type="tertiary"
+			<div :class="$style.runSelectorWrapper">
+				<n8n-select
 					size="small"
-					@click="toggleLinkRuns"
-				/>
-			</n8n-tooltip>
-
-			<slot name="run-info"></slot>
+					:model-value="runIndex"
+					teleported
+					@update:modelValue="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" />
 
@@ -175,25 +182,55 @@
 			data-test-id="branches"
 		>
 			<n8n-tabs
-				:modelValue="currentOutputIndex"
+				:model-value="currentOutputIndex"
 				:options="branches"
 				@update:modelValue="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
+				hasNodeRun &&
+				((dataCount > 0 && maxRunIndex === 0) || search) &&
+				!isArtificialRecoveredEventItem
 			"
 			v-show="!editMode.enabled"
 			: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>
@@ -201,9 +238,8 @@
 
 			<div v-else-if="editMode.enabled" :class="$style.editMode">
 				<div :class="[$style.editModeBody, 'ignore-key-press']">
-					<code-node-editor
-						:modelValue="editMode.value"
-						language="json"
+					<JsonEditor
+						:model-value="editMode.value"
 						@update:modelValue="ndvStore.setOutputPanelEditModeValue($event)"
 					/>
 				</div>
@@ -249,7 +285,7 @@
 						})
 					}}
 				</n8n-text>
-				<slot name="content" v-else-if="$slots['content']"></slot>
+				<slot v-else-if="$slots['content']" name="content"></slot>
 				<NodeErrorView
 					v-else
 					:error="workflowRunData[node.name][runIndex].error"
@@ -258,15 +294,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>
 
@@ -296,14 +348,14 @@
 			</div>
 
 			<!-- V-else slot named content which only renders if $slots.content is passed and hasNodeRun -->
-			<slot name="content" v-else-if="hasNodeRun && $slots['content']"></slot>
+			<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"
@@ -316,16 +368,32 @@
 				</n8n-text>
 			</div>
 
+			<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>
+
 			<Suspense v-else-if="hasNodeRun && displayMode === 'table'">
-				<run-data-table
+				<RunDataTable
 					:node="node"
-					:inputData="inputData"
-					:mappingEnabled="mappingEnabled"
-					:distanceFromActive="distanceFromActive"
-					:runIndex="runIndex"
-					:pageOffset="currentPageOffset"
-					:totalRuns="maxRunIndex"
-					:hasDefaultHoverState="paneType === 'input'"
+					: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)"
 					@activeRowChanged="onItemHover"
 					@displayModeChange="onDisplayModeChange"
@@ -333,32 +401,34 @@
 			</Suspense>
 
 			<Suspense v-else-if="hasNodeRun && displayMode === 'json'">
-				<run-data-json
-					:paneType="paneType"
-					:editMode="editMode"
-					:sessioId="sessionId"
+				<RunDataJson
+					:pane-type="paneType"
+					:edit-mode="editMode"
+					:sessio-id="sessionId"
 					:node="node"
-					:inputData="inputData"
-					:mappingEnabled="mappingEnabled"
-					:distanceFromActive="distanceFromActive"
-					:runIndex="runIndex"
-					:totalRuns="maxRunIndex"
+					: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'">
-				<run-data-html :inputHtml="inputData[0].json.html" />
+				<RunDataHtml :input-html="inputDataPage[0].json.html" />
 			</Suspense>
 
 			<Suspense v-else-if="hasNodeRun && isSchemaView">
-				<run-data-schema
+				<RunDataSchema
 					:data="jsonData"
-					:mappingEnabled="mappingEnabled"
-					:distanceFromActive="distanceFromActive"
+					:mapping-enabled="mappingEnabled"
+					:distance-from-active="distanceFromActive"
 					:node="node"
-					:paneType="paneType"
-					:runIndex="runIndex"
-					:totalRuns="maxRunIndex"
+					:pane-type="paneType"
+					:run-index="runIndex"
+					:total-runs="maxRunIndex"
+					:search="search"
 				/>
 			</Suspense>
 
@@ -370,7 +440,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>
@@ -378,9 +448,9 @@
 
 					<div :class="$style.binaryRow">
 						<div
-							:class="$style.binaryCell"
 							v-for="(binaryData, key) in binaryDataEntry"
 							:key="index + '_' + key"
+							:class="$style.binaryCell"
 						>
 							<div :data-test-id="'ndv-binary-data_' + index">
 								<div :class="$style.binaryHeader">
@@ -451,15 +521,17 @@
 			</div>
 		</div>
 		<div
-			:class="$style.pagination"
 			v-if="
 				hasNodeRun &&
 				!hasRunError &&
 				binaryData.length === 0 &&
 				dataCount > pageSize &&
-				!isSchemaView
+				!isSchemaView &&
+				!isArtificialRecoveredEventItem
 			"
 			v-show="!editMode.enabled"
+			:class="$style.pagination"
+			data-test-id="ndv-data-pagination"
 		>
 			<el-pagination
 				background
@@ -468,17 +540,17 @@
 				:pager-count="5"
 				:page-size="pageSize"
 				layout="prev, pager, next"
-				@update:current-page="onCurrentPageChange"
 				:total="dataCount"
+				@update:current-page="onCurrentPageChange"
 			>
 			</el-pagination>
 
 			<div :class="$style.pageSizeSelector">
 				<n8n-select
 					size="mini"
-					:modelValue="pageSize"
-					@update:modelValue="onPageSizeChange"
+					:model-value="pageSize"
 					teleported
+					@update:modelValue="onPageSizeChange"
 				>
 					<template #prepend>{{ $locale.baseText('ndv.output.pageSize') }}</template>
 					<n8n-option v-for="size in pageSizes" :key="size" :label="size" :value="size">
@@ -492,9 +564,10 @@
 </template>
 
 <script lang="ts">
-import { defineAsyncComponent, defineComponent } from 'vue';
+import { defineAsyncComponent, defineComponent, toRef } from 'vue';
 import type { PropType } from 'vue';
 import { mapStores } from 'pinia';
+import { useStorage } from '@/composables/useStorage';
 import { saveAs } from 'file-saver';
 import type {
 	ConnectionTypes,
@@ -532,24 +605,28 @@ import {
 
 import BinaryDataDisplay from '@/components/BinaryDataDisplay.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 CodeNodeEditor from '@/components/CodeNodeEditor/CodeNodeEditor.vue';
+import type { PinDataSource } from '@/composables/usePinnedData';
+import { usePinnedData } from '@/composables/usePinnedData';
 import { dataPinningEventBus } from '@/event-bus';
-import { clearJsonKey, executionDataToJson, stringSizeInBytes, isEmpty } from '@/utils';
+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 { useToast } from '@/composables';
+import { useNodeHelpers } from '@/composables/useNodeHelpers';
+import { useToast } from '@/composables/useToast';
 import { isObject } from 'lodash-es';
+import { useExternalHooks } from '@/composables/useExternalHooks';
+import { useSourceControlStore } from '@/stores/sourceControl.store';
 
 const RunDataTable = defineAsyncComponent(async () => import('@/components/RunDataTable.vue'));
 const RunDataJson = defineAsyncComponent(async () => import('@/components/RunDataJson.vue'));
 const RunDataSchema = defineAsyncComponent(async () => import('@/components/RunDataSchema.vue'));
 const RunDataHtml = defineAsyncComponent(async () => import('@/components/RunDataHtml.vue'));
+const RunDataSearch = defineAsyncComponent(async () => import('@/components/RunDataSearch.vue'));
 
 export type EnterEditModeArgs = {
 	origin: 'editIconButton' | 'insertTestDataLink';
@@ -557,22 +634,24 @@ export type EnterEditModeArgs = {
 
 export default defineComponent({
 	name: 'RunData',
-	mixins: [externalHooks, genericHelpers, nodeHelpers, pinData],
 	components: {
 		BinaryDataDisplay,
 		NodeErrorView,
-		CodeNodeEditor,
+		JsonEditor,
 		RunDataTable,
 		RunDataJson,
 		RunDataSchema,
 		RunDataHtml,
+		RunDataSearch,
 	},
 	props: {
-		nodeUi: {
+		node: {
 			type: Object as PropType<INodeUi>,
+			default: null,
 		},
 		runIndex: {
 			type: Number,
+			required: true,
 		},
 		linkedRuns: {
 			type: Boolean,
@@ -597,6 +676,7 @@ export default defineComponent({
 		},
 		paneType: {
 			type: String as PropType<NodePanelType>,
+			required: true,
 		},
 		overrideOutputs: {
 			type: Array as PropType<number[]>,
@@ -615,10 +695,26 @@ export default defineComponent({
 			type: Boolean,
 			default: false,
 		},
+		isPaneActive: {
+			type: Boolean,
+			default: false,
+		},
 	},
-	setup() {
+	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() {
@@ -639,15 +735,13 @@ export default defineComponent({
 
 			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({
@@ -655,15 +749,19 @@ export default defineComponent({
 			branchIndex: this.currentOutputIndex,
 		});
 
-		if (this.paneType === 'output') this.setDisplayMode();
+		if (this.paneType === 'output') {
+			this.setDisplayMode();
+			this.activatePane();
+		}
 	},
 	beforeUnmount() {
 		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),
+		isReadOnlyRoute() {
+			return this.$route?.meta?.readOnlyCanvas === true;
+		},
 		activeNode(): INodeUi | null {
 			return this.ndvStore.activeNode;
 		},
@@ -676,9 +774,6 @@ export default defineComponent({
 		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);
@@ -711,7 +806,7 @@ export default defineComponent({
 			return (
 				!nonMainInputs &&
 				!this.isPaneTypeInput &&
-				this.isPinDataNodeType &&
+				this.pinnedData.isValidNodeType.value &&
 				!(this.binaryData && this.binaryData.length > 0)
 			);
 		},
@@ -747,11 +842,11 @@ export default defineComponent({
 				!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;
@@ -778,6 +873,11 @@ export default defineComponent({
 		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();
 		},
@@ -826,48 +926,15 @@ export default defineComponent({
 			return 0;
 		},
 		rawInputData(): INodeExecutionData[] {
-			let inputData: INodeExecutionData[] = [];
-
-			if (this.node) {
-				inputData = this.getNodeInputData(
-					this.node,
-					this.runIndex,
-					this.currentOutputIndex,
-					this.paneType,
-					this.connectionType,
-				);
-			}
-
-			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);
@@ -877,7 +944,7 @@ export default defineComponent({
 				return [];
 			}
 
-			const binaryData = this.getBinaryData(
+			const binaryData = this.nodeHelpers.getBinaryData(
 				this.workflowRunData,
 				this.node.name,
 				this.runIndex,
@@ -901,8 +968,17 @@ export default defineComponent({
 				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}`) {
@@ -916,7 +992,10 @@ export default defineComponent({
 					outputName = capitalize(`${this.getOutputName(i)}${appendBranchWord}`);
 				}
 				branches.push({
-					label: itemsCount ? `${outputName} (${itemsCount} ${items})` : outputName,
+					label:
+						(this.search && itemsCount) || totalItemsCount
+							? `${outputName} (${items})`
+							: outputName,
 					value: i,
 				});
 			}
@@ -936,6 +1015,12 @@ export default defineComponent({
 		readOnlyEnv(): boolean {
 			return this.sourceControlStore.preferences.branchReadOnly;
 		},
+		showIOSearch(): boolean {
+			return this.hasNodeRun && !this.hasRunError;
+		},
+		showIoSearchNoMatchContent(): boolean {
+			return this.hasNodeRun && !this.inputData.length && this.search;
+		},
 	},
 	methods: {
 		getResolvedNodeOutputs() {
@@ -975,12 +1060,9 @@ export default defineComponent({
 				return;
 			}
 
-			if (
-				value &&
-				value.length > 0 &&
-				!this.isReadOnlyRoute &&
-				!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(() => {
@@ -998,12 +1080,12 @@ export default defineComponent({
 			}
 		},
 		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;
@@ -1016,9 +1098,9 @@ export default defineComponent({
 				click_type: origin === 'editIconButton' ? 'button' : 'link',
 				session_id: this.sessionId,
 				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() {
@@ -1027,27 +1109,22 @@ export default defineComponent({
 			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' });
 		},
@@ -1060,82 +1137,37 @@ export default defineComponent({
 				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,
-			};
-			void 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,
 					run_index: this.runIndex,
-					view: !this.hasNodeRun && !this.hasPinData ? 'none' : this.displayMode,
+					view: !this.hasNodeRun && !this.pinnedData.hasData.value ? 'none' : this.displayMode,
 				};
 
-				void 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;
 			}
 
-			if (!this.isValidPinDataSize(this.rawInputData)) {
-				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: this.rawInputData });
-
 			if (this.maxRunIndex > 0) {
 				this.showToast({
 					title: this.$locale.baseText('ndv.pinData.pin.multipleRuns.title', {
@@ -1228,7 +1260,7 @@ export default defineComponent({
 			}
 
 			this.closeBinaryDataDisplay();
-			void this.$externalHooks().run('runData.displayModeChanged', {
+			void this.externalHooks.run('runData.displayModeChanged', {
 				newValue: displayMode,
 				oldValue: previous,
 			});
@@ -1246,53 +1278,76 @@ export default defineComponent({
 		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;
 		},
+		getRawInputData(
+			runIndex: number,
+			outputIndex: number,
+			connectionType: ConnectionTypes = NodeConnectionType.Main,
+		): INodeExecutionData[] {
+			let inputData: INodeExecutionData[] = [];
+
+			if (this.node) {
+				inputData = this.nodeHelpers.getNodeInputData(
+					this.node,
+					runIndex,
+					outputIndex,
+					this.paneType,
+					connectionType,
+				);
+			}
+
+			if (inputData.length === 0 || !Array.isArray(inputData)) {
+				return [];
+			}
+
+			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,
+							},
+					  ];
+			}
+			return inputData;
+		},
+		getFilteredData(inputData: INodeExecutionData[]): INodeExecutionData[] {
+			if (!this.search) {
+				return inputData;
+			}
+
+			this.currentPage = 1;
+			return inputData.filter(({ json }) => searchInObject(json, this.search));
+		},
 		getDataCount(
 			runIndex: number,
 			outputIndex: number,
 			connectionType: ConnectionTypes = NodeConnectionType.Main,
 		) {
-			if (this.pinData) {
-				return this.pinData.length;
-			}
-
-			if (this.node === null) {
+			if (!this.node) {
 				return 0;
 			}
 
-			const runData: IRunData | null = this.workflowRunData;
-
-			if (runData === null || !runData.hasOwnProperty(this.node.name)) {
-				return 0;
-			}
-
-			if (runData[this.node.name].length <= runIndex) {
-				return 0;
-			}
-
-			if (runData[this.node.name][runIndex].hasOwnProperty('error')) {
+			if (this.workflowRunData?.[this.node.name]?.[runIndex]?.hasOwnProperty('error')) {
 				return 1;
 			}
 
-			if (
-				!runData[this.node.name][runIndex].hasOwnProperty('data') ||
-				runData[this.node.name][runIndex].data === undefined
-			) {
-				return 0;
-			}
-
-			const inputData = this.getInputData(
-				runData[this.node.name][runIndex].data!,
-				outputIndex,
-				connectionType,
-			);
-
-			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
@@ -1323,7 +1378,7 @@ export default defineComponent({
 		},
 		clearExecutionData() {
 			this.workflowsStore.setWorkflowExecutionData(null);
-			this.updateNodesExecutionIssues();
+			this.nodeHelpers.updateNodesExecutionIssues();
 		},
 		isViewable(index: number, key: string): boolean {
 			const { fileType } = this.binaryData[index][key];
@@ -1349,16 +1404,10 @@ export default defineComponent({
 			}
 		},
 		async downloadJsonData() {
-			const inputData = this.getNodeInputData(
-				this.node,
-				this.runIndex,
-				this.currentOutputIndex,
-				this.paneType,
-				this.connectionType,
-			);
-
-			const fileName = this.node!.name.replace(/[^\w\d]/g, '_');
-			const blob = new Blob([JSON.stringify(inputData, null, 2)], { type: 'application/json' });
+			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`);
 		},
@@ -1366,7 +1415,7 @@ export default defineComponent({
 			this.binaryDataDisplayVisible = true;
 
 			this.binaryDataDisplayData = {
-				node: this.node!.name,
+				node: this.node.name,
 				runIndex: this.runIndex,
 				outputIndex: this.currentOutputIndex,
 				index,
@@ -1394,21 +1443,8 @@ export default defineComponent({
 		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,
-				this.paneType,
-				this.connectionType,
-			);
-
-			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;
@@ -1443,6 +1479,13 @@ export default defineComponent({
 				});
 			}
 		},
+		activatePane() {
+			this.$emit('activatePane');
+		},
+		onSearchClear() {
+			this.search = '';
+			document.dispatchEvent(new KeyboardEvent('keyup', { key: '/' }));
+		},
 	},
 	watch: {
 		node() {
@@ -1451,7 +1494,7 @@ export default defineComponent({
 		hasNodeRun() {
 			if (this.paneType === 'output') this.setDisplayMode();
 		},
-		inputData: {
+		inputDataPage: {
 			handler(data: INodeExecutionData[]) {
 				if (this.paneType && data) {
 					this.ndvStore.setNDVPanelDataIsEmpty({
@@ -1480,6 +1523,9 @@ export default defineComponent({
 				branchIndex,
 			});
 		},
+		search(newSearch: string) {
+			this.$emit('search', newSearch);
+		},
 	},
 });
 </script>
@@ -1508,7 +1554,7 @@ export default defineComponent({
 	position: relative;
 	width: 100%;
 	height: 100%;
-	background-color: var(--color-background-base);
+	background-color: var(--color-run-data-background);
 	display: flex;
 	flex-direction: column;
 }
@@ -1561,24 +1607,32 @@ export default defineComponent({
 }
 
 .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;
+}
+
+.runSelectorWrapper {
 	display: flex;
 	align-items: center;
-
-	> * {
-		margin-right: var(--spacing-4xs);
-	}
 }
 
 .pagination {
@@ -1741,3 +1795,14 @@ export default defineComponent({
 	}
 }
 </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
index 6e180bc900..3e2bb2da36 100644
--- a/packages/editor-ui/src/components/RunDataAi/AiRunContentBlock.vue
+++ b/packages/editor-ui/src/components/RunDataAi/AiRunContentBlock.vue
@@ -8,10 +8,10 @@
 			<!-- @click.stop to prevent event from bubbling to blockHeader and toggling expanded state when clicking on rawSwitch -->
 			<el-switch
 				v-if="contentParsed"
-				@click.stop
+				v-model="isShowRaw"
 				:class="$style.rawSwitch"
 				active-text="RAW JSON"
-				v-model="isShowRaw"
+				@click.stop
 			/>
 		</header>
 		<main
@@ -21,24 +21,24 @@
 			}"
 		>
 			<div
-				:key="index"
 				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'">
-						<vue-markdown
+						<VueMarkdown
 							:source="jsonToMarkdown(parsedContent.data as JsonMarkdown)"
 							:class="$style.markdown"
 						/>
 					</template>
 					<template v-if="parsedContent.type === 'markdown'">
-						<vue-markdown :source="parsedContent.data" :class="$style.markdown" />
+						<VueMarkdown :source="parsedContent.data" :class="$style.markdown" />
 					</template>
 					<p
-						:class="$style.runText"
 						v-if="parsedContent.type === 'text'"
+						:class="$style.runText"
 						v-text="parsedContent.data"
 					/>
 				</template>
@@ -49,11 +49,11 @@
 							size="small"
 							:class="$style.copyToClipboard"
 							type="secondary"
-							@click="copyToClipboard(raw)"
 							:title="$locale.baseText('nodeErrorView.copyToClipboard')"
 							icon="copy"
+							@click="onCopyToClipboard(raw)"
 						/>
-						<vue-markdown :source="jsonToMarkdown(raw as JsonMarkdown)" :class="$style.markdown" />
+						<VueMarkdown :source="jsonToMarkdown(raw as JsonMarkdown)" :class="$style.markdown" />
 					</div>
 				</template>
 			</div>
@@ -68,7 +68,9 @@ import { ref, onMounted } from 'vue';
 import type { ParsedAiContent } from './useAiContentParsers';
 import { useAiContentParsers } from './useAiContentParsers';
 import VueMarkdown from 'vue-markdown-render';
-import { useCopyToClipboard, useI18n, useToast } from '@/composables';
+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<{
@@ -76,13 +78,15 @@ const props = defineProps<{
 }>();
 
 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],
@@ -153,12 +157,9 @@ function onBlockHeaderClick() {
 	isExpanded.value = !isExpanded.value;
 }
 
-function copyToClipboard(content: IDataObject | IDataObject[]) {
-	const copyToClipboardFn = useCopyToClipboard();
-	const { showMessage } = useToast();
-
+function onCopyToClipboard(content: IDataObject | IDataObject[]) {
 	try {
-		copyToClipboardFn(JSON.stringify(content, undefined, 2));
+		void clipboard.copy(JSON.stringify(content, undefined, 2));
 		showMessage({
 			title: i18n.baseText('generic.copiedToClipboard'),
 			type: 'success',
@@ -263,5 +264,6 @@ onMounted(() => {
 	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
index 9fbf107b9f..9731ef4a9a 100644
--- a/packages/editor-ui/src/components/RunDataAi/RunDataAi.vue
+++ b/packages/editor-ui/src/components/RunDataAi/RunDataAi.vue
@@ -1,13 +1,14 @@
 <template>
 	<div v-if="aiData" :class="$style.container">
 		<div :class="{ [$style.tree]: true, [$style.slim]: slim }">
-			<el-tree
+			<ElTree
 				:data="executionTree"
 				:props="{ label: 'node' }"
 				default-expand-all
 				:indent="12"
-				@node-click="onItemClick"
 				:expand-on-click-node="false"
+				data-test-id="lm-chat-logs-tree"
+				@node-click="onItemClick"
 			>
 				<template #default="{ node, data }">
 					<div
@@ -19,8 +20,8 @@
 						:style="{ '--item-depth': data.depth }"
 					>
 						<button
-							:class="$style.treeToggle"
 							v-if="data.children.length"
+							:class="$style.treeToggle"
 							@click="toggleTreeItem(node)"
 						>
 							<font-awesome-icon :icon="node.expanded ? 'angle-down' : 'angle-up'" />
@@ -30,13 +31,13 @@
 								{{ node.label }}
 							</template>
 							<span :class="$style.leafLabel">
-								<node-icon :node-type="getNodeType(data.node)!" :size="17" />
-								<span v-text="node.label" v-if="!slim" />
+								<NodeIcon :node-type="getNodeType(data.node)!" :size="17" />
+								<span v-if="!slim" v-text="node.label" />
 							</span>
 						</n8n-tooltip>
 					</div>
 				</template>
-			</el-tree>
+			</ElTree>
 		</div>
 		<div :class="$style.runData">
 			<div v-if="selectedRun.length === 0" :class="$style.empty">
@@ -50,8 +51,12 @@
 					}}
 				</n8n-text>
 			</div>
-			<div v-for="(data, index) in selectedRun" :key="`${data.node}__${data.runIndex}__index`">
-				<RunDataAiContent :inputData="data" :contentIndex="index" />
+			<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>
@@ -63,7 +68,8 @@ 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, useWorkflowsStore } from '@/stores';
+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';
diff --git a/packages/editor-ui/src/components/RunDataAi/RunDataAiContent.vue b/packages/editor-ui/src/components/RunDataAi/RunDataAiContent.vue
index e8954882a4..2be9048da5 100644
--- a/packages/editor-ui/src/components/RunDataAi/RunDataAiContent.vue
+++ b/packages/editor-ui/src/components/RunDataAi/RunDataAiContent.vue
@@ -1,7 +1,7 @@
 <template>
 	<div :class="$style.container">
 		<header :class="$style.header">
-			<node-icon
+			<NodeIcon
 				v-if="runMeta?.node"
 				:class="$style.nodeIcon"
 				:node-type="runMeta.node"
@@ -35,7 +35,7 @@
 								},
 							})
 						}}
-						<n8n-info-tip type="tooltip" theme="info-light" tooltipPlacement="right">
+						<n8n-info-tip type="tooltip" theme="info-light" tooltip-placement="right">
 							<div>
 								<n8n-text :bold="true" size="small">
 									{{ $locale.baseText('runData.aiContentBlock.tokens.prompt') }}
@@ -65,15 +65,16 @@
 			</div>
 		</header>
 
-		<main :class="$style.content" v-for="(run, index) in props.inputData.data" :key="index">
-			<AiRunContentBlock :runData="run" />
+		<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, useWorkflowsStore } from '@/stores';
+import { useNodeTypesStore } from '@/stores/nodeTypes.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
 import type {
 	IDataObject,
 	INodeExecutionData,
diff --git a/packages/editor-ui/src/components/RunDataAi/useAiContentParsers.ts b/packages/editor-ui/src/components/RunDataAi/useAiContentParsers.ts
index 2375f1997f..723e53b040 100644
--- a/packages/editor-ui/src/components/RunDataAi/useAiContentParsers.ts
+++ b/packages/editor-ui/src/components/RunDataAi/useAiContentParsers.ts
@@ -6,7 +6,7 @@ interface MemoryMessage {
 	type: string;
 	id: string[];
 	kwargs: {
-		content: string;
+		content: unknown;
 		additional_kwargs: Record<string, unknown>;
 	};
 }
@@ -81,14 +81,35 @@ const outputTypeParsers: {
 		};
 	},
 	[NodeConnectionType.AiTool]: fallbackParser,
+	[NodeConnectionType.AiAgent]: fallbackParser,
 	[NodeConnectionType.AiMemory](execData: IDataObject) {
 		const chatHistory =
 			execData.chatHistory ?? execData.messages ?? execData?.response?.chat_history;
 		if (Array.isArray(chatHistory)) {
 			const responseText = chatHistory
 				.map((content: MemoryMessage) => {
-					if (content.type === 'constructor' && content.id?.includes('schema') && content.kwargs) {
+					if (
+						content.type === 'constructor' &&
+						content.id?.includes('messages') &&
+						content.kwargs
+					) {
+						interface MessageContent {
+							type: string;
+							image_url?: {
+								url: string;
+							};
+						}
 						let message = content.kwargs.content;
+						if (Array.isArray(message)) {
+							const messageContent = message[0] as {
+								type?: string;
+								image_url?: { url: string };
+							};
+							if (messageContent?.type === 'image_url') {
+								message = `![Input image](${messageContent.image_url?.url})`;
+							}
+							message = message as MessageContent[];
+						}
 						if (Object.keys(content.kwargs.additional_kwargs).length) {
 							message += ` (${JSON.stringify(content.kwargs.additional_kwargs)})`;
 						}
@@ -120,7 +141,6 @@ const outputTypeParsers: {
 	},
 	[NodeConnectionType.AiOutputParser]: fallbackParser,
 	[NodeConnectionType.AiRetriever]: fallbackParser,
-	[NodeConnectionType.AiVectorRetriever]: fallbackParser,
 	[NodeConnectionType.AiVectorStore](execData: IDataObject) {
 		if (execData.documents) {
 			return {
@@ -189,9 +209,17 @@ export const useAiContentParsers = () => {
 		});
 
 		const parser = outputTypeParsers[endpointType as AllowedEndpointType];
-		if (!parser) return [{ raw: contentJson, parsedContent: null }];
+		if (!parser)
+			return [
+				{
+					raw: contentJson.filter((item): item is IDataObject => item !== undefined),
+					parsedContent: null,
+				},
+			];
 
-		const parsedOutput = contentJson.map((c) => ({ raw: c, parsedContent: parser(c) }));
+		const parsedOutput = contentJson
+			.filter((c): c is IDataObject => c !== undefined)
+			.map((c) => ({ raw: c, parsedContent: parser(c) }));
 		return parsedOutput;
 	};
 
diff --git a/packages/editor-ui/src/components/RunDataJson.vue b/packages/editor-ui/src/components/RunDataJson.vue
index 3043caeb77..049a46b471 100644
--- a/packages/editor-ui/src/components/RunDataJson.vue
+++ b/packages/editor-ui/src/components/RunDataJson.vue
@@ -1,20 +1,20 @@
 <template>
 	<div :class="$style.jsonDisplay">
 		<Suspense>
-			<run-data-json-actions
+			<RunDataJsonActions
 				v-if="!editMode.enabled"
 				:node="node"
-				:sessioId="sessionId"
-				:displayMode="displayMode"
-				:distanceFromActive="distanceFromActive"
-				:selectedJsonPath="selectedJsonPath"
-				:jsonData="jsonData"
-				:paneType="paneType"
+				:sessio-id="sessionId"
+				:display-mode="displayMode"
+				:distance-from-active="distanceFromActive"
+				:selected-json-path="selectedJsonPath"
+				:json-data="jsonData"
+				:pane-type="paneType"
 			/>
 		</Suspense>
-		<draggable
+		<Draggable
 			type="mapping"
-			targetDataKey="mappable"
+			target-data-key="mappable"
 			:disabled="!mappingEnabled"
 			@dragstart="onDragStart"
 			@dragend="onDragEnd"
@@ -22,18 +22,20 @@
 			<template #preview="{ canDrop, el }">
 				<MappingPill v-if="el" :html="getShortKey(el)" :can-drop="canDrop" />
 			</template>
-			<vue-json-pretty
+			<VueJsonPretty
 				:data="jsonData"
 				:deep="10"
-				:showLength="true"
-				:selectedValue="selectedJsonPath"
-				rootPath=""
-				selectableType="single"
+				:show-length="true"
+				:selected-value="selectedJsonPath"
+				root-path=""
+				selectable-type="single"
 				class="json-data"
 				@update:selectedValue="selectedJsonPath = $event"
 			>
 				<template #renderNodeKey="{ node }">
-					<span
+					<TextWithHighlights
+						:content="getContent(node.key)"
+						:search="search"
 						data-target="mappable"
 						:data-value="getJsonParameterPath(node.path)"
 						:data-name="node.key"
@@ -43,13 +45,18 @@
 							[$style.mappable]: mappingEnabled,
 							[$style.dragged]: draggingPath === node.path,
 						}"
-						>"{{ node.key }}"</span
-					>
+					/>
 				</template>
 				<template #renderNodeValue="{ node }">
-					<span v-if="isNaN(node.index)">{{ getContent(node.content) }}</span>
-					<span
+					<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)"
@@ -60,11 +67,10 @@
 							[$style.dragged]: draggingPath === node.path,
 						}"
 						class="ph-no-capture"
-						>{{ getContent(node.content) }}</span
-					>
+					/>
 				</template>
-			</vue-json-pretty>
-		</draggable>
+			</VueJsonPretty>
+		</Draggable>
 	</div>
 </template>
 
@@ -74,28 +80,31 @@ import type { PropType } from 'vue';
 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.store';
 import MappingPill from './MappingPill.vue';
 import { getMappedExpression } from '@/utils/mappingUtils';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { nonExistingJsonPath } from '@/constants';
+import { useExternalHooks } from '@/composables/useExternalHooks';
+import TextWithHighlights from './TextWithHighlights.vue';
 
 const RunDataJsonActions = defineAsyncComponent(
 	async () => import('@/components/RunDataJsonActions.vue'),
 );
 
 export default defineComponent({
-	name: 'run-data-json',
-	mixins: [externalHooks],
+	name: 'RunDataJson',
 	components: {
 		VueJsonPretty,
 		Draggable,
 		RunDataJsonActions,
 		MappingPill,
+		TextWithHighlights,
 	},
 	props: {
 		editMode: {
@@ -125,13 +134,19 @@ export default defineComponent({
 		totalRuns: {
 			type: Number,
 		},
+		search: {
+			type: String,
+		},
 	},
 	setup() {
+		const externalHooks = useExternalHooks();
+
 		const selectedJsonPath = ref(nonExistingJsonPath);
 		const draggingPath = ref<null | string>(null);
 		const displayMode = ref('json');
 
 		return {
+			externalHooks,
 			selectedJsonPath,
 			draggingPath,
 			displayMode,
@@ -184,7 +199,7 @@ export default defineComponent({
 			};
 
 			setTimeout(() => {
-				void this.$externalHooks().run('runDataJson.onDragEnd', telemetryPayload);
+				void this.externalHooks.run('runDataJson.onDragEnd', telemetryPayload);
 				this.$telemetry.track('User dragged data for mapping', telemetryPayload);
 			}, 1000); // ensure dest data gets set if drop
 		},
@@ -210,7 +225,6 @@ export default defineComponent({
 	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 */
diff --git a/packages/editor-ui/src/components/RunDataJsonActions.vue b/packages/editor-ui/src/components/RunDataJsonActions.vue
index 4bdf715f49..9ea46e3372 100644
--- a/packages/editor-ui/src/components/RunDataJsonActions.vue
+++ b/packages/editor-ui/src/components/RunDataJsonActions.vue
@@ -37,19 +37,22 @@
 <script lang="ts">
 import { defineComponent } from 'vue';
 import type { PropType } from 'vue';
-import { mapStores } from 'pinia';
+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 { clearJsonKey, convertPath } from '@/utils/typesUtils';
+import { executionDataToJson } from '@/utils/nodeTypesUtils';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { useNDVStore } from '@/stores/ndv.store';
-import { useI18n, useToast } from '@/composables';
+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;
@@ -57,9 +60,7 @@ type JsonPathData = {
 };
 
 export default defineComponent({
-	name: 'run-data-json-actions',
-	mixins: [genericHelpers, nodeHelpers, pinData, copyPaste],
-
+	name: 'RunDataJsonActions',
 	props: {
 		node: {
 			type: Object as PropType<INodeUi>,
@@ -92,15 +93,26 @@ export default defineComponent({
 		},
 	},
 	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;
 		},
@@ -115,11 +127,14 @@ export default defineComponent({
 		getJsonValue(): string {
 			let selectedValue = jp.query(this.jsonData, `$${this.normalisedJsonPath}`)[0];
 			if (this.noSelection) {
-				if (this.hasPinData) {
-					selectedValue = clearJsonKey(this.pinData as object);
+				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),
 					);
 				}
 			}
@@ -216,7 +231,7 @@ export default defineComponent({
 				in_execution_log: this.isReadOnlyRoute,
 			});
 
-			this.copyToClipboard(value);
+			void this.clipboard.copy(value);
 		},
 	},
 });
diff --git a/packages/editor-ui/src/components/RunDataSchema.vue b/packages/editor-ui/src/components/RunDataSchema.vue
index 4611dd5881..0843bd9f1e 100644
--- a/packages/editor-ui/src/components/RunDataSchema.vue
+++ b/packages/editor-ui/src/components/RunDataSchema.vue
@@ -4,13 +4,14 @@ import type { INodeUi } from '@/Interface';
 import RunDataSchemaItem from '@/components/RunDataSchemaItem.vue';
 import Draggable from '@/components/Draggable.vue';
 import { useNDVStore } from '@/stores/ndv.store';
-import { useWebhooksStore } from '@/stores/webhooks.store';
 import { telemetry } from '@/plugins/telemetry';
 import type { IDataObject } from 'n8n-workflow';
-import { 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';
+import { useDataSchema } from '@/composables/useDataSchema';
+
 type Props = {
 	data: IDataObject[];
 	mappingEnabled: boolean;
@@ -19,6 +20,7 @@ type Props = {
 	totalRuns: number;
 	paneType: 'input' | 'output';
 	node: INodeUi | null;
+	search: string;
 };
 
 const props = withDefaults(defineProps<Props>(), {
@@ -27,7 +29,6 @@ const props = withDefaults(defineProps<Props>(), {
 
 const draggingPath = ref<string>('');
 const ndvStore = useNDVStore();
-const webhooksStore = useWebhooksStore();
 const { getSchemaForExecutionData } = useDataSchema();
 
 const schema = computed(() => getSchemaForExecutionData(props.data));
@@ -35,7 +36,7 @@ const schema = computed(() => getSchemaForExecutionData(props.data));
 const isDataEmpty = computed(() => isEmpty(props.data));
 
 const onDragStart = (el: HTMLElement) => {
-	if (el && el.dataset?.path) {
+	if (el?.dataset?.path) {
 		draggingPath.value = el.dataset.path;
 	}
 
@@ -59,7 +60,7 @@ const onDragEnd = (el: HTMLElement) => {
 			...mappingTelemetry,
 		};
 
-		void runExternalHook('runDataJson.onDragEnd', webhooksStore, telemetryPayload);
+		void useExternalHooks().run('runDataJson.onDragEnd', telemetryPayload);
 
 		telemetry.track('User dragged data for mapping', telemetryPayload);
 	}, 1000); // ensure dest data gets set if drop
@@ -71,10 +72,10 @@ const onDragEnd = (el: HTMLElement) => {
 		<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"
@@ -83,19 +84,20 @@ const onDragEnd = (el: HTMLElement) => {
 				<MappingPill v-if="el" :html="el.outerHTML" :can-drop="canDrop" />
 			</template>
 			<div :class="$style.schema">
-				<run-data-schema-item
+				<RunDataSchemaItem
 					:schema="schema"
 					:level="0"
 					:parent="null"
-					:paneType="paneType"
-					:subKey="`${schema.type}-0-0`"
-					:mappingEnabled="mappingEnabled"
-					:draggingPath="draggingPath"
-					:distanceFromActive="distanceFromActive"
+					: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>
+		</Draggable>
 	</div>
 </template>
 
@@ -111,7 +113,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 6ea7485ade..86c90e6d74 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,
 );
@@ -92,8 +95,17 @@ 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">{{ text }}</span>
@@ -108,20 +120,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;
diff --git a/packages/editor-ui/src/components/RunDataSearch.vue b/packages/editor-ui/src/components/RunDataSearch.vue
new file mode 100644
index 0000000000..a764e8a242
--- /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:modelValue="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 82954ab4e4..fb0fb44b6e 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">
+		<table v-if="tableData.columns && tableData.columns.length === 0" :class="$style.table">
 			<tr>
 				<th :class="$style.emptyCell"></th>
 				<th :class="$style.tableRightMargin"></th>
@@ -21,7 +21,7 @@
 				<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">
@@ -32,7 +32,7 @@
 									{{ $locale.baseText('dataMapping.dragColumnToFieldHint') }}
 								</div>
 							</template>
-							<draggable
+							<Draggable
 								type="mapping"
 								:data="getExpression(column)"
 								:disabled="!mappingEnabled"
@@ -52,13 +52,16 @@
 											[$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">
@@ -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
@@ -113,20 +116,19 @@
 						:key="index2"
 						:data-row="index1"
 						:data-col="index2"
+						:class="hasJsonInColumn(index2) ? $style.minColWidth : $style.limitColWidth"
 						@mouseenter="onMouseEnterCell"
 						@mouseleave="onMouseLeaveCell"
-						:class="hasJsonInColumn(index2) ? $style.minColWidth : $style.limitColWidth"
 					>
-						<span
+						<TextWithHighlights
 							v-if="isSimple(data)"
+							:content="getValueToRender(data)"
+							:search="search"
 							:class="{ [$style.value]: true, [$style.empty]: isEmpty(data) }"
-							>{{ getValueToRender(data) }}</span
-						>
-						<n8n-tree :nodeClass="$style.nodeClass" v-else :value="data">
+						/>
+						<n8n-tree v-else :node-class="$style.nodeClass" :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),
@@ -137,20 +139,24 @@
 									: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 }">
-								<span :class="{ [$style.nestedValue]: true, [$style.empty]: isEmpty(value) }">
-									{{ getValueToRender(value) }}
-								</span>
+								<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>
+			</Draggable>
 		</table>
 	</div>
 </template>
@@ -160,24 +166,24 @@ import { defineComponent } from 'vue';
 import type { PropType } from 'vue';
 import { mapStores } from 'pinia';
 import type { INodeUi, ITableData, NDVState } from '@/Interface';
-import { getPairedItemId } from '@/utils';
+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 { 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 defineComponent({
-	name: 'run-data-table',
-	mixins: [externalHooks],
-	components: { Draggable, MappingPill },
+	name: 'RunDataTable',
+	components: { Draggable, MappingPill, TextWithHighlights },
 	props: {
 		node: {
 			type: Object as PropType<INodeUi>,
@@ -206,6 +212,15 @@ export default defineComponent({
 		hasDefaultHoverState: {
 			type: Boolean,
 		},
+		search: {
+			type: String,
+		},
+	},
+	setup() {
+		const externalHooks = useExternalHooks();
+		return {
+			externalHooks,
+		};
 	},
 	data() {
 		return {
@@ -361,7 +376,7 @@ export default defineComponent({
 				value === undefined
 			);
 		},
-		getValueToRender(value: unknown) {
+		getValueToRender(value: unknown): string {
 			if (value === '') {
 				return this.$locale.baseText('runData.emptyString');
 			}
@@ -377,6 +392,9 @@ export default defineComponent({
 			if (value === null || value === undefined) {
 				return `[${value}]`;
 			}
+			if (value === true || value === false || typeof value === 'number') {
+				return value.toString();
+			}
 			return value;
 		},
 		onDragStart() {
@@ -384,7 +402,7 @@ export default defineComponent({
 			this.ndvStore.resetMappingTelemetry();
 		},
 		onCellDragStart(el: HTMLElement) {
-			if (el && el.dataset.value) {
+			if (el?.dataset.value) {
 				this.draggingPath = el.dataset.value;
 			}
 
@@ -418,7 +436,7 @@ export default defineComponent({
 					...mappingTelemetry,
 				};
 
-				void this.$externalHooks().run('runDataTable.onDragEnd', telemetryPayload);
+				void this.externalHooks.run('runDataTable.onDragEnd', telemetryPayload);
 
 				this.$telemetry.track('User dragged data for mapping', telemetryPayload);
 			}, 1000); // ensure dest data gets set if drop
diff --git a/packages/editor-ui/src/components/RunInfo.vue b/packages/editor-ui/src/components/RunInfo.vue
index 5f2136a771..24a4f3675b 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>
@@ -16,13 +46,19 @@
 <script lang="ts">
 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 2c36ca656d..12e956f23e 100644
--- a/packages/editor-ui/src/components/SSOLogin.vue
+++ b/packages/editor-ui/src/components/SSOLogin.vue
@@ -1,6 +1,7 @@
 <script lang="ts" setup>
 import { useSSOStore } from '@/stores/sso.store';
-import { useI18n, useToast } from '@/composables';
+import { useI18n } from '@/composables/useI18n';
+import { useToast } from '@/composables/useToast';
 
 const i18n = useI18n();
 const ssoStore = useSSOStore();
@@ -21,11 +22,11 @@ const onSSOLogin = async () => {
 			<span>{{ i18n.baseText('sso.login.divider') }}</span>
 		</div>
 		<n8n-button
-			@click="onSSOLogin"
 			size="large"
 			type="primary"
 			outline
 			:label="i18n.baseText('sso.login.button')"
+			@click="onSSOLogin"
 		/>
 	</div>
 </template>
@@ -53,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 0a9d5f9327..7d332c2ca4 100644
--- a/packages/editor-ui/src/components/SaveButton.vue
+++ b/packages/editor-ui/src/components/SaveButton.vue
@@ -1,22 +1,32 @@
 <template>
 	<span :class="$style.container" data-test-id="save-button">
-		<span :class="$style.saved" v-if="saved">{{ $locale.baseText('saveButton.saved') }}</span>
-		<n8n-button
+		<span v-if="saved" :class="$style.saved">{{ $locale.baseText('saveButton.saved') }}</span>
+		<KeyboardShortcutTooltip
 			v-else
-			:label="saveButtonLabel"
-			:loading="isSaving"
-			:disabled="disabled"
-			:class="$style.button"
-			:type="type"
-		/>
+			:label="$locale.baseText('saveButton.hint')"
+			:shortcut="{ keys: ['s'], metaKey: true }"
+			placement="bottom"
+		>
+			<n8n-button
+				:label="saveButtonLabel"
+				:loading="isSaving"
+				:disabled="disabled"
+				:class="$style.button"
+				:type="type"
+			/>
+		</KeyboardShortcutTooltip>
 	</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,
diff --git a/packages/editor-ui/src/components/ScopesNotice.vue b/packages/editor-ui/src/components/ScopesNotice.vue
index b18637eae2..242836d3cc 100644
--- a/packages/editor-ui/src/components/ScopesNotice.vue
+++ b/packages/editor-ui/src/components/ScopesNotice.vue
@@ -1,5 +1,5 @@
 <template>
-	<n8n-notice :content="scopesShortContent" :fullContent="scopesFullContent" />
+	<n8n-notice :content="scopesShortContent" :full-content="scopesFullContent" />
 </template>
 
 <script lang="ts">
diff --git a/packages/editor-ui/src/components/SettingsLogStreaming/EventDestinationCard.ee.vue b/packages/editor-ui/src/components/SettingsLogStreaming/EventDestinationCard.ee.vue
index 781584dbae..bdf3297cdd 100644
--- a/packages/editor-ui/src/components/SettingsLogStreaming/EventDestinationCard.ee.vue
+++ b/packages/editor-ui/src/components/SettingsLogStreaming/EventDestinationCard.ee.vue
@@ -13,7 +13,7 @@
 			</div>
 		</template>
 		<template #append>
-			<div :class="$style.cardActions" ref="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"
-					:modelValue="nodeParameters.enabled"
-					@update:modelValue="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:modelValue="onEnabledSwitched($event, destination.id)"
 				>
 				</el-switch>
 
@@ -49,7 +48,7 @@
 <script lang="ts">
 import { defineComponent } from 'vue';
 import { EnterpriseEditionFeature, MODAL_CONFIRM } from '@/constants';
-import { useMessage } from '@/composables';
+import { useMessage } from '@/composables/useMessage';
 import { useLogStreamingStore } from '@/stores/logStreaming.store';
 import type { PropType } from 'vue';
 import { mapStores } from 'pinia';
@@ -64,18 +63,18 @@ export const DESTINATION_LIST_ITEM_ACTIONS = {
 };
 
 export default defineComponent({
+	components: {},
+	setup() {
+		return {
+			...useMessage(),
+		};
+	},
 	data() {
 		return {
 			EnterpriseEditionFeature,
 			nodeParameters: {} as MessageEventBusDestinationOptions,
 		};
 	},
-	setup() {
-		return {
-			...useMessage(),
-		};
-	},
-	components: {},
 	props: {
 		eventBus: {
 			type: Object as PropType<EventBus>,
@@ -85,7 +84,7 @@ export default defineComponent({
 			required: true,
 			default: deepCopy(defaultMessageEventBusDestinationOptions),
 		},
-		isInstanceOwner: Boolean,
+		readonly: Boolean,
 	},
 	mounted() {
 		this.nodeParameters = Object.assign(
@@ -106,7 +105,7 @@ export default defineComponent({
 					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,
diff --git a/packages/editor-ui/src/components/SettingsLogStreaming/EventDestinationSettingsModal.ee.vue b/packages/editor-ui/src/components/SettingsLogStreaming/EventDestinationSettingsModal.ee.vue
index a597211d65..c6d5c61f20 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,7 +22,7 @@
 				<div :class="$style.header">
 					<div :class="$style.destinationInfo">
 						<InlineNameEdit
-							:modelValue="headerLabel"
+							:model-value="headerLabel"
 							:subtitle="!isTypeAbstract ? $locale.baseText(typeLabelName) : 'Select type'"
 							:readonly="isTypeAbstract"
 							type="Credential"
@@ -42,10 +42,10 @@
 							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')"
@@ -53,15 +53,15 @@
 								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>
@@ -75,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
-							:modelValue="typeSelectValue"
+							ref="typeSelectRef"
+							:model-value="typeSelectValue"
 							:placeholder="typeSelectPlaceholder"
-							@update:modelValue="onTypeSelectInput"
 							data-test-id="select-destination-type"
 							name="name"
-							ref="typeSelectRef"
+							@update:modelValue="onTypeSelectInput"
 						>
 							<n8n-option
 								v-for="option in typeSelectOptions || []"
@@ -98,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>
@@ -111,33 +111,33 @@
 					<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"
 							/>
 						</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"
 							/>
 						</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"
 							/>
@@ -152,11 +152,11 @@
 								size="medium"
 								:underline="false"
 							/>
-							<event-selection
-								:destinationId="destination.id"
+							<EventSelection
+								:destination-id="destination.id"
+								:readonly="!canManageLogStreaming"
 								@input="onInput"
 								@change="valueChanged"
-								:readonly="!isInstanceOwner"
 							/>
 						</div>
 					</div>
@@ -192,9 +192,9 @@ import type { PropType } from 'vue';
 import { defineComponent } from 'vue';
 import { LOG_STREAM_MODAL_KEY, MODAL_CONFIRM } from '@/constants';
 import Modal from '@/components/Modal.vue';
-import { useMessage } from '@/composables';
+import { useMessage } from '@/composables/useMessage';
 import { useUIStore } from '@/stores/ui.store';
-import { useUsersStore } from '@/stores/users.store';
+import { hasPermission } from '@/rbac/permissions';
 import { destinationToFakeINodeUi } from '@/components/SettingsLogStreaming/Helpers.ee';
 import {
 	webhookModalDescription,
@@ -207,9 +207,18 @@ import SaveButton from '@/components/SaveButton.vue';
 import EventSelection from '@/components/SettingsLogStreaming/EventSelection.ee.vue';
 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 defineComponent({
-	name: 'event-destination-settings-modal',
+	name: 'EventDestinationSettingsModal',
+	components: {
+		Modal,
+		ParameterInputList,
+		InlineNameEdit,
+		SaveButton,
+		EventSelection,
+	},
 	props: {
 		modalName: String,
 		destination: {
@@ -221,13 +230,6 @@ export default defineComponent({
 			type: Object as PropType<EventBus>,
 		},
 	},
-	components: {
-		Modal,
-		ParameterInputList,
-		InlineNameEdit,
-		SaveButton,
-		EventSelection,
-	},
 	setup() {
 		return {
 			...useMessage(),
@@ -244,9 +246,7 @@ export default defineComponent({
 			showRemoveConfirm: false,
 			typeSelectValue: '',
 			typeSelectPlaceholder: 'Destination Type',
-			nodeParameters: deepCopy(
-				defaultMessageEventBusDestinationOptions,
-			) as MessageEventBusDestinationOptions,
+			nodeParameters: deepCopy(defaultMessageEventBusDestinationOptions),
 			webhookDescription: webhookModalDescription,
 			sentryDescription: sentryModalDescription,
 			syslogDescription: syslogModalDescription,
@@ -254,12 +254,11 @@ export default defineComponent({
 			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)) {
@@ -308,9 +307,11 @@ export default defineComponent({
 			}
 			return items;
 		},
+		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),
 		);
@@ -466,12 +467,40 @@ export default defineComponent({
 				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 5c7c3e2037..a63ca9eae3 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
-				:modelValue="group.selected"
+			<Checkbox
+				:model-value="group.selected"
 				:indeterminate="!group.selected && group.indeterminate"
+				:disabled="readonly"
 				@update:modelValue="onInput"
 				@change="onCheckboxChecked(group.name, $event)"
-				:disabled="readonly"
 			>
 				<strong>{{ groupLabelName(group.name) }}</strong>
 				<n8n-tooltip
@@ -25,13 +25,13 @@
 						{{ groupLabelInfo(group.name) }}
 					</template>
 				</n8n-tooltip>
-			</checkbox>
-			<checkbox
+			</Checkbox>
+			<Checkbox
 				v-if="group.name === 'n8n.audit'"
-				:modelValue="logStreamingStore.items[destinationId]?.destination.anonymizeAuditMessages"
+				:model-value="logStreamingStore.items[destinationId]?.destination.anonymizeAuditMessages"
+				:disabled="readonly"
 				@update:modelValue="onInput"
 				@change="anonymizeAuditMessagesChanged"
-				:disabled="readonly"
 			>
 				{{ $locale.baseText('settings.log-streaming.tab.events.anonymize') }}
 				<n8n-tooltip placement="top" :popper-class="$style.tooltipPopper">
@@ -40,7 +40,7 @@
 						{{ $locale.baseText('settings.log-streaming.tab.events.anonymize.info') }}
 					</template>
 				</n8n-tooltip>
-			</checkbox>
+			</Checkbox>
 			<!-- </template> -->
 			<ul :class="$style.eventList">
 				<li
@@ -48,8 +48,8 @@
 					:key="event.name"
 					:class="`${$style.eventListItem} ${group.selected ? $style.eventListItemDisabled : ''}`"
 				>
-					<checkbox
-						:modelValue="event.selected || group.selected"
+					<Checkbox
+						:model-value="event.selected || group.selected"
 						:indeterminate="event.indeterminate"
 						:disabled="group.selected || readonly"
 						@update:modelValue="onInput"
@@ -61,7 +61,7 @@
 								{{ event.name }}
 							</template>
 						</n8n-tooltip>
-					</checkbox>
+					</Checkbox>
 				</li>
 			</ul>
 		</div>
@@ -75,7 +75,10 @@ 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/SettingsSidebar.vue b/packages/editor-ui/src/components/SettingsSidebar.vue
index 5f7383d849..84821d425d 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>
@@ -31,6 +31,7 @@ import type { BaseTextKey } from '@/plugins/i18n';
 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 defineComponent({
 	name: 'SettingsSidebar',
@@ -117,6 +118,16 @@ export default defineComponent({
 					available: this.canAccessLdapSettings(),
 					activateOnRouteNames: [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' } }),
+					activateOnRouteNames: [VIEWS.WORKER_VIEW],
+				},
 			];
 
 			for (const item of this.settingsFakeDoorFeatures) {
@@ -241,6 +252,10 @@ export default defineComponent({
 						void this.$router.push({ name: VIEWS.AUDIT_LOGS });
 					}
 					break;
+				case 'settings-workersview': {
+					await this.navigateTo(VIEWS.WORKER_VIEW);
+					break;
+				}
 				default:
 					break;
 			}
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 0000000000..fc6af742ca
--- /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 0000000000..9ed964665f
--- /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 0000000000..cd5657f015
--- /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 a40b6a7ccf..9d3958457d 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
index c869ef78c6..9bca97122b 100644
--- a/packages/editor-ui/src/components/SourceControlPullModal.ee.vue
+++ b/packages/editor-ui/src/components/SourceControlPullModal.ee.vue
@@ -4,9 +4,11 @@ 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, useLoadingService, useToast } from '@/composables';
+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';
+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';
@@ -87,7 +89,7 @@ async function pullWorkfolder() {
 	<Modal
 		width="500px"
 		:title="i18n.baseText('settings.sourceControl.modals.pull.title')"
-		:eventBus="data.eventBus"
+		:event-bus="data.eventBus"
 		:name="SOURCE_CONTROL_PULL_MODAL_KEY"
 	>
 		<template #content>
diff --git a/packages/editor-ui/src/components/SourceControlPushModal.ee.vue b/packages/editor-ui/src/components/SourceControlPushModal.ee.vue
index 136f5c4b2a..bd24f7f29c 100644
--- a/packages/editor-ui/src/components/SourceControlPushModal.ee.vue
+++ b/packages/editor-ui/src/components/SourceControlPushModal.ee.vue
@@ -5,9 +5,11 @@ 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, useLoadingService, useToast } from '@/composables';
+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';
+import { useUIStore } from '@/stores/ui.store';
 import { useRoute } from 'vue-router';
 import dateformat from 'dateformat';
 
@@ -231,7 +233,7 @@ async function commitAndPush() {
 	<Modal
 		width="812px"
 		:title="i18n.baseText('settings.sourceControl.modals.push.title')"
-		:eventBus="data.eventBus"
+		:event-bus="data.eventBus"
 		:name="SOURCE_CONTROL_PUSH_MODAL_KEY"
 	>
 		<template #content>
@@ -248,13 +250,13 @@ async function commitAndPush() {
 						<div class="mt-l mb-2xs">
 							<n8n-checkbox
 								:indeterminate="selectAllIndeterminate"
-								:modelValue="selectAll"
+								:model-value="selectAll"
 								@update:modelValue="onToggleSelectAll"
 							>
 								<n8n-text bold tag="strong">
 									{{ i18n.baseText('settings.sourceControl.modals.push.workflowsToCommit') }}
 								</n8n-text>
-								<n8n-text tag="strong" v-show="workflowFiles.length > 0">
+								<n8n-text v-show="workflowFiles.length > 0" tag="strong">
 									({{ stagedWorkflowFiles.length }}/{{ workflowFiles.length }})
 								</n8n-text>
 							</n8n-checkbox>
@@ -268,7 +270,7 @@ async function commitAndPush() {
 						>
 							<div :class="$style.listItemBody">
 								<n8n-checkbox
-									:modelValue="staged[file.file]"
+									:model-value="staged[file.file]"
 									:class="$style.listItemCheckbox"
 									@update:modelValue="setStagedStatus(file, !staged[file.file])"
 								/>
@@ -278,7 +280,7 @@ async function commitAndPush() {
 										<span v-if="file.type === 'credential'"> Deleted Credential: </span>
 										<strong>{{ file.name || file.id }}</strong>
 									</n8n-text>
-									<n8n-text bold v-else> {{ file.name }} </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) }}
@@ -287,8 +289,8 @@ async function commitAndPush() {
 								</div>
 								<div :class="$style.listItemStatus">
 									<n8n-badge
-										class="mr-2xs"
 										v-if="workflowId === file.id && file.type === 'workflow'"
+										class="mr-2xs"
 									>
 										Current workflow
 									</n8n-badge>
@@ -299,7 +301,7 @@ async function commitAndPush() {
 							</div>
 						</n8n-card>
 					</div>
-					<n8n-notice class="mt-0" v-else>
+					<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')">
@@ -315,8 +317,8 @@ async function commitAndPush() {
 						{{ i18n.baseText('settings.sourceControl.modals.push.commitMessage') }}
 					</n8n-text>
 					<n8n-input
-						type="text"
 						v-model="commitMessage"
+						type="text"
 						:placeholder="
 							i18n.baseText('settings.sourceControl.modals.push.commitMessage.placeholder')
 						"
diff --git a/packages/editor-ui/src/components/SqlEditor/SqlEditor.vue b/packages/editor-ui/src/components/SqlEditor/SqlEditor.vue
index 386b7dd681..fd33c1ea02 100644
--- a/packages/editor-ui/src/components/SqlEditor/SqlEditor.vue
+++ b/packages/editor-ui/src/components/SqlEditor/SqlEditor.vue
@@ -1,52 +1,54 @@
 <template>
-	<div :class="$style.sqlEditor" v-on-click-outside="onBlur">
+	<div v-on-click-outside="onBlur" :class="$style.sqlEditor">
 		<div ref="sqlEditor" data-test-id="sql-editor-container"></div>
+		<slot name="suffix" />
 		<InlineExpressionEditorOutput
+			v-if="!fillParent"
 			:segments="segments"
-			:isReadOnly="isReadOnly"
+			:is-read-only="isReadOnly"
 			:visible="isFocused"
-			:hoveringItemNumber="hoveringItemNumber"
+			:hovering-item-number="hoveringItemNumber"
 		/>
 	</div>
 </template>
 
 <script lang="ts">
-import { defineComponent } from 'vue';
-import { acceptCompletion, autocompletion, ifNotIn } from '@codemirror/autocomplete';
-import { indentWithTab, history, redo, toggleComment } from '@codemirror/commands';
-import { bracketMatching, foldGutter, indentOnInput, LanguageSupport } from '@codemirror/language';
+import InlineExpressionEditorOutput from '@/components/InlineExpressionEditor/InlineExpressionEditorOutput.vue';
+import { EXPRESSIONS_DOCS_URL } from '@/constants';
+import { codeNodeEditorEventBus } from '@/event-bus';
+import { expressionManager } from '@/mixins/expressionManager';
+import { n8nCompletionSources } from '@/plugins/codemirror/completions/addCompletions';
+import { expressionInputHandler } from '@/plugins/codemirror/inputHandlers/expression.inputHandler';
+import { highlighter } from '@/plugins/codemirror/resolvableHighlighter';
+import { autocompletion, ifNotIn } from '@codemirror/autocomplete';
+import { history, redo, toggleComment, undo } from '@codemirror/commands';
+import { LanguageSupport, bracketMatching, foldGutter, indentOnInput } from '@codemirror/language';
+import { type Extension, type Line, Prec } from '@codemirror/state';
 import { EditorState } from '@codemirror/state';
-import type { Line } from '@codemirror/state';
-import type { Extension } from '@codemirror/state';
+import type { ViewUpdate } from '@codemirror/view';
 import {
-	dropCursor,
 	EditorView,
+	dropCursor,
 	highlightActiveLine,
 	highlightActiveLineGutter,
 	keymap,
 	lineNumbers,
 } from '@codemirror/view';
-import type { ViewUpdate } from '@codemirror/view';
+import type { SQLDialect as SQLDialectType } from '@n8n/codemirror-lang-sql';
 import {
-	MSSQL,
-	MySQL,
-	PostgreSQL,
-	StandardSQL,
-	MariaSQL,
-	SQLite,
 	Cassandra,
+	MSSQL,
+	MariaSQL,
+	MySQL,
 	PLSQL,
+	PostgreSQL,
+	SQLite,
+	StandardSQL,
 	keywordCompletionSource,
 } from '@n8n/codemirror-lang-sql';
-import type { SQLDialect as SQLDialectType } from '@n8n/codemirror-lang-sql';
+import { defineComponent } from 'vue';
+import { enterKeyMap, tabKeyMap } from '../CodeNodeEditor/baseExtensions';
 import { codeNodeEditorTheme } from '../CodeNodeEditor/theme';
-import { n8nCompletionSources } from '@/plugins/codemirror/completions/addCompletions';
-import { expressionInputHandler } from '@/plugins/codemirror/inputHandlers/expression.inputHandler';
-import { highlighter } from '@/plugins/codemirror/resolvableHighlighter';
-import { expressionManager } from '@/mixins/expressionManager';
-import InlineExpressionEditorOutput from '@/components/InlineExpressionEditor/InlineExpressionEditorOutput.vue';
-import { EXPRESSIONS_DOCS_URL } from '@/constants';
-import { codeNodeEditorEventBus } from '@/event-bus';
 
 const SQL_DIALECTS = {
 	StandardSQL,
@@ -61,13 +63,14 @@ const SQL_DIALECTS = {
 
 type SQLEditorData = {
 	editor: EditorView | null;
+	editorState: EditorState | null;
 	isFocused: boolean;
 	skipSegments: string[];
 	expressionsDocsUrl: string;
 };
 
 export default defineComponent({
-	name: 'sql-editor',
+	name: 'SqlEditor',
 	components: {
 		InlineExpressionEditorOutput,
 	},
@@ -88,34 +91,24 @@ export default defineComponent({
 			type: Boolean,
 			default: false,
 		},
+		fillParent: {
+			type: Boolean,
+			default: false,
+		},
 		rows: {
 			type: Number,
-			default: -1,
+			default: 4,
 		},
 	},
 	data(): SQLEditorData {
 		return {
 			editor: null,
+			editorState: null,
 			expressionsDocsUrl: EXPRESSIONS_DOCS_URL,
 			isFocused: false,
 			skipSegments: ['Statement', 'CompositeIdentifier', 'Parens'],
 		};
 	},
-	watch: {
-		'ndvStore.ndvInputData'() {
-			this.editor?.dispatch({
-				changes: {
-					from: 0,
-					to: this.editor.state.doc.length,
-					insert: this.modelValue,
-				},
-			});
-
-			setTimeout(() => {
-				this.editor?.contentDOM.blur();
-			});
-		},
-	},
 	computed: {
 		doc(): string {
 			return this.editor?.state.doc.toString() ?? '';
@@ -143,12 +136,12 @@ export default defineComponent({
 				expressionInputHandler(),
 				codeNodeEditorTheme({
 					isReadOnly: this.isReadOnly,
-					customMaxHeight: '350px',
-					customMinHeight: this.rows,
+					maxHeight: this.fillParent ? '100%' : '40vh',
+					minHeight: '10vh',
+					rows: this.rows,
 				}),
 				lineNumbers(),
 				EditorView.lineWrapping,
-				EditorState.readOnly.of(this.isReadOnly),
 				EditorView.domEventHandlers({
 					focus: () => {
 						this.isFocused = true;
@@ -161,12 +154,15 @@ export default defineComponent({
 			if (!this.isReadOnly) {
 				extensions.push(
 					history(),
-					keymap.of([
-						{ key: 'Mod-Shift-z', run: redo },
-						{ key: 'Mod-/', run: toggleComment },
-						{ key: 'Tab', run: acceptCompletion },
-						indentWithTab,
-					]),
+					Prec.highest(
+						keymap.of([
+							...tabKeyMap,
+							...enterKeyMap,
+							{ key: 'Mod-z', run: undo },
+							{ key: 'Mod-Shift-z', run: redo },
+							{ key: 'Mod-/', run: toggleComment },
+						]),
+					),
 					autocompletion(),
 					indentOnInput(),
 					highlightActiveLine(),
@@ -177,8 +173,6 @@ export default defineComponent({
 					EditorView.updateListener.of((viewUpdate: ViewUpdate) => {
 						if (!viewUpdate.docChanged || !this.editor) return;
 
-						this.editorState = this.editor.state;
-
 						highlighter.removeColor(this.editor as EditorView, this.plaintextSegments);
 						highlighter.addColor(this.editor as EditorView, this.resolvableSegments);
 
@@ -189,6 +183,21 @@ export default defineComponent({
 			return extensions;
 		},
 	},
+	watch: {
+		'ndvStore.ndvInputData'() {
+			this.editor?.dispatch({
+				changes: {
+					from: 0,
+					to: this.editor.state.doc.length,
+					insert: this.modelValue,
+				},
+			});
+
+			setTimeout(() => {
+				this.editor?.contentDOM.blur();
+			});
+		},
+	},
 	mounted() {
 		if (!this.isReadOnly) codeNodeEditorEventBus.on('error-line-number', this.highlightLine);
 
@@ -234,5 +243,10 @@ export default defineComponent({
 <style module lang="scss">
 .sqlEditor {
 	position: relative;
+	height: 100%;
+
+	& > div {
+		height: 100%;
+	}
 }
 </style>
diff --git a/packages/editor-ui/src/components/Sticky.vue b/packages/editor-ui/src/components/Sticky.vue
index 50d0b5e7e4..1042548f15 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,27 +11,30 @@
 			: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
-					:modelValue="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"
+					:background-color="node.parameters.color"
+					:read-only="isReadOnly"
+					:default-text="defaultText"
+					:edit-mode="isActive && !isReadOnly"
+					:grid-size="gridSize"
 					@edit="onEdit"
 					@resizestart="onResizeStart"
 					@resize="onResize"
@@ -41,7 +44,10 @@
 				/>
 			</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"
@@ -50,20 +56,58 @@
 				>
 					<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 { defineComponent } from 'vue';
+import { defineComponent, ref } from 'vue';
 import { mapStores } from 'pinia';
 
-import { externalHooks } from '@/mixins/externalHooks';
 import { nodeBase } from '@/mixins/nodeBase';
-import { nodeHelpers } from '@/mixins/nodeHelpers';
 import { workflowHelpers } from '@/mixins/workflowHelpers';
-import { isNumber, isString } from '@/utils';
+import { isNumber, isString } from '@/utils/typeGuards';
 import type {
 	INodeUi,
 	INodeUpdatePropertiesInformation,
@@ -77,11 +121,12 @@ 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 defineComponent({
 	name: 'Sticky',
-	mixins: [externalHooks, nodeBase, nodeHelpers, workflowHelpers],
-
+	mixins: [nodeBase, workflowHelpers],
 	props: {
 		nodeViewScale: {
 			type: Number,
@@ -90,6 +135,22 @@ export default defineComponent({
 			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 +210,10 @@ export default defineComponent({
 			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,11 +226,23 @@ export default defineComponent({
 		};
 	},
 	methods: {
+		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) {
 			if (edit && !this.isActive && this.node) {
 				this.ndvStore.activeNodeName = this.node.name;
@@ -182,8 +258,8 @@ export default defineComponent({
 					isOnboardingNote && isWelcomeVideo
 						? 'welcome_video'
 						: isOnboardingNote && link.getAttribute('href') === '/templates'
-						? 'templates'
-						: 'other';
+						  ? 'templates'
+						  : 'other';
 
 				this.$telemetry.track('User clicked note link', { type });
 			}
@@ -211,12 +287,13 @@ export default defineComponent({
 		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 +320,18 @@ export default defineComponent({
 			this.workflowsStore.updateNodeProperties(updateInformation);
 		},
 		touchStart() {
-			if (this.isTouchDevice === true && this.isMacOs === false && this.isTouchActive === false) {
+			if (this.deviceSupport.isTouchDevice === true && !this.isMacOs && !this.isTouchActive) {
 				this.isTouchActive = true;
 				setTimeout(() => {
 					this.isTouchActive = false;
 				}, 2000);
 			}
 		},
+		onContextMenu(e: MouseEvent): void {
+			if (this.node) {
+				this.contextMenu.open(e, { source: 'node-right-click', node: this.node });
+			}
+		},
 	},
 });
 </script>
@@ -272,6 +354,10 @@ export default defineComponent({
 			}
 		}
 
+		&.is-read-only {
+			pointer-events: none;
+		}
+
 		.sticky-options {
 			display: none;
 			justify-content: flex-start;
@@ -299,6 +385,10 @@ export default defineComponent({
 			}
 		}
 
+		.force-show {
+			display: flex;
+		}
+
 		&.is-touch-device .sticky-options {
 			left: -25px;
 			width: 150px;
@@ -313,12 +403,7 @@ export default defineComponent({
 .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 +412,22 @@ export default defineComponent({
 	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 0000000000..29c2f5aba0
--- /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 0000000000..1bbbb32c1b
--- /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 0000000000..e0956281d1
--- /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%"
+				@openCollection="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 342b662d34..8c7fdf1ebc 100644
--- a/packages/editor-ui/src/components/TagsContainer.vue
+++ b/packages/editor-ui/src/components/TagsContainer.vue
@@ -1,12 +1,12 @@
 <template>
 	<IntersectionObserver
+		ref="tagsContainer"
 		:threshold="1.0"
-		@observed="onObserved"
 		class="tags-container"
 		:style="style"
 		:enabled="responsive"
 		:event-bus="intersectionEventBus"
-		ref="tagsContainer"
+		@observed="onObserved"
 	>
 		<span class="tags">
 			<span
@@ -16,21 +16,21 @@
 				@click="(e) => onClick(e, tag)"
 			>
 				<el-tag
+					v-if="tag.isCount"
 					:title="tag.title"
 					type="info"
 					size="small"
-					v-if="tag.isCount"
 					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"
-					v-else
 				>
 					<el-tag
 						:title="tag.name"
diff --git a/packages/editor-ui/src/components/TagsDropdown.vue b/packages/editor-ui/src/components/TagsDropdown.vue
index 70002cd55b..fd5cfa5879 100644
--- a/packages/editor-ui/src/components/TagsDropdown.vue
+++ b/packages/editor-ui/src/components/TagsDropdown.vue
@@ -1,22 +1,23 @@
 <template>
 	<div
+		v-on-click-outside="onClickOutside"
 		:class="{ 'tags-container': true, focused }"
 		@keydown.stop
-		v-on-click-outside="onClickOutside"
 	>
 		<n8n-select
+			ref="selectRef"
 			:teleported="true"
-			:modelValue="appliedTags"
+			:model-value="appliedTags"
 			:loading="isLoading"
 			:placeholder="placeholder"
 			:filter-method="filterOptions"
 			filterable
 			multiple
-			:allowCreate="createEnabled"
+			:allow-create="createEnabled"
 			:reserve-keyword="false"
-			ref="selectRef"
 			loading-text="..."
 			popper-class="tags-dropdown"
+			data-test-id="tags-dropdown"
 			@update:modelValue="onTagsUpdated"
 			@visible-change="onVisibleChange"
 			@remove-tag="onRemoveTag"
@@ -24,9 +25,9 @@
 			<n8n-option
 				v-if="options.length === 0 && filter && createEnabled"
 				:key="CREATE_KEY"
+				ref="createRef"
 				:value="CREATE_KEY"
 				class="ops"
-				ref="createRef"
 			>
 				<font-awesome-icon icon="plus-circle" />
 				<span>
@@ -44,11 +45,12 @@
 			<!-- 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="tagRefs"
+				data-test-id="tag"
 			/>
 
 			<n8n-option :key="MANAGE_KEY" :value="MANAGE_KEY" class="ops manage-tags">
@@ -65,12 +67,12 @@ import { computed, defineComponent, nextTick, onBeforeUnmount, onMounted, ref, w
 import type { ITag } from '@/Interface';
 import { MAX_TAG_NAME_LENGTH, TAGS_MANAGER_MODAL_KEY } from '@/constants';
 
-import { useI18n, useToast } from '@/composables';
+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 } from 'n8n-design-system';
+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>;
diff --git a/packages/editor-ui/src/components/TagsManager/NoTagsView.vue b/packages/editor-ui/src/components/TagsManager/NoTagsView.vue
index e9c64f1bd4..074e647d1a 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 69a9471b40..ee3245aa8e 100644
--- a/packages/editor-ui/src/components/TagsManager/TagsManager.vue
+++ b/packages/editor-ui/src/components/TagsManager/TagsManager.vue
@@ -3,27 +3,27 @@
 		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"
 				/>
-				<NoTagsView @enableCreate="onEnableCreate" v-else />
+				<NoTagsView v-else @enableCreate="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>
@@ -33,7 +33,7 @@ import { defineComponent } from 'vue';
 
 import type { ITag } from '@/Interface';
 
-import { useToast } from '@/composables';
+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';
@@ -44,14 +44,16 @@ import { createEventBus } from 'n8n-design-system/utils';
 
 export default defineComponent({
 	name: 'TagsManager',
+	components: {
+		TagsView,
+		NoTagsView,
+		Modal,
+	},
 	setup() {
 		return {
 			...useToast(),
 		};
 	},
-	created() {
-		void this.tagsStore.fetchAll({ force: true, withUsageCount: true });
-	},
 	data() {
 		const tagIds = useTagsStore().allTags.map((tag) => tag.id);
 		return {
@@ -61,10 +63,8 @@ export default defineComponent({
 			TAGS_MANAGER_MODAL_KEY,
 		};
 	},
-	components: {
-		TagsView,
-		NoTagsView,
-		Modal,
+	created() {
+		void this.tagsStore.fetchAll({ force: true, withUsageCount: true });
 	},
 	computed: {
 		...mapStores(useTagsStore),
diff --git a/packages/editor-ui/src/components/TagsManager/TagsView/TagsTable.vue b/packages/editor-ui/src/components/TagsManager/TagsView/TagsTable.vue
index 65bedf13bc..b07f4366de 100644
--- a/packages/editor-ui/src/components/TagsManager/TagsView/TagsTable.vue
+++ b/packages/editor-ui/src/components/TagsManager/TagsView/TagsTable.vue
@@ -1,25 +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"
-							:modelValue="newName"
+							ref="nameInput"
+							:model-value="newName"
 							:maxlength="maxLength"
 							@update:modelValue="onNewNameChange"
-							ref="nameInput"
 						></n8n-input>
 						<span v-else-if="scope.row.delete">
 							<span>{{ $locale.baseText('tagsTable.areYouSureYouWantToDeleteThisTag') }}</span>
@@ -47,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>
@@ -128,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();
@@ -180,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);
@@ -189,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);
@@ -204,13 +211,6 @@ export default defineComponent({
 			this.focusOnInput();
 		},
 	},
-	watch: {
-		rows(newValue: ITagRow[] | undefined) {
-			if (newValue && newValue[0] && newValue[0].create) {
-				this.focusOnCreate();
-			}
-		},
-	},
 });
 </script>
 
diff --git a/packages/editor-ui/src/components/TagsManager/TagsView/TagsTableHeader.vue b/packages/editor-ui/src/components/TagsManager/TagsView/TagsTableHeader.vue
index f327db503d..57a2a7e7b2 100644
--- a/packages/editor-ui/src/components/TagsManager/TagsView/TagsTableHeader.vue
+++ b/packages/editor-ui/src/components/TagsManager/TagsView/TagsTableHeader.vue
@@ -3,7 +3,7 @@
 		<el-col :span="10">
 			<n8n-input
 				:placeholder="$locale.baseText('tagsTableHeader.searchTags')"
-				:modelValue="search"
+				:model-value="search"
 				:disabled="disabled"
 				:maxlength="maxLength"
 				clearable
@@ -16,12 +16,12 @@
 		</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>
diff --git a/packages/editor-ui/src/components/TagsManager/TagsView/TagsView.vue b/packages/editor-ui/src/components/TagsManager/TagsView/TagsView.vue
index f045041812..1783541da4 100644
--- a/packages/editor-ui/src/components/TagsManager/TagsView/TagsView.vue
+++ b/packages/editor-ui/src/components/TagsManager/TagsView/TagsView.vue
@@ -7,17 +7,17 @@
 			@createEnable="onCreateEnable"
 		/>
 		<TagsTable
+			ref="tagsTable"
 			:rows="rows"
-			:isLoading="isLoading"
-			:isSaving="isSaving"
-			:newName="newName"
+			:is-loading="isLoading"
+			:is-saving="isSaving"
+			:new-name="newName"
+			data-test-id="tags-table"
 			@newNameChange="onNewNameChange"
 			@updateEnable="onUpdateEnable"
 			@deleteEnable="onDeleteEnable"
 			@cancelOperation="cancelOperation"
 			@applyOperation="applyOperation"
-			ref="tagsTable"
-			data-test-id="tags-table"
 		/>
 	</div>
 </template>
@@ -30,6 +30,7 @@ import TagsTableHeader from '@/components/TagsManager/TagsView/TagsTableHeader.v
 import TagsTable from '@/components/TagsManager/TagsView/TagsTable.vue';
 import { mapStores } from 'pinia';
 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());
@@ -50,7 +51,7 @@ export default defineComponent({
 		};
 	},
 	computed: {
-		...mapStores(useUsersStore),
+		...mapStores(useUsersStore, useRBACStore),
 		isCreateEnabled(): boolean {
 			return (this.tags || []).length === 0 || this.createEnabled;
 		},
@@ -70,7 +71,7 @@ export default defineComponent({
 						disable: disabled && tag.id !== this.deleteId && tag.id !== this.updateId,
 						update: disabled && tag.id === this.updateId,
 						delete: disabled && tag.id === this.deleteId,
-						canDelete: this.usersStore.canUserDeleteTags,
+						canDelete: this.rbacStore.hasScope('tag:delete'),
 					}),
 				);
 
diff --git a/packages/editor-ui/src/components/Telemetry.vue b/packages/editor-ui/src/components/Telemetry.vue
index 41ab6fa069..dc8eec4d60 100644
--- a/packages/editor-ui/src/components/Telemetry.vue
+++ b/packages/editor-ui/src/components/Telemetry.vue
@@ -9,11 +9,9 @@ import { useRootStore } from '@/stores/n8nRoot.store';
 import { useSettingsStore } from '@/stores/settings.store';
 import { useUsersStore } from '@/stores/users.store';
 import type { ITelemetrySettings } from 'n8n-workflow';
-import { externalHooks } from '@/mixins/externalHooks';
 
 export default defineComponent({
 	name: 'Telemetry',
-	mixins: [externalHooks],
 	data() {
 		return {
 			isTelemetryInitialized: false,
@@ -25,9 +23,7 @@ export default defineComponent({
 			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;
@@ -36,6 +32,21 @@ export default defineComponent({
 			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();
 	},
@@ -57,20 +68,5 @@ export default defineComponent({
 			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 f1f87ba742..1eab5bc6a9 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" v-if="!simpleView">
+			<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>
@@ -46,14 +48,17 @@
 
 <script lang="ts">
 import { defineComponent } from 'vue';
-import { genericHelpers } from '@/mixins/genericHelpers';
-import { filterTemplateNodes, abbreviateNumber } from '@/utils';
+import { filterTemplateNodes } from '@/utils/nodeTypesUtils';
+import { abbreviateNumber } from '@/utils/typesUtils';
 import NodeList from './NodeList.vue';
 import TimeAgo from '@/components/TimeAgo.vue';
 
 export default defineComponent({
 	name: 'TemplateCard',
-	mixins: [genericHelpers],
+	components: {
+		TimeAgo,
+		NodeList,
+	},
 	props: {
 		lastItem: {
 			type: Boolean,
@@ -77,10 +82,6 @@ export default defineComponent({
 			default: false,
 		},
 	},
-	components: {
-		TimeAgo,
-		NodeList,
-	},
 	data() {
 		return {
 			nodesToBeShown: 5,
diff --git a/packages/editor-ui/src/components/TemplateDetails.vue b/packages/editor-ui/src/components/TemplateDetails.vue
index d40e33213a..6208fa655a 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,23 +10,23 @@
 					: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:tag="redirectToCategory" />
-		</template-details-block>
+		</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') }}
@@ -42,15 +42,17 @@
 					{{ $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.store';
@@ -58,6 +60,11 @@ import TimeAgo from '@/components/TimeAgo.vue';
 
 export default defineComponent({
 	name: 'TemplateDetails',
+	components: {
+		NodeIcon,
+		TemplateDetailsBlock,
+		TimeAgo,
+	},
 	props: {
 		blockTitle: {
 			type: String,
@@ -69,11 +76,6 @@ export default defineComponent({
 			type: Object as PropType<ITemplatesWorkflow | ITemplatesWorkflowFull>,
 		},
 	},
-	components: {
-		NodeIcon,
-		TemplateDetailsBlock,
-		TimeAgo,
-	},
 	computed: {
 		...mapStores(useTemplatesStore),
 	},
diff --git a/packages/editor-ui/src/components/TemplateFilters.vue b/packages/editor-ui/src/components/TemplateFilters.vue
index 3fe428c859..fe7b902258 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')"
-					:modelValue="allSelected"
-					@update:modelValue="(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"
-					:modelValue="isSelected(category.id)"
-					@update:modelValue="(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">
@@ -38,20 +41,22 @@
 
 <script lang="ts">
 import { defineComponent } from 'vue';
-import { genericHelpers } from '@/mixins/genericHelpers';
 import type { ITemplatesCategory } from '@/Interface';
+import type { PropType } from 'vue';
+import { useTemplatesStore } from '@/stores/templates.store';
+import { mapStores } from 'pinia';
 
 export default defineComponent({
 	name: 'TemplateFilters',
-	mixins: [genericHelpers],
 	props: {
+		categories: {
+			type: Array as PropType<ITemplatesCategory[]>,
+			default: () => [],
+		},
 		sortOnPopulate: {
 			type: Boolean,
 			default: false,
 		},
-		categories: {
-			type: Array,
-		},
 		expandLimit: {
 			type: Number,
 			default: 12,
@@ -60,24 +65,11 @@ export default defineComponent({
 			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,
@@ -85,19 +77,48 @@ export default defineComponent({
 		};
 	},
 	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 4f8d9699db..6762fb35d3 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" v-if="!simpleView">
+	<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,21 +12,21 @@
 				v-for="(workflow, index) in workflows"
 				:key="workflow.id"
 				:workflow="workflow"
-				:firstItem="index === 0"
+				:first-item="index === 0"
 				:simple-view="simpleView"
-				:lastItem="index === workflows.length - 1 && !loading"
-				:useWorkflowButton="useWorkflowButton"
+				:last-item="index === workflows.length - 1 && !loading"
+				:use-workflow-button="useWorkflowButton"
 				@click="(e) => onCardClick(e, workflow.id)"
 				@useWorkflow="(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>
@@ -34,12 +35,13 @@
 
 <script lang="ts">
 import { defineComponent } from 'vue';
-import { genericHelpers } from '@/mixins/genericHelpers';
 import TemplateCard from './TemplateCard.vue';
 
 export default defineComponent({
 	name: 'TemplateList',
-	mixins: [genericHelpers],
+	components: {
+		TemplateCard,
+	},
 	props: {
 		infiniteScrollEnabled: {
 			type: Boolean,
@@ -54,14 +56,20 @@ export default defineComponent({
 		},
 		workflows: {
 			type: Array,
+			default: () => [],
 		},
 		totalWorkflows: {
 			type: Number,
+			default: 0,
 		},
 		simpleView: {
 			type: Boolean,
 			default: false,
 		},
+		totalCount: {
+			type: Number,
+			default: 0,
+		},
 	},
 	mounted() {
 		if (this.infiniteScrollEnabled) {
@@ -77,9 +85,6 @@ export default defineComponent({
 			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 0000000000..7084cbf298
--- /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/CollectionsCarousel.vue b/packages/editor-ui/src/components/TemplatesInfoCarousel.vue
similarity index 82%
rename from packages/editor-ui/src/components/CollectionsCarousel.vue
rename to packages/editor-ui/src/components/TemplatesInfoCarousel.vue
index b5355f9aa5..d067e4b263 100644
--- a/packages/editor-ui/src/components/CollectionsCarousel.vue
+++ b/packages/editor-ui/src/components/TemplatesInfoCarousel.vue
@@ -1,25 +1,36 @@
 <template>
-	<div :class="$style.container" v-show="loading || collections.length">
+	<div v-show="loading || collections.length" :class="$style.container">
 		<agile
 			ref="slider"
 			:dots="false"
-			:navButtons="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" />
-			<CollectionCard
+			<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="carouselScrollPosition > 0" :class="$style.leftButton" @click="scrollLeft">
+		<button
+			v-show="showNavigation && carouselScrollPosition > 0"
+			:class="{ [$style.leftButton]: true }"
+			@click="scrollLeft"
+		>
 			<font-awesome-icon icon="chevron-left" />
 		</button>
-		<button v-show="!scrollEnd" :class="$style.rightButton" @click="scrollRight">
+		<button
+			v-show="showNavigation && !scrollEnd"
+			:class="{ [$style.rightButton]: true }"
+			@click="scrollRight"
+		>
 			<font-awesome-icon icon="chevron-right" />
 		</button>
 	</div>
@@ -30,16 +41,18 @@ import { defineComponent } from 'vue';
 import type { PropType } from 'vue';
 import type { ITemplatesCollection } from '@/Interface';
 import Card from '@/components/CollectionWorkflowCard.vue';
-import CollectionCard from '@/components/CollectionCard.vue';
+import TemplatesInfoCard from '@/components/TemplatesInfoCard.vue';
 import { VueAgile } from 'vue-agile';
 
-import { genericHelpers } from '@/mixins/genericHelpers';
-
 type SliderRef = InstanceType<typeof VueAgile>;
 
 export default defineComponent({
-	name: 'CollectionsCarousel',
-	mixins: [genericHelpers],
+	name: 'TemplatesInfoCarousel',
+	components: {
+		Card,
+		TemplatesInfoCard,
+		agile: VueAgile,
+	},
 	props: {
 		collections: {
 			type: Array as PropType<ITemplatesCollection[]>,
@@ -47,6 +60,27 @@ export default defineComponent({
 		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() {
@@ -60,18 +94,25 @@ export default defineComponent({
 			}, 0);
 		},
 	},
-	components: {
-		Card,
-		CollectionCard,
-		agile: VueAgile,
+	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);
+		}
 	},
-	data() {
-		return {
-			carouselScrollPosition: 0,
-			cardWidth: 240,
-			scrollEnd: false,
-			listElement: null as null | Element,
-		};
+	beforeUnmount() {
+		const sliderRef = this.$refs.slider as SliderRef | undefined;
+		if (sliderRef) {
+			sliderRef.destroy();
+		}
+
+		window.removeEventListener('scroll', this.updateCarouselScroll);
 	},
 	methods: {
 		updateCarouselScroll() {
@@ -98,26 +139,6 @@ export default defineComponent({
 			}
 		},
 	},
-	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);
-	},
 });
 </script>
 
@@ -175,6 +196,7 @@ export default defineComponent({
 .rightButton {
 	composes: button;
 	right: -30px;
+
 	&:after {
 		right: 27px;
 		background: linear-gradient(
diff --git a/packages/editor-ui/src/components/TextEdit.vue b/packages/editor-ui/src/components/TextEdit.vue
index 96bdd01c16..3573bf7c1f 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
-			:modelValue="dialogVisible"
+			:model-value="dialogVisible"
 			append-to-body
 			width="80%"
 			:title="`${$locale.baseText('textEdit.edit')} ${$locale
@@ -13,11 +13,11 @@
 				<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"
 							:placeholder="$locale.nodeText().placeholder(parameter, path)"
-							:readOnly="isReadOnly"
+							:read-only="isReadOnly"
 							:rows="15"
 							@update:modelValue="valueChanged"
 						/>
@@ -39,6 +39,20 @@ export default defineComponent({
 			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('update:modelValue', value);
@@ -58,19 +72,5 @@ export default defineComponent({
 			return false;
 		},
 	},
-	mounted() {
-		this.tempValue = this.modelValue as string;
-	},
-	watch: {
-		async dialogVisible() {
-			if (this.dialogVisible === true) {
-				await nextTick();
-				(this.$refs.inputField as HTMLInputElement).focus();
-			}
-		},
-		modelValue(value: string) {
-			this.tempValue = value;
-		},
-	},
 });
 </script>
diff --git a/packages/editor-ui/src/components/TextWithHighlights.vue b/packages/editor-ui/src/components/TextWithHighlights.vue
new file mode 100644
index 0000000000..43951463d8
--- /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 2d5cf3d210..333375ad57 100644
--- a/packages/editor-ui/src/components/TimeAgo.vue
+++ b/packages/editor-ui/src/components/TimeAgo.vue
@@ -7,7 +7,7 @@
 <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/n8nRoot.store';
diff --git a/packages/editor-ui/src/components/TitledList.vue b/packages/editor-ui/src/components/TitledList.vue
index f15337f055..cd73f6d48e 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 19bb1c61fa..ea1a7ac1df 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"
@@ -30,10 +30,10 @@
 					></CopyInput>
 					<NodeExecuteButton
 						data-test-id="trigger-execute-button"
-						:nodeName="nodeName"
-						@execute="onNodeExecute"
+						:node-name="nodeName"
 						size="medium"
-						telemetrySource="inputs"
+						telemetry-source="inputs"
+						@execute="onNodeExecute"
 					/>
 				</div>
 				<div v-else>
@@ -45,17 +45,23 @@
 							{{ listeningHint }}
 						</n8n-text>
 					</div>
+					<div v-if="displayChatButton">
+						<n8n-button @click="openWebhookUrl()" class="mb-xl">
+							{{ $locale.baseText('ndv.trigger.chatTrigger.openChat') }}
+						</n8n-button>
+					</div>
+
 					<NodeExecuteButton
 						data-test-id="trigger-execute-button"
-						:nodeName="nodeName"
-						@execute="onNodeExecute"
+						:node-name="nodeName"
 						size="medium"
-						telemetrySource="inputs"
+						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>
 
@@ -71,29 +77,29 @@
 
 					<NodeExecuteButton
 						data-test-id="trigger-execute-button"
-						:nodeName="nodeName"
-						@execute="onNodeExecute"
+						: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"
-					:eventBus="executionsHelpEventBus"
+					:event-bus="executionsHelpEventBus"
 					@click:body="onLinkClick"
 				></n8n-info-accordion>
 			</div>
@@ -105,6 +111,7 @@
 import { defineComponent } from 'vue';
 import { mapStores } from 'pinia';
 import {
+	CHAT_TRIGGER_NODE_TYPE,
 	VIEWS,
 	WEBHOOK_NODE_TYPE,
 	WORKFLOW_SETTINGS_MODAL_KEY,
@@ -112,34 +119,25 @@ import {
 } from '@/constants';
 import type { INodeUi } from '@/Interface';
 import type { INodeTypeDescription } from 'n8n-workflow';
-import { getTriggerNodeServiceName } from '@/utils';
+import { getTriggerNodeServiceName } from '@/utils/nodeTypesUtils';
 import NodeExecuteButton from '@/components/NodeExecuteButton.vue';
 import { workflowHelpers } from '@/mixins/workflowHelpers';
 import CopyInput from '@/components/CopyInput.vue';
 import NodeIcon from '@/components/NodeIcon.vue';
-import { copyPaste } from '@/mixins/copyPaste';
 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 type { N8nInfoAccordion } from 'n8n-design-system';
 import { createEventBus } from 'n8n-design-system/utils';
 
-type HelpRef = InstanceType<typeof N8nInfoAccordion>;
-
 export default defineComponent({
 	name: 'TriggerPanel',
-	mixins: [workflowHelpers, copyPaste],
 	components: {
 		NodeExecuteButton,
 		CopyInput,
 		NodeIcon,
 	},
-	data: () => {
-		return {
-			executionsHelpEventBus: createEventBus(),
-		};
-	},
+	mixins: [workflowHelpers],
 	props: {
 		nodeName: {
 			type: String,
@@ -148,6 +146,11 @@ export default defineComponent({
 			type: String,
 		},
 	},
+	data: () => {
+		return {
+			executionsHelpEventBus: createEventBus(),
+		};
+	},
 	computed: {
 		...mapStores(useNodeTypesStore, useNDVStore, useUIStore, useWorkflowsStore),
 		node(): INodeUi | null {
@@ -160,6 +163,36 @@ export default defineComponent({
 
 			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.getCurrentWorkflow().expression.getSimpleParameterValue(
+						this.node,
+						hideContent,
+						'internal',
+						{},
+					);
+
+					if (typeof hideContentValue === 'boolean') {
+						return hideContentValue;
+					}
+				}
+			}
+
+			return false;
+		},
 		hasIssues(): boolean {
 			return Boolean(
 				this.node?.issues && (this.node.issues.parameters || this.node.issues.credentials),
@@ -172,6 +205,13 @@ export default defineComponent({
 
 			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);
 		},
@@ -193,7 +233,7 @@ export default defineComponent({
 			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;
@@ -223,11 +263,16 @@ export default defineComponent({
 				: this.$locale.baseText('ndv.trigger.webhookNode.listening');
 		},
 		listeningHint(): string {
-			return this.nodeType?.name === FORM_TRIGGER_NODE_TYPE
-				? this.$locale.baseText('ndv.trigger.webhookBasedNode.formTrigger.serviceHint')
-				: this.$locale.baseText('ndv.trigger.webhookBasedNode.serviceHint', {
+			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) : '';
@@ -353,6 +398,15 @@ export default defineComponent({
 				this.executionsHelpEventBus.emit('expand');
 			}
 		},
+		openWebhookUrl() {
+			this.$telemetry.track('User clicked ndv link', {
+				workflow_id: this.workflowsStore.workflowId,
+				session_id: this.sessionId,
+				pane: 'input',
+				type: 'open-chat',
+			});
+			window.open(this.webhookTestUrl, '_blank', 'noreferrer');
+		},
 		onLinkClick(e: MouseEvent) {
 			if (!e.target) {
 				return;
diff --git a/packages/editor-ui/src/components/UpdatesPanel.vue b/packages/editor-ui/src/components/UpdatesPanel.vue
index b4568524b9..cd8580f078 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') }}
@@ -31,7 +36,7 @@
 				</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>
diff --git a/packages/editor-ui/src/components/ValueSurvey.vue b/packages/editor-ui/src/components/ValueSurvey.vue
index 2d3fb660c3..89c52270af 100644
--- a/packages/editor-ui/src/components/ValueSurvey.vue
+++ b/packages/editor-ui/src/components/ValueSurvey.vue
@@ -1,10 +1,10 @@
 <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="$style.valueSurvey"
@@ -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>
@@ -40,7 +40,7 @@
 							@update:modelValue="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">
@@ -66,7 +66,7 @@ import { workflowHelpers } from '@/mixins/workflowHelpers';
 import { useSettingsStore } from '@/stores/settings.store';
 import { useRootStore } from '@/stores/n8nRoot.store';
 import { createEventBus } from 'n8n-design-system/utils';
-import { useToast } from '@/composables';
+import { useToast } from '@/composables/useToast';
 
 const DEFAULT_TITLE = 'How likely are you to recommend n8n to a friend or colleague?';
 const GREAT_FEEDBACK_TITLE =
@@ -76,11 +76,11 @@ const DEFAULT_FEEDBACK_TITLE =
 
 export default defineComponent({
 	name: 'ValueSurvey',
-	mixins: [workflowHelpers],
-	props: ['isActive'],
 	components: {
 		ModalDrawer,
 	},
+	mixins: [workflowHelpers],
+	props: ['isActive'],
 	setup() {
 		return {
 			...useToast(),
@@ -200,6 +200,10 @@ export default defineComponent({
 		margin-top: 10px;
 		padding: 0 15px;
 	}
+
+	h2 {
+		color: var(--color-value-survey-font);
+	}
 }
 
 .content {
@@ -214,6 +218,9 @@ export default defineComponent({
 .wrapper {
 	display: flex;
 	flex-direction: column;
+	.text span {
+		color: var(--color-value-survey-font);
+	}
 }
 
 .buttons {
@@ -256,7 +263,7 @@ export default defineComponent({
 }
 
 .valueSurvey {
-	background: var(--color-background-dark);
+	background: var(--color-value-survey-background);
 	height: 120px;
 	top: auto;
 
@@ -278,7 +285,7 @@ export default defineComponent({
 			right: 16px;
 			position: absolute;
 			font-weight: var(--font-weight-bold);
-			color: var(--color-text-xlight);
+			color: var(--color-value-survey-font);
 
 			@media (max-width: $breakpoint-xs) {
 				top: 2px;
diff --git a/packages/editor-ui/src/components/VariableSelector.vue b/packages/editor-ui/src/components/VariableSelector.vue
index 61a22af671..3f31ae1654 100644
--- a/packages/editor-ui/src/components/VariableSelector.vue
+++ b/packages/editor-ui/src/components/VariableSelector.vue
@@ -1,24 +1,24 @@
 <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"
-				:redactValues="redactValues"
+				:item="option"
+				:extend-all="extendAll"
+				:redact-values="redactValues"
 				@itemSelected="forwardItemSelected"
-			></variable-selector-item>
+			></VariableSelectorItem>
 		</div>
 	</div>
 </template>
@@ -56,10 +56,10 @@ const SKIPPED_NODE_TYPES = [STICKY_NODE_TYPE];
 
 export default defineComponent({
 	name: 'VariableSelector',
-	mixins: [workflowHelpers],
 	components: {
 		VariableSelectorItem,
 	},
+	mixins: [workflowHelpers],
 	props: ['path', 'redactValues'],
 	data() {
 		return {
@@ -135,7 +135,7 @@ export default defineComponent({
 				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
@@ -391,7 +391,7 @@ export default defineComponent({
 
 			// Get json data
 			if (outputData.hasOwnProperty('json')) {
-				const jsonPropertyPrefix = useShort === true ? '$json' : `$('${nodeName}').item.json`;
+				const jsonPropertyPrefix = useShort ? '$json' : `$('${nodeName}').item.json`;
 
 				const jsonDataOptions: IVariableSelectorOption[] = [];
 				for (const propertyName of Object.keys(outputData.json)) {
@@ -416,7 +416,7 @@ export default defineComponent({
 
 			// Get binary data
 			if (outputData.hasOwnProperty('binary')) {
-				const binaryPropertyPrefix = useShort === true ? '$binary' : `$('${nodeName}').item.binary`;
+				const binaryPropertyPrefix = useShort ? '$binary' : `$('${nodeName}').item.binary`;
 
 				const binaryData = [];
 				let binaryPropertyData = [];
@@ -499,6 +499,7 @@ export default defineComponent({
 					id: PLACEHOLDER_FILLED_AT_EXECUTION_TIME,
 					mode: 'test',
 					resumeUrl: PLACEHOLDER_FILLED_AT_EXECUTION_TIME,
+					resumeFormUrl: PLACEHOLDER_FILLED_AT_EXECUTION_TIME,
 				},
 
 				// deprecated
@@ -515,7 +516,6 @@ export default defineComponent({
 				connectionInputData,
 				{},
 				'manual',
-				this.rootStore.timezone,
 				additionalKeys,
 			);
 			const proxy = dataProxy.getDataProxy();
@@ -610,7 +610,7 @@ export default defineComponent({
 
 			let tempOptions: IVariableSelectorOption[];
 
-			if (executionData !== null && executionData.data !== undefined) {
+			if (executionData?.data !== undefined) {
 				const runExecutionData: IRunExecutionData = executionData.data;
 
 				tempOptions = this.getNodeContext(
@@ -791,7 +791,7 @@ export default defineComponent({
 					} 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 5569673ef5..1fb21ae190 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,11 +37,11 @@
 			<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"
-					:redactValues="redactValues"
+					:item="option"
+					:extend-all="extendAll"
+					:allow-parent-select="option.allowParentSelect"
+					:redact-values="redactValues"
 					class="sub-level"
 					@itemSelected="forwardItemSelected"
 				></variable-selector-item>
@@ -62,26 +62,14 @@
 <script lang="ts">
 import { defineComponent } from 'vue';
 import type { IVariableSelectorOption, IVariableItemSelected } from '@/Interface';
-import { externalHooks } from '@/mixins/externalHooks';
 
 export default defineComponent({
 	name: 'VariableSelectorItem',
-	mixins: [externalHooks],
 	props: ['allowParentSelect', 'extendAll', 'item', 'redactValues'],
-	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;
-		}
+	data() {
+		return {
+			extended: false,
+		};
 	},
 	computed: {
 		itemAddOperations() {
@@ -114,10 +102,20 @@ export default defineComponent({
 			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 03884b0848..e39ddcc014 100644
--- a/packages/editor-ui/src/components/VariablesRow.vue
+++ b/packages/editor-ui/src/components/VariablesRow.vue
@@ -2,13 +2,16 @@
 import type { ComponentPublicInstance, PropType } from 'vue';
 import { computed, nextTick, onMounted, ref, watch } from 'vue';
 import type { EnvironmentVariable, Rule, RuleGroup } 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();
@@ -117,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',
@@ -136,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>
@@ -154,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>
@@ -264,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 3539d14c7c..e34f857f08 100644
--- a/packages/editor-ui/src/components/VersionCard.vue
+++ b/packages/editor-ui/src/components/VersionCard.vue
@@ -1,5 +1,11 @@
 <template>
-	<a v-if="version" :href="version.documentationUrl" target="_blank" :class="$style.card">
+	<a
+		v-if="version"
+		:href="version.documentationUrl"
+		target="_blank"
+		:class="$style.card"
+		data-test-id="version-card"
+	>
 		<div :class="$style.header">
 			<div>
 				<div :class="$style.name">
@@ -24,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>
@@ -52,8 +58,7 @@ 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';
-import type { IVersion } from '@/Interface';
+import type { IVersionNode, IVersion } from '@/Interface';
 
 export default defineComponent({
 	name: 'VersionCard',
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 0000000000..dffc42566e
--- /dev/null
+++ b/packages/editor-ui/src/components/WorkerList.ee.vue
@@ -0,0 +1,132 @@
+<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 { executionHelpers } from '@/mixins/executionsHelpers';
+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 { pushConnection } from '@/mixins/pushConnection';
+import WorkerCard from './Workers/WorkerCard.ee.vue';
+
+// 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 },
+	mixins: [pushConnection, executionHelpers],
+	props: {
+		autoRefreshEnabled: {
+			type: Boolean,
+			default: true,
+		},
+	},
+	setup(props, ctx) {
+		const i18n = useI18n();
+		return {
+			i18n,
+			...useToast(),
+			// eslint-disable-next-line @typescript-eslint/no-misused-promises
+			...pushConnection.setup?.(props, ctx),
+		};
+	},
+	mounted() {
+		setPageTitle(`n8n - ${this.pageTitle}`);
+
+		this.$telemetry.track('User viewed worker view', {
+			instance_id: this.rootStore.instanceId,
+		});
+	},
+	beforeMount() {
+		if (window.Cypress !== undefined) {
+			return;
+		}
+		this.pushStore.pushConnect();
+		this.orchestrationManagerStore.startWorkerStatusPolling();
+	},
+	beforeUnmount() {
+		if (window.Cypress !== undefined) {
+			return;
+		}
+		this.orchestrationManagerStore.stopWorkerStatusPolling();
+		this.pushStore.pushDisconnect();
+	},
+	computed: {
+		...mapStores(useUIStore, 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');
+		},
+	},
+	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 0000000000..4f5d145321
--- /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 0000000000..ac8d09aaf0
--- /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 0000000000..7d930acd21
--- /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 0000000000..c8f6f949b3
--- /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 0000000000..203ad6895d
--- /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 c6bd5274ff..8293ba679b 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"
-				:modelValue="workflowActive"
-				@update:modelValue="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:modelValue="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,30 +44,30 @@
 						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 { useToast } from '@/composables';
+import { useToast } from '@/composables/useToast';
 import { workflowActivate } from '@/mixins/workflowActivate';
 import { useUIStore } from '@/stores/ui.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { mapStores } from 'pinia';
 import { defineComponent } from 'vue';
-import { getActivatableTriggerNodes } from '@/utils';
+import { getActivatableTriggerNodes } from '@/utils/nodeTypesUtils';
 
 export default defineComponent({
 	name: 'WorkflowActivator',
-	props: ['workflowActive', 'workflowId'],
 	mixins: [workflowActivate],
-	setup(props) {
+	props: ['workflowActive', 'workflowId'],
+	setup(props, ctx) {
 		return {
 			...useToast(),
 			// eslint-disable-next-line @typescript-eslint/no-misused-promises
-			...workflowActivate.setup?.(props),
+			...workflowActivate.setup?.(props, ctx),
 		};
 	},
 	computed: {
@@ -82,7 +83,7 @@ export default defineComponent({
 			return this.workflowActive === true && this.isWorkflowActive !== this.workflowActive;
 		},
 		getActiveColor(): string {
-			if (this.couldNotBeStarted === true) {
+			if (this.couldNotBeStarted) {
 				return '#ff4949';
 			}
 			return '#13ce66';
@@ -119,7 +120,7 @@ export default defineComponent({
 				} else {
 					errorMessage = this.$locale.baseText(
 						'workflowActivator.showMessage.displayActivationError.message.errorDataNotUndefined',
-						{ interpolate: { message: errorData.error.message } },
+						{ interpolate: { message: errorData } },
 					);
 				}
 			} catch (error) {
@@ -155,15 +156,11 @@ export default defineComponent({
 	display: inline-flex;
 	flex-wrap: nowrap;
 	align-items: center;
-
-	:deep(.el-loading-spinner) {
-		margin-top: -10px;
-	}
 }
 
 .could-not-be-started {
 	display: inline-block;
-	color: #ff4949;
+	color: var(--color-text-danger);
 	margin-left: 0.5em;
 }
 </style>
diff --git a/packages/editor-ui/src/components/WorkflowCard.vue b/packages/editor-ui/src/components/WorkflowCard.vue
index 165b869040..1270a22205 100644
--- a/packages/editor-ui/src/components/WorkflowCard.vue
+++ b/packages/editor-ui/src/components/WorkflowCard.vue
@@ -8,7 +8,7 @@
 		<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 }}
@@ -19,24 +19,24 @@
 				>
 					<n8n-tags
 						:tags="data.tags"
-						:truncateAt="3"
+						:truncate-at="3"
 						truncate
+						data-test-id="workflow-card-tags"
 						@click:tag="onClickTag"
 						@expand="onExpandTags"
-						data-test-id="workflow-card-tags"
 					/>
 				</span>
 			</n8n-text>
 		</div>
 		<template #append>
-			<div :class="$style.cardActions" ref="cardActions">
+			<div ref="cardActions" :class="$style.cardActions">
 				<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"
@@ -46,9 +46,9 @@
 				<n8n-action-toggle
 					:actions="actions"
 					theme="dark"
+					data-test-id="workflow-card-actions"
 					@action="onAction"
 					@click.stop
-					data-test-id="workflow-card-actions"
 				/>
 			</div>
 		</template>
@@ -65,7 +65,8 @@ import {
 	VIEWS,
 	WORKFLOW_SHARE_MODAL_KEY,
 } from '@/constants';
-import { useToast, useMessage } from '@/composables';
+import { useMessage } from '@/composables/useMessage';
+import { useToast } from '@/composables/useToast';
 import type { IPermissions } from '@/permissions';
 import { getWorkflowPermissions } from '@/permissions';
 import dateformat from 'dateformat';
@@ -85,17 +86,6 @@ export const WORKFLOW_LIST_ITEM_ACTIONS = {
 };
 
 export default defineComponent({
-	data() {
-		return {
-			EnterpriseEditionFeature,
-		};
-	},
-	setup() {
-		return {
-			...useToast(),
-			...useMessage(),
-		};
-	},
 	components: {
 		TimeAgo,
 		WorkflowActivator,
@@ -122,6 +112,17 @@ export default defineComponent({
 			default: false,
 		},
 	},
+	setup() {
+		return {
+			...useToast(),
+			...useMessage(),
+		};
+	},
+	data() {
+		return {
+			EnterpriseEditionFeature,
+		};
+	},
 	computed: {
 		...mapStores(useSettingsStore, useUIStore, useUsersStore, useWorkflowsStore),
 		currentUser(): IUser {
diff --git a/packages/editor-ui/src/components/WorkflowHistory/WorkflowHistoryContent.vue b/packages/editor-ui/src/components/WorkflowHistory/WorkflowHistoryContent.vue
index f934ef801b..207b706606 100644
--- a/packages/editor-ui/src/components/WorkflowHistory/WorkflowHistoryContent.vue
+++ b/packages/editor-ui/src/components/WorkflowHistory/WorkflowHistoryContent.vue
@@ -8,7 +8,7 @@ import type {
 } from '@/types/workflowHistory';
 import WorkflowPreview from '@/components/WorkflowPreview.vue';
 import WorkflowHistoryListItem from '@/components/WorkflowHistory/WorkflowHistoryListItem.vue';
-import { useI18n } from '@/composables';
+import { useI18n } from '@/composables/useI18n';
 
 const i18n = useI18n();
 
@@ -17,6 +17,7 @@ const props = defineProps<{
 	workflowVersion: WorkflowVersion | null;
 	actions: UserAction[];
 	isListLoading?: boolean;
+	isFirstItemShown?: boolean;
 }>();
 
 const emit = defineEmits<{
@@ -42,6 +43,12 @@ const workflowVersionPreview = computed<IWorkflowDb | undefined>(() => {
 	};
 });
 
+const actions = computed(() =>
+	props.isFirstItemShown
+		? props.actions.filter((action) => action.value !== 'restore')
+		: props.actions,
+);
+
 const onAction = ({
 	action,
 	id,
@@ -61,17 +68,16 @@ const onAction = ({
 			v-if="props.workflowVersion"
 			:workflow="workflowVersionPreview"
 			:loading="props.isListLoading"
-			loaderType="spinner"
+			loader-type="spinner"
 		/>
 		<ul :class="$style.info">
-			<workflow-history-list-item
-				:class="$style.card"
+			<WorkflowHistoryListItem
 				v-if="props.workflowVersion"
-				:full="true"
+				:class="$style.card"
 				:index="-1"
 				:item="props.workflowVersion"
-				:isActive="false"
-				:actions="props.actions"
+				:is-active="false"
+				:actions="actions"
 				@action="onAction"
 			>
 				<template #default="{ formattedCreatedAt }">
@@ -99,12 +105,12 @@ const onAction = ({
 					</section>
 				</template>
 				<template #action-toggle-button>
-					<n8n-button type="tertiary" size="small" data-test-id="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>
-			</workflow-history-list-item>
+			</WorkflowHistoryListItem>
 		</ul>
 	</div>
 </template>
@@ -146,8 +152,9 @@ const onAction = ({
 
 			&:first-child {
 				padding-top: var(--spacing-3xs);
-				padding-bottom: var(--spacing-3xs);
+				padding-bottom: var(--spacing-4xs);
 				* {
+					margin-top: auto;
 					font-size: var(--font-size-m);
 				}
 			}
@@ -161,6 +168,7 @@ const onAction = ({
 			}
 
 			.label {
+				color: var(--color-text-light);
 				padding-right: var(--spacing-4xs);
 			}
 
diff --git a/packages/editor-ui/src/components/WorkflowHistory/WorkflowHistoryList.vue b/packages/editor-ui/src/components/WorkflowHistory/WorkflowHistoryList.vue
index a2d84cb254..b1b92be32a 100644
--- a/packages/editor-ui/src/components/WorkflowHistory/WorkflowHistoryList.vue
+++ b/packages/editor-ui/src/components/WorkflowHistory/WorkflowHistoryList.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { ref } from 'vue';
 import type { UserAction } from 'n8n-design-system';
-import { useI18n } from '@/composables';
+import { useI18n } from '@/composables/useI18n';
 import type {
 	WorkflowHistory,
 	WorkflowVersionId,
@@ -41,6 +41,9 @@ 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]) => {
@@ -102,14 +105,14 @@ const onItemMounted = ({
 </script>
 
 <template>
-	<ul :class="$style.list" ref="listElement" data-test-id="workflow-history-list">
-		<workflow-history-list-item
+	<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"
-			:isActive="item.versionId === props.activeItem?.versionId"
-			:actions="props.actions"
+			:is-active="item.versionId === props.activeItem?.versionId"
+			:actions="getActions(index)"
 			@action="onAction"
 			@preview="onPreview"
 			@mounted="onItemMounted"
diff --git a/packages/editor-ui/src/components/WorkflowHistory/WorkflowHistoryListItem.vue b/packages/editor-ui/src/components/WorkflowHistory/WorkflowHistoryListItem.vue
index 282ff421e5..b53c76da69 100644
--- a/packages/editor-ui/src/components/WorkflowHistory/WorkflowHistoryListItem.vue
+++ b/packages/editor-ui/src/components/WorkflowHistory/WorkflowHistoryListItem.vue
@@ -7,7 +7,7 @@ import type {
 	WorkflowVersionId,
 	WorkflowHistoryActionTypes,
 } from '@/types/workflowHistory';
-import { useI18n } from '@/composables';
+import { useI18n } from '@/composables/useI18n';
 
 const props = defineProps<{
 	item: WorkflowHistory;
@@ -99,7 +99,7 @@ onMounted(() => {
 			[$style.actionsVisible]: actionsVisible,
 		}"
 	>
-		<slot :formattedCreatedAt="formattedCreatedAt">
+		<slot :formatted-created-at="formattedCreatedAt">
 			<p @click="onItemClick">
 				<time :datetime="item.createdAt">{{ formattedCreatedAt }}</time>
 				<n8n-tooltip
diff --git a/packages/editor-ui/src/components/WorkflowHistory/WorkflowHistoryVersionRestoreModal.vue b/packages/editor-ui/src/components/WorkflowHistory/WorkflowHistoryVersionRestoreModal.vue
index c459f59770..99c1100d84 100644
--- a/packages/editor-ui/src/components/WorkflowHistory/WorkflowHistoryVersionRestoreModal.vue
+++ b/packages/editor-ui/src/components/WorkflowHistory/WorkflowHistoryVersionRestoreModal.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
-import { useI18n } from '@/composables';
+import { useI18n } from '@/composables/useI18n';
 import Modal from '@/components/Modal.vue';
-import { useUIStore } from '@/stores';
+import { useUIStore } from '@/stores/ui.store';
 
 const props = defineProps<{
 	modalName: string;
@@ -60,8 +60,8 @@ const closeModal = () => {
 			<div :class="$style.footer">
 				<n8n-button
 					v-for="(button, index) in props.data.buttons"
-					size="medium"
 					:key="index"
+					size="medium"
 					:type="button.type"
 					@click="
 						() => {
diff --git a/packages/editor-ui/src/components/WorkflowHistory/__tests__/WorkflowHistoryList.test.ts b/packages/editor-ui/src/components/WorkflowHistory/__tests__/WorkflowHistoryList.test.ts
index 15c93ede06..696130401e 100644
--- a/packages/editor-ui/src/components/WorkflowHistory/__tests__/WorkflowHistoryList.test.ts
+++ b/packages/editor-ui/src/components/WorkflowHistory/__tests__/WorkflowHistoryList.test.ts
@@ -1,4 +1,4 @@
-import { within } from '@testing-library/dom';
+import { within } from '@testing-library/vue';
 import userEvent from '@testing-library/user-event';
 import { createPinia, setActivePinia } from 'pinia';
 import { faker } from '@faker-js/faker';
diff --git a/packages/editor-ui/src/components/WorkflowLMChat.vue b/packages/editor-ui/src/components/WorkflowLMChat.vue
index 749112d20a..f2d9b281f8 100644
--- a/packages/editor-ui/src/components/WorkflowLMChat.vue
+++ b/packages/editor-ui/src/components/WorkflowLMChat.vue
@@ -2,7 +2,7 @@
 	<Modal
 		:name="WORKFLOW_LM_CHAT_MODAL_KEY"
 		width="80%"
-		maxHeight="80%"
+		max-height="80%"
 		:title="
 			$locale.baseText('chat.window.title', {
 				interpolate: {
@@ -10,16 +10,17 @@
 				},
 			})
 		"
-		:eventBus="modalBus"
+		:event-bus="modalBus"
 		:scrollable="false"
 		@keydown.stop
 	>
 		<template #content>
-			<div v-loading="isLoading" class="workflow-lm-chat" data-test-id="workflow-lm-chat-dialog">
-				<div class="messages ignore-key-press" ref="messagesContainer">
+			<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]">
@@ -27,10 +28,10 @@
 
 							<div class="message-options no-select-on-click">
 								<n8n-info-tip
+									v-if="message.sender === 'bot'"
 									type="tooltip"
 									theme="info-light"
-									tooltipPlacement="right"
-									v-if="message.sender === 'bot'"
+									tooltip-placement="right"
 								>
 									<div v-if="message.executionId">
 										<n8n-text :bold="true" size="small">
@@ -43,38 +44,34 @@
 								</n8n-info-tip>
 
 								<div
-									@click="repostMessage(message)"
+									v-if="message.sender === 'user'"
 									class="option"
 									:title="$locale.baseText('chat.window.chat.chatMessageOptions.repostMessage')"
 									data-test-id="repost-message-button"
-									v-if="message.sender === 'user'"
+									@click="repostMessage(message)"
 								>
 									<font-awesome-icon icon="redo" />
 								</div>
 								<div
-									@click="reuseMessage(message)"
+									v-if="message.sender === 'user'"
 									class="option"
 									:title="$locale.baseText('chat.window.chat.chatMessageOptions.reuseMessage')"
 									data-test-id="reuse-message-button"
-									v-if="message.sender === 'user'"
+									@click="reuseMessage(message)"
 								>
 									<font-awesome-icon icon="copy" />
 								</div>
 							</div>
 						</div>
 					</div>
+					<MessageTyping ref="messageContainer" v-if="isLoading" />
 				</div>
-				<div class="logs-wrapper">
+				<div v-if="node" 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">
-						<run-data-ai v-if="node" :node="node" hide-title slim :key="messages.length" />
-						<div v-else class="no-node-connected">
-							<n8n-text tag="div" :bold="true" color="text-dark" size="large">{{
-								$locale.baseText('chat.window.noExecution')
-							}}</n8n-text>
-						</div>
+						<RunDataAi :key="messages.length" :node="node" hide-title slim />
 					</div>
 				</div>
 			</div>
@@ -82,23 +79,32 @@
 		<template #footer>
 			<div class="workflow-lm-chat-footer">
 				<n8n-input
+					ref="inputField"
 					v-model="currentMessage"
 					class="message-input"
 					type="textarea"
-					ref="inputField"
+					:minlength="1"
+					m
 					:placeholder="$locale.baseText('chat.window.chat.placeholder')"
+					data-test-id="workflow-chat-input"
 					@keydown.stop="updated"
 				/>
-				<n8n-button
-					@click.stop="sendChatMessage(currentMessage)"
-					class="send-button"
-					:loading="isLoading"
-					:label="$locale.baseText('chat.window.chat.sendButtonText')"
-					size="large"
-					icon="comment"
-					type="primary"
-					data-test-id="workflow-chat-button"
-				/>
+				<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') }}
@@ -115,7 +121,7 @@
 import { defineAsyncComponent, defineComponent } from 'vue';
 import { mapStores } from 'pinia';
 
-import { useToast } from '@/composables';
+import { useToast } from '@/composables/useToast';
 import Modal from '@/components/Modal.vue';
 import {
 	AI_CATEGORY_AGENTS,
@@ -123,6 +129,7 @@ import {
 	AI_CODE_NODE_TYPE,
 	AI_SUBCATEGORY,
 	CHAT_EMBED_MODAL_KEY,
+	CHAT_TRIGGER_NODE_TYPE,
 	MANUAL_CHAT_TRIGGER_NODE_TYPE,
 	VIEWS,
 	WORKFLOW_LM_CHAT_MODAL_KEY,
@@ -131,11 +138,17 @@ import {
 import { workflowRun } from '@/mixins/workflowRun';
 import { get, last } from 'lodash-es';
 
-import { useUIStore, useWorkflowsStore } from '@/stores';
+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 } from '@/Interface';
+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';
 
 const RunDataAi = defineAsyncComponent(async () => import('@/components/RunDataAi/RunDataAi.vue'));
 
@@ -158,16 +171,20 @@ interface LangChainMessage {
 // - display errors better
 export default defineComponent({
 	name: 'WorkflowLMChat',
-	mixins: [workflowRun],
 	components: {
 		Modal,
+		MessageTyping,
 		RunDataAi,
 	},
-	setup(props) {
+	mixins: [workflowRun],
+	setup(props, ctx) {
+		const externalHooks = useExternalHooks();
+
 		return {
+			externalHooks,
 			...useToast(),
 			// eslint-disable-next-line @typescript-eslint/no-misused-promises
-			...workflowRun.setup?.(props),
+			...workflowRun.setup?.(props, ctx),
 		};
 	},
 	data() {
@@ -217,40 +234,36 @@ export default defineComponent({
 			}
 		},
 		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;
+			}
 			this.messages.push({
 				text: message,
 				sender: 'user',
 			} as ChatMessage);
 
 			this.currentMessage = '';
-
+			await this.$nextTick();
+			this.scrollToLatestMessage();
 			await this.startWorkflowWithMessage(message);
-
-			// Scroll to bottom
-			const containerRef = this.$refs.messagesContainer as HTMLElement | undefined;
-			if (containerRef) {
-				// Wait till message got added else it will not scroll correctly
-				await this.$nextTick();
-				containerRef.scrollTo({
-					top: containerRef.scrollHeight,
-					behavior: 'smooth',
-				});
-			}
 		},
 
 		setConnectedNode() {
-			const workflow = this.getCurrentWorkflow();
-			const triggerNode = workflow.queryNodes(
-				(nodeType: INodeType) => nodeType.description.name === MANUAL_CHAT_TRIGGER_NODE_TYPE,
-			);
+			const triggerNode = this.getTriggerNode();
 
-			if (!triggerNode.length) {
+			if (!triggerNode) {
 				this.showError(
 					new Error('Chat Trigger Node could not be found!'),
 					'Trigger Node not found',
 				);
 				return;
 			}
+			const workflow = this.getCurrentWorkflow();
+
 			const chatNode = this.workflowsStore.getNodes().find((node: INodeUi): boolean => {
 				const nodeType = this.nodeTypesStore.getNodeType(node.type, node.typeVersion);
 				if (!nodeType) return false;
@@ -281,7 +294,7 @@ export default defineComponent({
 
 				const parentNodes = workflow.getParentNodes(node.name);
 				const isChatChild = parentNodes.some(
-					(parentNodeName) => parentNodeName === triggerNode[0].name,
+					(parentNodeName) => parentNodeName === triggerNode.name,
 				);
 
 				return Boolean(isChatChild && (isAgent || isChain || isCustomChainOrAgent));
@@ -289,8 +302,10 @@ export default defineComponent({
 
 			if (!chatNode) {
 				this.showError(
-					new Error('Chat viable node(Agent or Chain) could not be found!'),
-					'Chat node not found',
+					new Error(
+						'Chat only works when an AI agent or chain is connected to the chat trigger node',
+					),
+					'Missing AI node',
 				);
 				return;
 			}
@@ -302,7 +317,7 @@ export default defineComponent({
 
 			const workflow = this.getCurrentWorkflow();
 			const connectedMemoryInputs =
-				workflow.connectionsByDestinationNode[this.connectedNode.name]?.memory;
+				workflow.connectionsByDestinationNode[this.connectedNode.name][NodeConnectionType.AiMemory];
 			if (!connectedMemoryInputs) return [];
 
 			const memoryConnection = (connectedMemoryInputs ?? []).find((i) => i.length > 0)?.[0];
@@ -321,9 +336,9 @@ export default defineComponent({
 						action: string;
 						chatHistory?: unknown[];
 						response?: {
-							chat_history?: unknown[];
+							sessionId?: unknown[];
 						};
-					} => get(data, 'data.memory.0.0.json')!,
+					} => get(data, ['data', NodeConnectionType.AiMemory, 0, 0, 'json'])!,
 				)
 				?.find((data) =>
 					['chatHistory', 'loadMemoryVariables'].includes(data?.action) ? data : undefined,
@@ -333,12 +348,12 @@ export default defineComponent({
 			if (memoryOutputData?.chatHistory) {
 				chatHistory = memoryOutputData?.chatHistory as LangChainMessage[];
 			} else if (memoryOutputData?.response) {
-				chatHistory = memoryOutputData?.response.chat_history as LangChainMessage[];
+				chatHistory = memoryOutputData?.response.sessionId as LangChainMessage[];
 			} else {
 				return [];
 			}
 
-			return chatHistory.map((message) => {
+			return (chatHistory || []).map((message) => {
 				return {
 					text: message.kwargs.content,
 					sender: last(message.id) === 'HumanMessage' ? 'user' : 'bot',
@@ -373,8 +388,8 @@ export default defineComponent({
 
 		getTriggerNode(): INode | null {
 			const workflow = this.getCurrentWorkflow();
-			const triggerNode = workflow.queryNodes(
-				(nodeType: INodeType) => nodeType.description.name === MANUAL_CHAT_TRIGGER_NODE_TYPE,
+			const triggerNode = workflow.queryNodes((nodeType: INodeType) =>
+				[CHAT_TRIGGER_NODE_TYPE, MANUAL_CHAT_TRIGGER_NODE_TYPE].includes(nodeType.description.name),
 			);
 
 			if (!triggerNode.length) {
@@ -394,6 +409,17 @@ export default defineComponent({
 				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,
@@ -403,7 +429,9 @@ export default defineComponent({
 						[
 							{
 								json: {
-									input: message,
+									sessionId: `test-${currentUser.id || 'unknown'}`,
+									action: 'sendMessage',
+									[inputKey]: message,
 								},
 							},
 						],
@@ -472,13 +500,23 @@ export default defineComponent({
 
 					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', {
+			void this.externalHooks.run('workflowSettings.dialogVisibleChanged', {
 				dialogVisible: false,
 			});
 		},
@@ -503,9 +541,11 @@ export default defineComponent({
 	display: flex;
 	height: 100%;
 	min-height: 400px;
+	z-index: 9999;
 
 	.logs-wrapper {
-		border: 1px solid #e0e0e0;
+		--node-icon-color: var(--color-text-base);
+		border: 1px solid var(--color-foreground-base);
 		border-radius: 4px;
 		height: 100%;
 		overflow-y: auto;
@@ -517,8 +557,8 @@ export default defineComponent({
 		}
 	}
 	.messages {
-		background-color: var(--color-background-base);
-		border: 1px solid #e0e0e0;
+		background-color: var(--color-lm-chat-messages-background);
+		border: 1px solid var(--color-foreground-base);
 		border-radius: 4px;
 		height: 100%;
 		width: 100%;
@@ -526,23 +566,30 @@ export default defineComponent({
 		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: 10px;
+				border-radius: var(--border-radius-base);
 				line-height: 1.5;
-				margin: 0.5em 1em;
+				margin: var(--spacing-2xs) var(--spacing-s);
 				max-width: 75%;
 				padding: 1em;
 				white-space: pre-wrap;
 				overflow-x: auto;
 
 				&.bot {
-					background-color: #e0d0d0;
+					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;
@@ -550,9 +597,11 @@ export default defineComponent({
 				}
 
 				&.user {
-					background-color: #d0e0d0;
+					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;
diff --git a/packages/editor-ui/src/components/WorkflowPreview.vue b/packages/editor-ui/src/components/WorkflowPreview.vue
index 1fd3948b6e..b79099d4bb 100644
--- a/packages/editor-ui/src/components/WorkflowPreview.vue
+++ b/packages/editor-ui/src/components/WorkflowPreview.vue
@@ -7,13 +7,13 @@
 			<n8n-spinner type="dots" />
 		</div>
 		<iframe
+			ref="iframeRef"
 			:class="{
 				[$style.workflow]: !nodeViewDetailsOpened,
 				[$style.executionPreview]: mode === 'execution',
 				[$style.openNDV]: nodeViewDetailsOpened,
 				[$style.show]: showPreview,
 			}"
-			ref="iframeRef"
 			:src="`${rootStore.baseUrl}workflows/demo`"
 			@mouseenter="onMouseEnter"
 			@mouseleave="onMouseLeave"
@@ -23,7 +23,8 @@
 
 <script setup lang="ts">
 import { onMounted, onBeforeUnmount, ref, computed, watch } from 'vue';
-import { useI18n, useToast } from '@/composables';
+import { useI18n } from '@/composables/useI18n';
+import { useToast } from '@/composables/useToast';
 import type { IWorkflowDb } from '@/Interface';
 import { useRootStore } from '@/stores/n8nRoot.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
@@ -36,11 +37,15 @@ const props = withDefaults(
 		executionId?: string;
 		executionMode?: string;
 		loaderType?: 'image' | 'spinner';
+		canOpenNDV?: boolean;
+		hideNodeIssues?: boolean;
 	}>(),
 	{
 		loading: false,
 		mode: 'workflow',
 		loaderType: 'image',
+		canOpenNDV: true,
+		hideNodeIssues: false,
 	},
 );
 
@@ -81,6 +86,8 @@ const loadWorkflow = () => {
 			JSON.stringify({
 				command: 'openWorkflow',
 				workflow: props.workflow,
+				canOpenNDV: props.canOpenNDV,
+				hideNodeIssues: props.hideNodeIssues,
 			}),
 			'*',
 		);
@@ -103,6 +110,7 @@ const loadExecution = () => {
 				command: 'openExecution',
 				executionId: props.executionId,
 				executionMode: props.executionMode || '',
+				canOpenNDV: props.canOpenNDV,
 			}),
 			'*',
 		);
@@ -135,6 +143,9 @@ const onMouseLeave = () => {
 };
 
 const receiveMessage = ({ data }: MessageEvent) => {
+	if (!data?.includes?.('"command"')) {
+		return;
+	}
 	try {
 		const json = JSON.parse(data);
 		if (json.command === 'n8nReady') {
@@ -238,6 +249,10 @@ watch(
 
 .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 4a1ee8fe46..46be6a1a66 100644
--- a/packages/editor-ui/src/components/WorkflowSettings.vue
+++ b/packages/editor-ui/src/components/WorkflowSettings.vue
@@ -2,13 +2,13 @@
 	<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>
@@ -109,12 +109,12 @@
 						</el-col>
 						<el-col :span="14">
 							<n8n-input
+								v-model="workflowSettings.callerIds"
 								:disabled="readOnlyEnv"
 								:placeholder="$locale.baseText('workflowSettings.callerIds.placeholder')"
 								type="text"
-								v-model="workflowSettings.callerIds"
-								@update:modelValue="onCallerIdsInput"
 								data-test-id="workflow-caller-policy-workflow-ids"
+								@update:modelValue="onCallerIdsInput"
 							/>
 						</el-col>
 					</el-row>
@@ -279,10 +279,10 @@
 							<el-switch
 								ref="inputField"
 								:disabled="readOnlyEnv"
-								:modelValue="workflowSettings.executionTimeout > -1"
-								@update:modelValue="toggleTimeout"
+								:model-value="workflowSettings.executionTimeout > -1"
 								active-color="#13ce66"
 								data-test-id="workflow-settings-timeout-workflow"
+								@update:modelValue="toggleTimeout"
 							></el-switch>
 						</div>
 					</el-col>
@@ -304,9 +304,9 @@
 						<el-col :span="4">
 							<n8n-input
 								:disabled="readOnlyEnv"
-								:modelValue="timeoutHMS.hours"
-								@update:modelValue="(value) => setTimeout('hours', value)"
+								:model-value="timeoutHMS.hours"
 								:min="0"
+								@update:modelValue="(value) => setTimeout('hours', value)"
 							>
 								<template #append>{{ $locale.baseText('workflowSettings.hours') }}</template>
 							</n8n-input>
@@ -314,7 +314,7 @@
 						<el-col :span="4" class="timeout-input">
 							<n8n-input
 								:disabled="readOnlyEnv"
-								:modelValue="timeoutHMS.minutes"
+								:model-value="timeoutHMS.minutes"
 								:min="0"
 								:max="60"
 								@update:modelValue="(value) => setTimeout('minutes', value)"
@@ -325,7 +325,7 @@
 						<el-col :span="4" class="timeout-input">
 							<n8n-input
 								:disabled="readOnlyEnv"
-								:modelValue="timeoutHMS.seconds"
+								:model-value="timeoutHMS.seconds"
 								:min="0"
 								:max="60"
 								@update:modelValue="(value) => setTimeout('seconds', value)"
@@ -355,9 +355,7 @@
 import { defineComponent } from 'vue';
 import { mapStores } from 'pinia';
 
-import { externalHooks } from '@/mixins/externalHooks';
-import { genericHelpers } from '@/mixins/genericHelpers';
-import { useToast } from '@/composables';
+import { useToast } from '@/composables/useToast';
 import type {
 	ITimeoutHMS,
 	IUser,
@@ -381,15 +379,21 @@ 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',
-	mixins: [externalHooks, genericHelpers],
 	components: {
 		Modal,
 	},
 	setup() {
+		const externalHooks = useExternalHooks();
+
 		return {
+			externalHooks,
 			...useToast(),
 		};
 	},
@@ -454,9 +458,13 @@ export default defineComponent({
 			useRootStore,
 			useUsersStore,
 			useSettingsStore,
+			useSourceControlStore,
 			useWorkflowsStore,
 			useWorkflowsEEStore,
 		),
+		readOnlyEnv(): boolean {
+			return this.sourceControlStore.preferences.branchReadOnly;
+		},
 		workflowName(): string {
 			return this.workflowsStore.workflowName;
 		},
@@ -479,6 +487,9 @@ export default defineComponent({
 
 			return this.workflowsEEStore.getWorkflowOwnerName(`${this.workflowId}`, fallback);
 		},
+		workflowPermissions(): IPermissions {
+			return getWorkflowPermissions(this.currentUser, this.workflow);
+		},
 	},
 	async mounted() {
 		this.executionTimeout = this.rootStore.executionTimeout;
@@ -556,7 +567,7 @@ export default defineComponent({
 		this.timeoutHMS = this.convertToHMS(workflowSettings.executionTimeout);
 		this.isLoading = false;
 
-		void this.$externalHooks().run('workflowSettings.dialogVisibleChanged', {
+		void this.externalHooks.run('workflowSettings.dialogVisibleChanged', {
 			dialogVisible: true,
 		});
 		this.$telemetry.track('User opened workflow settings', {
@@ -571,7 +582,7 @@ export default defineComponent({
 		},
 		closeDialog() {
 			this.modalBus.emit('close');
-			void this.$externalHooks().run('workflowSettings.dialogVisibleChanged', {
+			void this.externalHooks.run('workflowSettings.dialogVisibleChanged', {
 				dialogVisible: false,
 			});
 		},
@@ -584,8 +595,6 @@ export default defineComponent({
 			};
 		},
 		async loadWorkflowCallerPolicyOptions() {
-			const currentUserIsOwner = this.workflow.ownedBy?.id === this.currentUser?.id;
-
 			this.workflowCallerPolicyOptions = [
 				{
 					key: 'none',
@@ -597,7 +606,7 @@ export default defineComponent({
 						'workflowSettings.callerPolicy.options.workflowsFromSameOwner',
 						{
 							interpolate: {
-								owner: currentUserIsOwner
+								owner: this.workflowPermissions.isOwner
 									? this.$locale.baseText(
 											'workflowSettings.callerPolicy.options.workflowsFromSameOwner.owner',
 									  )
@@ -849,7 +858,7 @@ export default defineComponent({
 
 			this.closeDialog();
 
-			void 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,
 			});
diff --git a/packages/editor-ui/src/components/WorkflowShareModal.ee.vue b/packages/editor-ui/src/components/WorkflowShareModal.ee.vue
index 77051da9c3..8061b167f1 100644
--- a/packages/editor-ui/src/components/WorkflowShareModal.ee.vue
+++ b/packages/editor-ui/src/components/WorkflowShareModal.ee.vue
@@ -2,10 +2,10 @@
 	<Modal
 		width="460px"
 		: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,7 +23,7 @@
 				</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 },
@@ -36,7 +36,7 @@
 						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"
 						@update:modelValue="onAddSharee"
@@ -48,14 +48,14 @@
 					<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"
 					>
 						<template #actions="{ user }">
 							<n8n-select
 								:class="$style.roleSelect"
-								modelValue="editor"
+								model-value="editor"
 								size="small"
 								@update:modelValue="onRoleAction(user, $event)"
 							>
@@ -137,7 +137,8 @@ import {
 import type { IUser, IWorkflowDb } from '@/Interface';
 import type { IPermissions } from '@/permissions';
 import { getWorkflowPermissions } from '@/permissions';
-import { useToast, useMessage } from '@/composables';
+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';
@@ -150,7 +151,7 @@ import type { BaseTextKey } from '@/plugins/i18n';
 import { isNavigationFailure } from 'vue-router';
 
 export default defineComponent({
-	name: 'workflow-share-modal',
+	name: 'WorkflowShareModal',
 	components: {
 		Modal,
 	},
@@ -209,21 +210,19 @@ export default defineComponent({
 		},
 		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>>
@@ -254,6 +253,16 @@ export default defineComponent({
 			);
 		},
 	},
+	watch: {
+		workflow(workflow) {
+			if (workflow.sharedWith) {
+				this.sharedWith = workflow.sharedWith;
+			}
+		},
+	},
+	mounted() {
+		void this.initialize();
+	},
 	methods: {
 		async onSave() {
 			if (this.loading) {
@@ -357,8 +366,8 @@ export default defineComponent({
 								(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,
 						);
 				}
 
@@ -473,16 +482,6 @@ export default defineComponent({
 			this.loading = false;
 		},
 	},
-	mounted() {
-		void this.initialize();
-	},
-	watch: {
-		workflow(workflow) {
-			if (workflow.sharedWith) {
-				this.sharedWith = workflow.sharedWith;
-			}
-		},
-	},
 });
 </script>
 
diff --git a/packages/editor-ui/src/components/__tests__/BannersStack.test.ts b/packages/editor-ui/src/components/__tests__/BannersStack.test.ts
index 25da40a044..031b54e6e1 100644
--- a/packages/editor-ui/src/components/__tests__/BannersStack.test.ts
+++ b/packages/editor-ui/src/components/__tests__/BannersStack.test.ts
@@ -6,14 +6,13 @@ import { STORES } from '@/constants';
 
 import { createTestingPinia } from '@pinia/testing';
 import BannerStack from '@/components/banners/BannerStack.vue';
-import { useUIStore } from '@/stores/ui.store';
-import { useUsersStore } from '@/stores/users.store';
 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>;
-let usersStore: ReturnType<typeof useUsersStore>;
 
 const initialState = {
 	[STORES.SETTINGS]: {
@@ -55,7 +54,6 @@ const renderComponent = createComponentRenderer(BannerStack, defaultRenderOption
 describe('BannerStack', () => {
 	beforeEach(() => {
 		uiStore = useUIStore();
-		usersStore = useUsersStore();
 	});
 
 	afterEach(() => {
@@ -75,7 +73,7 @@ describe('BannerStack', () => {
 	it('should dismiss banner on click', async () => {
 		const { getByTestId } = renderComponent();
 		const dismissBannerSpy = vi
-			.spyOn(useUIStore(), 'dismissBanner')
+			.spyOn(uiStore, 'dismissBanner')
 			.mockImplementation(async (banner, mode) => {});
 		expect(getByTestId('banners-V1')).toBeInTheDocument();
 		const closeTrialBannerButton = getByTestId('banner-V1-close');
@@ -87,7 +85,7 @@ describe('BannerStack', () => {
 	it('should permanently dismiss banner on click', async () => {
 		const { getByTestId } = renderComponent();
 		const dismissBannerSpy = vi
-			.spyOn(useUIStore(), 'dismissBanner')
+			.spyOn(uiStore, 'dismissBanner')
 			.mockImplementation(async (banner, mode) => {});
 
 		const permanentlyDismissBannerLink = getByTestId('banner-confirm-v1');
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 0000000000..c2b0466910
--- /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 0000000000..efbf7de5b1
--- /dev/null
+++ b/packages/editor-ui/src/components/__tests__/CollaborationPane.test.ts
@@ -0,0 +1,135 @@
+import { merge } from 'lodash-es';
+import { SETTINGS_STORE_DEFAULT_STATE, waitAllPromises } from '@/__tests__/utils';
+import { 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',
+	globalRoleId: 1,
+	disabled: false,
+	globalRole: {
+		id: '1',
+		name: 'owner',
+		scope: 'global',
+	},
+	isPending: false,
+	isOwner: true,
+	fullName: 'Owner User',
+};
+
+const MEMBER_USER = {
+	createdAt: '2023-11-22T10:17:12.246Z',
+	id: 'aaabbb',
+	email: 'member@user.com',
+	firstName: 'Member',
+	lastName: 'User',
+	globalRoleId: 2,
+	disabled: false,
+	globalRole: {
+		id: '2',
+		name: 'member',
+		scope: 'global',
+	},
+	isPending: false,
+	isOwner: 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',
+	globalRoleId: 2,
+	disabled: false,
+	globalRole: {
+		id: '2',
+		name: 'member',
+		scope: 'global',
+	},
+	isPending: false,
+	isOwner: 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 0000000000..8f1c0b0af2
--- /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__/CredentialIcon.test.ts b/packages/editor-ui/src/components/__tests__/CredentialIcon.test.ts
new file mode 100644
index 0000000000..3ebf73f93d
--- /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__/ExecutionsList.test.ts b/packages/editor-ui/src/components/__tests__/ExecutionsList.test.ts
index e9e57a2197..e66b6d43b3 100644
--- a/packages/editor-ui/src/components/__tests__/ExecutionsList.test.ts
+++ b/packages/editor-ui/src/components/__tests__/ExecutionsList.test.ts
@@ -3,7 +3,7 @@ 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 } from '@/constants';
+import { STORES, VIEWS } from '@/constants';
 import ExecutionsList from '@/components/ExecutionsList.vue';
 import type { IWorkflowDb } from '@/Interface';
 import type { IExecutionsSummary } from 'n8n-workflow';
@@ -12,6 +12,12 @@ import { useWorkflowsStore } from '@/stores/workflows.store';
 import type { RenderOptions } from '@/__tests__/render';
 import { createComponentRenderer } from '@/__tests__/render';
 
+vi.mock('vue-router', () => ({
+	useRoute: vi.fn().mockReturnValue({
+		name: VIEWS.WORKFLOW_EXECUTIONS,
+	}),
+}));
+
 let pinia: ReturnType<typeof createTestingPinia>;
 
 const generateUndefinedNullOrString = () => {
diff --git a/packages/editor-ui/src/components/__tests__/FilterConditions.test.ts b/packages/editor-ui/src/components/__tests__/FilterConditions.test.ts
new file mode 100644
index 0000000000..982a325fa2
--- /dev/null
+++ b/packages/editor-ui/src/components/__tests__/FilterConditions.test.ts
@@ -0,0 +1,309 @@
+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';
+
+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: {
+								type: 'array',
+								operation: 'contains',
+								rightType: 'any',
+							},
+						},
+						{
+							leftValue: '={{ $json.meta }}',
+							rightValue: '',
+							operator: {
+								type: 'object',
+								operation: 'notEmpty',
+								singleValue: true,
+							},
+						},
+						{
+							leftValue: '={{ $json.test }}',
+							rightValue: 'other',
+							operator: {
+								type: 'string',
+								operation: 'equals',
+								singleValue: true,
+							},
+						},
+					],
+					combinator: 'or',
+				},
+			},
+		});
+		expect(getByTestId('filter-conditions')).toBeInTheDocument();
+		const conditions = await findAllByTestId('filter-condition');
+		const combinators = await findAllByTestId('filter-combinator-select');
+
+		expect(combinators).toHaveLength(2);
+		expect(combinators[0].querySelector('input')?.value).toEqual('OR');
+		expect(combinators[1]).toHaveTextContent('OR');
+
+		expect(conditions).toHaveLength(3);
+		expect(conditions[0].querySelector('[data-test-id="filter-condition-left"]')).toHaveTextContent(
+			'{{ $json.tags }}',
+		);
+		expect(
+			conditions[0].querySelector('[data-test-id="filter-operator-select"]')?.querySelector('input')
+				?.value,
+		).toEqual('contains');
+		expect(
+			conditions[0].querySelector('[data-test-id="filter-condition-right"]')?.querySelector('input')
+				?.value,
+		).toEqual('exotic');
+
+		expect(conditions[1].querySelector('[data-test-id="filter-condition-left"]')).toHaveTextContent(
+			'{{ $json.meta }}',
+		);
+		expect(
+			conditions[1].querySelector('[data-test-id="filter-operator-select"]')?.querySelector('input')
+				?.value,
+		).toEqual('is not empty');
+		expect(conditions[1].querySelector('[data-test-id="filter-condition-right"]')).toBeNull();
+	});
+
+	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: {
+								type: 'number',
+								operation: 'equals',
+							},
+						},
+						{
+							leftValue: '={{ $json.num }}',
+							rightValue: 'not a number',
+							operator: {
+								type: 'number',
+								operation: '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: { type: 'string', operation: 'equals' },
+							rightValue: 'bar',
+						},
+						{
+							leftValue: 'foo',
+							operator: { type: 'string', operation: '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);
+
+		const removeButton = conditions[0].querySelector('[data-test-id="filter-remove-condition"]');
+
+		await userEvent.click(removeButton as Element);
+
+		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: { type: 'string', operation: 'equals' },
+							rightValue: 'bar',
+						},
+						{
+							leftValue: 'foo',
+							operator: { type: 'string', operation: '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();
+		}
+	});
+});
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 0000000000..f29ea4424a
--- /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 0000000000..74f5e17be7
--- /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
index f6be1abc45..5c0423c33a 100644
--- a/packages/editor-ui/src/components/__tests__/MainSidebarSourceControl.test.ts
+++ b/packages/editor-ui/src/components/__tests__/MainSidebarSourceControl.test.ts
@@ -8,13 +8,13 @@ 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 { useUsersStore } from '@/stores/users.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 usersStore: ReturnType<typeof useUsersStore>;
+let rbacStore: ReturnType<typeof useRBACStore>;
 
 const renderComponent = createComponentRenderer(MainSidebarSourceControl);
 
@@ -28,8 +28,8 @@ describe('MainSidebarSourceControl', () => {
 			},
 		});
 
-		usersStore = useUsersStore(pinia);
-		vi.spyOn(usersStore, 'isInstanceOwner', 'get').mockReturnValue(true);
+		rbacStore = useRBACStore(pinia);
+		vi.spyOn(rbacStore, 'hasScope').mockReturnValue(true);
 
 		sourceControlStore = useSourceControlStore();
 		vi.spyOn(sourceControlStore, 'isEnterpriseSourceControlEnabled', 'get').mockReturnValue(true);
@@ -38,7 +38,7 @@ describe('MainSidebarSourceControl', () => {
 	});
 
 	it('should render nothing when not instance owner', async () => {
-		vi.spyOn(usersStore, 'isInstanceOwner', 'get').mockReturnValue(false);
+		vi.spyOn(rbacStore, 'hasScope').mockReturnValue(false);
 		const { container } = renderComponent({ pinia, props: { isCollapsed: false } });
 		expect(container).toBeEmptyDOMElement();
 	});
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 0000000000..19381df410
--- /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__/RBAC.test.ts b/packages/editor-ui/src/components/__tests__/RBAC.test.ts
new file mode 100644
index 0000000000..566fe71294
--- /dev/null
+++ b/packages/editor-ui/src/components/__tests__/RBAC.test.ts
@@ -0,0 +1,50 @@
+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: {},
+	})),
+}));
+
+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
index 340de546fd..762f333bba 100644
--- a/packages/editor-ui/src/components/__tests__/ResourceMapper.test.ts
+++ b/packages/editor-ui/src/components/__tests__/ResourceMapper.test.ts
@@ -109,6 +109,7 @@ describe('ResourceMapper.vue', () => {
 	});
 
 	it('renders field on top of the list when they are selected for matching', async () => {
+		const user = userEvent.setup();
 		const { container, getByTestId } = renderComponent(
 			{
 				props: {
@@ -130,14 +131,15 @@ describe('ResourceMapper.vue', () => {
 		// 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 userEvent.click(getByTestId('matching-column-option-Last name'));
+		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(
+		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: {
@@ -156,7 +158,7 @@ describe('ResourceMapper.vue', () => {
 		);
 		await waitAllPromises();
 		expect(getByTestId('resource-mapper-container')).toBeInTheDocument();
-		await userEvent.click(getByTestId('matching-column-option-Username'));
+		await user.click(getByTestId('matching-column-option-Username'));
 
 		// Both matching columns (id and Username) should be rendered in the dropdown
 		expect(
diff --git a/packages/editor-ui/src/components/__tests__/RunData.test.ts b/packages/editor-ui/src/components/__tests__/RunData.test.ts
index 4af1d9292a..7107d9a3ae 100644
--- a/packages/editor-ui/src/components/__tests__/RunData.test.ts
+++ b/packages/editor-ui/src/components/__tests__/RunData.test.ts
@@ -84,7 +84,7 @@ describe('RunData', () => {
 	const render = (outputData: unknown[], displayMode: IRunDataDisplayMode) =>
 		createComponentRenderer(RunData, {
 			props: {
-				nodeUi: {
+				node: {
 					name: 'Test Node',
 				},
 			},
@@ -103,7 +103,7 @@ describe('RunData', () => {
 			},
 		})({
 			props: {
-				nodeUi: {
+				node: {
 					id: '1',
 					name: 'Test Node',
 					position: [0, 0],
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 0000000000..55634aeab2
--- /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__/TemplatesInfoCard.test.ts b/packages/editor-ui/src/components/__tests__/TemplatesInfoCard.test.ts
new file mode 100644
index 0000000000..a7935f834f
--- /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 0000000000..555ae1dae8
--- /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 2e755ca322..d53ec96e6d 100644
--- a/packages/editor-ui/src/components/__tests__/VariablesRow.spec.ts
+++ b/packages/editor-ui/src/components/__tests__/VariablesRow.spec.ts
@@ -3,7 +3,8 @@ import type { EnvironmentVariable } from '@/Interface';
 import { fireEvent } from '@testing-library/vue';
 import { setupServer } from '@/__tests__/server';
 import { afterAll, beforeAll } from 'vitest';
-import { useSettingsStore, useUsersStore } from '@/stores';
+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';
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 0000000000..85c56750d0
--- /dev/null
+++ b/packages/editor-ui/src/components/__tests__/WorkflowLMChatModal.test.ts
@@ -0,0 +1,160 @@
+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 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 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(),
+		});
+
+		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
index 7297544a81..fe9c76162f 100644
--- a/packages/editor-ui/src/components/__tests__/WorkflowPreview.test.ts
+++ b/packages/editor-ui/src/components/__tests__/WorkflowPreview.test.ts
@@ -12,6 +12,7 @@ const renderComponent = createComponentRenderer(WorkflowPreview);
 let pinia: ReturnType<typeof createPinia>;
 let workflowsStore: ReturnType<typeof useWorkflowsStore>;
 let postMessageSpy: vi.SpyInstance;
+let consoleErrorSpy: vi.SpyInstance;
 
 const sendPostMessageCommand = (command: string) => {
 	window.postMessage(`{"command":"${command}"}`, '*');
@@ -23,6 +24,7 @@ describe('WorkflowPreview', () => {
 		setActivePinia(pinia);
 		workflowsStore = useWorkflowsStore();
 
+		consoleErrorSpy = vi.spyOn(console, 'error');
 		postMessageSpy = vi.fn();
 		Object.defineProperty(HTMLIFrameElement.prototype, 'contentWindow', {
 			writable: true,
@@ -32,6 +34,10 @@ describe('WorkflowPreview', () => {
 		});
 	});
 
+	afterEach(() => {
+		consoleErrorSpy.mockRestore();
+	});
+
 	it('should not call iframe postMessage when it is ready and no workflow or executionId props', async () => {
 		renderComponent({
 			pinia,
@@ -94,6 +100,8 @@ describe('WorkflowPreview', () => {
 				JSON.stringify({
 					command: 'openWorkflow',
 					workflow,
+					canOpenNDV: true,
+					hideNodeIssues: false,
 				}),
 				'*',
 			);
@@ -134,6 +142,7 @@ describe('WorkflowPreview', () => {
 					command: 'openExecution',
 					executionId,
 					executionMode: '',
+					canOpenNDV: true,
 				}),
 				'*',
 			);
@@ -162,6 +171,7 @@ describe('WorkflowPreview', () => {
 					command: 'openExecution',
 					executionId,
 					executionMode: '',
+					canOpenNDV: true,
 				}),
 				'*',
 			);
@@ -197,6 +207,8 @@ describe('WorkflowPreview', () => {
 				JSON.stringify({
 					command: 'openWorkflow',
 					workflow,
+					canOpenNDV: true,
+					hideNodeIssues: false,
 				}),
 				'*',
 			);
@@ -215,6 +227,30 @@ describe('WorkflowPreview', () => {
 		});
 	});
 
+	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,
@@ -227,4 +263,32 @@ describe('WorkflowPreview', () => {
 			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__/__snapshots__/RunDataSchema.test.ts.snap b/packages/editor-ui/src/components/__tests__/__snapshots__/RunDataSchema.test.ts.snap
index 394d4b03c1..60c00cceb7 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
@@ -320,7 +320,7 @@ 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"
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 0000000000..c5c07eb767
--- /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/banners/BannerStack.vue b/packages/editor-ui/src/components/banners/BannerStack.vue
index a52b7e696f..f78aa0d851 100644
--- a/packages/editor-ui/src/components/banners/BannerStack.vue
+++ b/packages/editor-ui/src/components/banners/BannerStack.vue
@@ -23,7 +23,7 @@ export const N8N_BANNERS: N8nBanners = {
 <script setup lang="ts">
 import { useUIStore } from '@/stores/ui.store';
 import { computed, onMounted } from 'vue';
-import { getBannerRowHeight } from '@/utils';
+import { getBannerRowHeight } from '@/utils/htmlUtils';
 
 const uiStore = useUIStore();
 
diff --git a/packages/editor-ui/src/components/banners/BaseBanner.vue b/packages/editor-ui/src/components/banners/BaseBanner.vue
index 5b968c5860..761305d769 100644
--- a/packages/editor-ui/src/components/banners/BaseBanner.vue
+++ b/packages/editor-ui/src/components/banners/BaseBanner.vue
@@ -33,8 +33,8 @@ async function onCloseClick() {
 	<n8n-callout
 		:theme="props.theme"
 		:icon="props.customIcon"
-		iconSize="medium"
-		:roundCorners="false"
+		icon-size="medium"
+		:round-corners="false"
 		:data-test-id="`banners-${props.name}`"
 	>
 		<div :class="[$style.mainContent, !hasTrailingContent ? $style.keepSpace : '']">
diff --git a/packages/editor-ui/src/components/banners/EmailConfirmationBanner.vue b/packages/editor-ui/src/components/banners/EmailConfirmationBanner.vue
index 12936e10c3..45b3d8c425 100644
--- a/packages/editor-ui/src/components/banners/EmailConfirmationBanner.vue
+++ b/packages/editor-ui/src/components/banners/EmailConfirmationBanner.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import BaseBanner from '@/components/banners/BaseBanner.vue';
-import { useToast } from '@/composables';
+import { useToast } from '@/composables/useToast';
 import { i18n as locale } from '@/plugins/i18n';
 import { useUsersStore } from '@/stores/users.store';
 import { computed } from 'vue';
@@ -31,7 +31,7 @@ async function onConfirmEmailClick() {
 </script>
 
 <template>
-	<base-banner name="EMAIL_CONFIRMATION" theme="warning">
+	<BaseBanner name="EMAIL_CONFIRMATION" theme="warning">
 		<template #mainContent>
 			<span>
 				{{ locale.baseText('banners.confirmEmail.message.1') }}
@@ -42,13 +42,13 @@ async function onConfirmEmailClick() {
 		<template #trailingContent>
 			<n8n-button
 				type="success"
-				@click="onConfirmEmailClick"
 				icon="envelope"
 				size="small"
 				data-test-id="confirm-email-button"
+				@click="onConfirmEmailClick"
 			>
 				{{ locale.baseText('banners.confirmEmail.button') }}
 			</n8n-button>
 		</template>
-	</base-banner>
+	</BaseBanner>
 </template>
diff --git a/packages/editor-ui/src/components/banners/NonProductionLicenseBanner.vue b/packages/editor-ui/src/components/banners/NonProductionLicenseBanner.vue
index e9465092e6..29a258531b 100644
--- a/packages/editor-ui/src/components/banners/NonProductionLicenseBanner.vue
+++ b/packages/editor-ui/src/components/banners/NonProductionLicenseBanner.vue
@@ -4,9 +4,9 @@ import { i18n as locale } from '@/plugins/i18n';
 </script>
 
 <template>
-	<base-banner name="NON_PRODUCTION_LICENSE" :dismissible="false">
+	<BaseBanner name="NON_PRODUCTION_LICENSE" :dismissible="false">
 		<template #mainContent>
 			<span>{{ locale.baseText('banners.nonProductionLicense.message') }}</span>
 		</template>
-	</base-banner>
+	</BaseBanner>
 </template>
diff --git a/packages/editor-ui/src/components/banners/TrialBanner.vue b/packages/editor-ui/src/components/banners/TrialBanner.vue
index 5624c03da8..3707571d0d 100644
--- a/packages/editor-ui/src/components/banners/TrialBanner.vue
+++ b/packages/editor-ui/src/components/banners/TrialBanner.vue
@@ -3,7 +3,7 @@ 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';
+import { useUIStore } from '@/stores/ui.store';
 
 const trialDaysLeft = computed(() => {
 	const { trialDaysLeft } = useCloudPlanStore();
@@ -23,14 +23,14 @@ function onUpdatePlanClick() {
 </script>
 
 <template>
-	<base-banner name="TRIAL" theme="custom">
+	<BaseBanner name="TRIAL" theme="custom">
 		<template #mainContent>
 			<span>{{ messageText }}</span>
 		</template>
 		<template #trailingContent>
-			<n8n-button type="success" @click="onUpdatePlanClick" icon="gem" size="small">{{
+			<n8n-button type="success" icon="gem" size="small" @click="onUpdatePlanClick">{{
 				locale.baseText('generic.upgradeNow')
 			}}</n8n-button>
 		</template>
-	</base-banner>
+	</BaseBanner>
 </template>
diff --git a/packages/editor-ui/src/components/banners/TrialOverBanner.vue b/packages/editor-ui/src/components/banners/TrialOverBanner.vue
index 5a03a25f2c..9080ad0fed 100644
--- a/packages/editor-ui/src/components/banners/TrialOverBanner.vue
+++ b/packages/editor-ui/src/components/banners/TrialOverBanner.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import BaseBanner from '@/components/banners/BaseBanner.vue';
 import { i18n as locale } from '@/plugins/i18n';
-import { useUIStore } from '@/stores';
+import { useUIStore } from '@/stores/ui.store';
 
 function onUpdatePlanClick() {
 	void useUIStore().goToUpgrade('canvas-nav', 'upgrade-canvas-nav', 'redirect');
@@ -9,14 +9,14 @@ function onUpdatePlanClick() {
 </script>
 
 <template>
-	<base-banner customIcon="info-circle" theme="warning" name="TRIAL_OVER">
+	<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" @click="onUpdatePlanClick" icon="gem" size="small">{{
+			<n8n-button type="success" icon="gem" size="small" @click="onUpdatePlanClick">{{
 				locale.baseText('generic.upgradeNow')
 			}}</n8n-button>
 		</template>
-	</base-banner>
+	</BaseBanner>
 </template>
diff --git a/packages/editor-ui/src/components/banners/V1Banner.vue b/packages/editor-ui/src/components/banners/V1Banner.vue
index cf3df23d55..c335b2129f 100644
--- a/packages/editor-ui/src/components/banners/V1Banner.vue
+++ b/packages/editor-ui/src/components/banners/V1Banner.vue
@@ -1,32 +1,33 @@
 <script lang="ts" setup>
+import { computed } from 'vue';
 import BaseBanner from '@/components/banners/BaseBanner.vue';
 import { i18n as locale } from '@/plugins/i18n';
-import { useUsersStore } from '@/stores';
+import { hasPermission } from '@/rbac/permissions';
 import { useUIStore } from '@/stores/ui.store';
 
 const uiStore = useUIStore();
 
-const { isInstanceOwner } = useUsersStore();
-
 async function dismissPermanently() {
 	await uiStore.dismissBanner('V1', 'permanent');
 }
+
+const hasOwnerPermission = computed(() => hasPermission(['instanceOwner']));
 </script>
 
 <template>
-	<base-banner customIcon="info-circle" theme="warning" name="V1" :class="$style.v1container">
+	<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="isInstanceOwner"
+				v-if="hasOwnerPermission"
 				:class="$style.link"
-				@click="dismissPermanently"
 				data-test-id="banner-confirm-v1"
+				@click="dismissPermanently"
 			>
 				<span v-html="locale.baseText('generic.dontShowAgain')"></span>
 			</a>
 		</template>
-	</base-banner>
+	</BaseBanner>
 </template>
 
 <style lang="scss" module>
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 0000000000..8c9cee11b6
--- /dev/null
+++ b/packages/editor-ui/src/components/banners/__tests__/V1Banner.spec.ts
@@ -0,0 +1,36 @@
+import { render } from '@testing-library/vue';
+import V1Banner from '../V1Banner.vue';
+import { createPinia, setActivePinia } from 'pinia';
+import { useUsersStore } from '@/stores/users.store';
+
+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({
+			globalRole: {
+				id: 0,
+				name: 'owner',
+				createdAt: '2021-08-09T14:00:00.000Z',
+			},
+		});
+
+		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 0000000000..9f153ce0f5
--- /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/forms/ResourceFiltersDropdown.vue b/packages/editor-ui/src/components/forms/ResourceFiltersDropdown.vue
index 1cbe786fff..d27fd8bd72 100644
--- a/packages/editor-ui/src/components/forms/ResourceFiltersDropdown.vue
+++ b/packages/editor-ui/src/components/forms/ResourceFiltersDropdown.vue
@@ -15,11 +15,11 @@
 			</n8n-button>
 		</template>
 		<div :class="$style['filters-dropdown']" data-test-id="resources-list-filters-dropdown">
-			<slot :filters="modelValue" :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')"
@@ -30,13 +30,13 @@
 				/>
 				<n8n-user-select
 					:users="ownedByUsers"
-					:currentUserId="usersStore.currentUser.id"
-					:modelValue="modelValue.ownedBy"
+					:current-user-id="usersStore.currentUser.id"
+					:model-value="modelValue.ownedBy"
 					size="medium"
 					@update:modelValue="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"
@@ -46,13 +46,13 @@
 				/>
 				<n8n-user-select
 					:users="sharedWithUsers"
-					:currentUserId="usersStore.currentUser.id"
-					:modelValue="modelValue.sharedWith"
+					:current-user-id="usersStore.currentUser.id"
+					:model-value="modelValue.sharedWith"
 					size="medium"
 					@update:modelValue="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>
@@ -109,7 +109,7 @@ export default defineComponent({
 		filtersLength(): number {
 			let length = 0;
 
-			(this.keys as string[]).forEach((key) => {
+			this.keys.forEach((key) => {
 				if (key === 'search') {
 					return;
 				}
@@ -129,6 +129,11 @@ export default defineComponent({
 			return this.filtersLength > 0;
 		},
 	},
+	watch: {
+		filtersLength(value: number) {
+			this.$emit('update:filtersLength', value);
+		},
+	},
 	methods: {
 		setKeyValue(key: string, value: unknown) {
 			const filters = {
@@ -144,7 +149,7 @@ export default defineComponent({
 			} else {
 				const filters = { ...this.modelValue };
 
-				(this.keys as string[]).forEach((key) => {
+				this.keys.forEach((key) => {
 					filters[key] = Array.isArray(this.modelValue[key]) ? [] : '';
 				});
 
@@ -152,11 +157,6 @@ export default defineComponent({
 			}
 		},
 	},
-	watch: {
-		filtersLength(value: number) {
-			this.$emit('update:filtersLength', value);
-		},
-	},
 });
 </script>
 
diff --git a/packages/editor-ui/src/components/forms/ResourceOwnershipSelect.ee.vue b/packages/editor-ui/src/components/forms/ResourceOwnershipSelect.ee.vue
index 3cfcd9971d..448a5e4117 100644
--- a/packages/editor-ui/src/components/forms/ResourceOwnershipSelect.ee.vue
+++ b/packages/editor-ui/src/components/forms/ResourceOwnershipSelect.ee.vue
@@ -3,7 +3,7 @@
 		<n8n-menu
 			:items="menuItems"
 			mode="tabs"
-			:modelValue="value ? 'owner' : 'all'"
+			:model-value="value ? 'owner' : 'all'"
 			@update:modelValue="onSelectOwner"
 		/>
 	</div>
diff --git a/packages/editor-ui/src/components/layouts/PageViewLayout.vue b/packages/editor-ui/src/components/layouts/PageViewLayout.vue
index 5edb1d2e2b..7f18b4203a 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">
@@ -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 bbf43af7c4..47e7a9a4c7 100644
--- a/packages/editor-ui/src/components/layouts/ResourcesListLayout.vue
+++ b/packages/editor-ui/src/components/layouts/ResourcesListLayout.vue
@@ -1,6 +1,6 @@
 <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">
 					{{ i18n.baseText(`${resourceKey}.heading`) }}
@@ -13,16 +13,16 @@
 						size="large"
 						block
 						:disabled="disabled"
-						@click="$emit('click:add', $event)"
 						data-test-id="resources-list-add"
+						@click="$emit('click:add', $event)"
 					>
 						{{ 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="i18n.baseText(`${resourceKey}.menu.my`)"
 					:all-resources-label="i18n.baseText(`${resourceKey}.menu.all`)"
@@ -52,22 +52,22 @@
 							)
 						"
 						:description="i18n.baseText(`${resourceKey}.empty.description`)"
-						:buttonText="i18n.baseText(`${resourceKey}.empty.button`)"
-						buttonType="secondary"
+						: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
-								:modelValue="filtersModel.search"
+								ref="search"
+								:model-value="filtersModel.search"
 								:class="[$style['search'], 'mr-2xs']"
 								:placeholder="i18n.baseText(`${resourceKey}.search.placeholder`)"
 								clearable
-								ref="search"
 								data-test-id="resources-list-search"
 								@update:modelValue="onSearch"
 							>
@@ -79,17 +79,17 @@
 								<n8n-select v-model="sortBy" data-test-id="resources-list-sort">
 									<n8n-option
 										v-for="sortOption in sortOptions"
-										data-test-id="resources-list-sort-item"
 										:key="sortOption"
+										data-test-id="resources-list-sort-item"
 										:value="sortOption"
 										:label="i18n.baseText(`${resourceKey}.sort.${sortOption}`)"
 									/>
 								</n8n-select>
-								<resource-filters-dropdown
+								<ResourceFiltersDropdown
 									v-if="showFiltersDropdown"
 									:keys="filterKeys"
 									:reset="resetFilters"
-									:modelValue="filtersModel"
+									:model-value="filtersModel"
 									:shareable="shareable"
 									@update:modelValue="$emit('update:filters', $event)"
 									@update:filtersLength="onUpdateFiltersLength"
@@ -97,7 +97,7 @@
 									<template #default="resourceFiltersSlotProps">
 										<slot name="filters" v-bind="resourceFiltersSlotProps" />
 									</template>
-								</resource-filters-dropdown>
+								</ResourceFiltersDropdown>
 							</div>
 						</div>
 					</div>
@@ -107,7 +107,7 @@
 					<div v-if="showFiltersDropdown" v-show="hasFilters" class="mt-xs">
 						<n8n-info-tip :bold="false">
 							{{ i18n.baseText(`${resourceKey}.filters.active`) }}
-							<n8n-link @click="resetFilters" size="small">
+							<n8n-link data-test-id="workflows-filter-reset" size="small" @click="resetFilters">
 								{{ i18n.baseText(`${resourceKey}.filters.active.reset`) }}
 							</n8n-link>
 						</n8n-info-tip>
@@ -120,8 +120,8 @@
 
 				<div
 					v-if="filteredAndSortedSubviewResources.length > 0"
-					:class="$style.listWrapper"
 					ref="listWrapperRef"
+					:class="$style.listWrapper"
 				>
 					<n8n-recycle-scroller
 						v-if="type === 'list'"
@@ -132,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
@@ -141,8 +144,8 @@
 						:class="$style.datatable"
 						:columns="typeProps.columns"
 						:rows="filteredAndSortedSubviewResources"
-						:currentPage="currentPage"
-						:rowsPerPage="rowsPerPage"
+						:current-page="currentPage"
+						:rows-per-page="rowsPerPage"
 						@update:currentPage="setCurrentPage"
 						@update:rowsPerPage="setRowsPerPage"
 					>
@@ -152,7 +155,7 @@
 					</n8n-datatable>
 				</div>
 
-				<n8n-text color="text-base" size="medium" data-test-id="resources-list-empty" v-else>
+				<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="!filtersModel.search">
@@ -174,9 +177,9 @@
 				</n8n-text>
 
 				<slot name="postamble" />
-			</page-view-layout-list>
+			</PageViewLayoutList>
 		</template>
-	</page-view-layout>
+	</PageViewLayout>
 </template>
 
 <script lang="ts">
@@ -188,14 +191,13 @@ import type { IUser } from '@/Interface';
 import PageViewLayout from '@/components/layouts/PageViewLayout.vue';
 import PageViewLayoutList from '@/components/layouts/PageViewLayoutList.vue';
 import { EnterpriseEditionFeature } from '@/constants';
-import { debounceHelper } from '@/mixins/debounce';
 import ResourceOwnershipSelect from '@/components/forms/ResourceOwnershipSelect.ee.vue';
 import ResourceFiltersDropdown from '@/components/forms/ResourceFiltersDropdown.vue';
 import { useSettingsStore } from '@/stores/settings.store';
 import { useUsersStore } from '@/stores/users.store';
-import type { N8nInput } from 'n8n-design-system';
-import type { DatatableColumn } from 'n8n-design-system';
-import { useI18n } from '@/composables';
+import type { N8nInput, DatatableColumn } from 'n8n-design-system';
+import { useI18n } from '@/composables/useI18n';
+import { useDebounce } from '@/composables/useDebounce';
 
 export interface IResource {
 	id: string;
@@ -218,8 +220,7 @@ type IResourceKeyType = 'credentials' | 'workflows';
 type SearchRef = InstanceType<typeof N8nInput>;
 
 export default defineComponent({
-	name: 'resources-list-layout',
-	mixins: [debounceHelper],
+	name: 'ResourcesListLayout',
 	components: {
 		PageViewLayout,
 		PageViewLayoutList,
@@ -287,9 +288,11 @@ export default defineComponent({
 	},
 	setup() {
 		const i18n = useI18n();
+		const { callDebounced } = useDebounce();
 
 		return {
 			i18n,
+			callDebounced,
 		};
 	},
 	data() {
@@ -338,10 +341,7 @@ export default defineComponent({
 				if (this.filtersModel.sharedWith) {
 					matches =
 						matches &&
-						!!(
-							resource.sharedWith &&
-							resource.sharedWith.find((sharee) => sharee.id === this.filtersModel.sharedWith)
-						);
+						!!resource.sharedWith?.find((sharee) => sharee.id === this.filtersModel.sharedWith);
 				}
 
 				if (this.filtersModel.search) {
@@ -360,20 +360,20 @@ export default defineComponent({
 			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;
@@ -389,6 +389,37 @@ export default defineComponent({
 			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();
@@ -396,6 +427,19 @@ export default defineComponent({
 			this.loading = false;
 			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;
@@ -473,37 +517,6 @@ export default defineComponent({
 			this.$emit('update:filters', this.filtersModel);
 		},
 	},
-	mounted() {
-		void this.onMounted();
-	},
-	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(
-				'sendFiltersTelemetry',
-				{ debounceTime: 1000, trailing: true },
-				'search',
-			);
-		},
-		sortBy(newValue) {
-			this.$emit('sort', newValue);
-			this.sendSortingTelemetry();
-		},
-	},
 });
 </script>
 
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 0000000000..1a7ac989f0
--- /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 node...",
+    "shortcut": {
+      "keys": [
+        "↵",
+      ],
+    },
+  },
+  {
+    "disabled": true,
+    "id": "execute",
+    "label": "Test node",
+  },
+  {
+    "disabled": true,
+    "id": "rename",
+    "label": "Rename node",
+    "shortcut": {
+      "keys": [
+        "F2",
+      ],
+    },
+  },
+  {
+    "disabled": true,
+    "id": "toggle_activation",
+    "label": "Deactivate node",
+    "shortcut": {
+      "keys": [
+        "D",
+      ],
+    },
+  },
+  {
+    "disabled": true,
+    "id": "toggle_pin",
+    "label": "Pin node",
+    "shortcut": {
+      "keys": [
+        "p",
+      ],
+    },
+  },
+  {
+    "id": "copy",
+    "label": "Copy node",
+    "shortcut": {
+      "keys": [
+        "C",
+      ],
+      "metaKey": true,
+    },
+  },
+  {
+    "disabled": true,
+    "id": "duplicate",
+    "label": "Duplicate node",
+    "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 node",
+    "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 sticky note",
+    "shortcut": {
+      "keys": [
+        "C",
+      ],
+      "metaKey": true,
+    },
+  },
+  {
+    "disabled": true,
+    "id": "duplicate",
+    "label": "Duplicate sticky note",
+    "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 sticky note",
+    "shortcut": {
+      "keys": [
+        "Del",
+      ],
+    },
+  },
+]
+`;
+
+exports[`useContextMenu > should return the correct actions opening the menu from the button 1`] = `
+[
+  {
+    "id": "open",
+    "label": "Open node...",
+    "shortcut": {
+      "keys": [
+        "↵",
+      ],
+    },
+  },
+  {
+    "disabled": false,
+    "id": "execute",
+    "label": "Test node",
+  },
+  {
+    "disabled": false,
+    "id": "rename",
+    "label": "Rename node",
+    "shortcut": {
+      "keys": [
+        "F2",
+      ],
+    },
+  },
+  {
+    "disabled": false,
+    "id": "toggle_activation",
+    "label": "Deactivate node",
+    "shortcut": {
+      "keys": [
+        "D",
+      ],
+    },
+  },
+  {
+    "disabled": true,
+    "id": "toggle_pin",
+    "label": "Pin node",
+    "shortcut": {
+      "keys": [
+        "p",
+      ],
+    },
+  },
+  {
+    "id": "copy",
+    "label": "Copy node",
+    "shortcut": {
+      "keys": [
+        "C",
+      ],
+      "metaKey": true,
+    },
+  },
+  {
+    "disabled": true,
+    "id": "duplicate",
+    "label": "Duplicate node",
+    "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 node",
+    "shortcut": {
+      "keys": [
+        "Del",
+      ],
+    },
+  },
+]
+`;
+
+exports[`useContextMenu > should return the correct actions when right clicking a Node 1`] = `
+[
+  {
+    "id": "open",
+    "label": "Open node...",
+    "shortcut": {
+      "keys": [
+        "↵",
+      ],
+    },
+  },
+  {
+    "disabled": false,
+    "id": "execute",
+    "label": "Test node",
+  },
+  {
+    "disabled": false,
+    "id": "rename",
+    "label": "Rename node",
+    "shortcut": {
+      "keys": [
+        "F2",
+      ],
+    },
+  },
+  {
+    "disabled": false,
+    "id": "toggle_activation",
+    "label": "Deactivate node",
+    "shortcut": {
+      "keys": [
+        "D",
+      ],
+    },
+  },
+  {
+    "disabled": true,
+    "id": "toggle_pin",
+    "label": "Pin node",
+    "shortcut": {
+      "keys": [
+        "p",
+      ],
+    },
+  },
+  {
+    "id": "copy",
+    "label": "Copy node",
+    "shortcut": {
+      "keys": [
+        "C",
+      ],
+      "metaKey": true,
+    },
+  },
+  {
+    "disabled": true,
+    "id": "duplicate",
+    "label": "Duplicate node",
+    "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 node",
+    "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 sticky note",
+    "shortcut": {
+      "keys": [
+        "C",
+      ],
+      "metaKey": true,
+    },
+  },
+  {
+    "disabled": true,
+    "id": "duplicate",
+    "label": "Duplicate sticky note",
+    "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 sticky note",
+    "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 0000000000..883bab87d2
--- /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__/useClipboard.test.ts b/packages/editor-ui/src/composables/__tests__/useClipboard.test.ts
new file mode 100644
index 0000000000..c3c150c0cc
--- /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 0000000000..6e3374be64
--- /dev/null
+++ b/packages/editor-ui/src/composables/__tests__/useContextMenu.test.ts
@@ -0,0 +1,126 @@
+import type { INodeUi } from '@/Interface';
+import { useContextMenu } from '@/composables/useContextMenu';
+import { NO_OP_NODE_TYPE, STICKY_NODE_TYPE, STORES } from '@/constants';
+import { faker } from '@faker-js/faker';
+import { createTestingPinia } from '@pinia/testing';
+import { setActivePinia } from 'pinia';
+import { useSourceControlStore } from '@/stores/sourceControl.store';
+import { useUIStore } from '@/stores/ui.store';
+
+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>;
+	const nodes = [nodeFactory(), nodeFactory(), nodeFactory()];
+	const selectedNodes = nodes.slice(0, 2);
+
+	beforeAll(() => {
+		setActivePinia(
+			createTestingPinia({
+				initialState: {
+					[STORES.UI]: { selectedNodes },
+					[STORES.WORKFLOWS]: { workflow: { nodes } },
+				},
+			}),
+		);
+		sourceControlStore = useSourceControlStore();
+		uiStore = useUIStore();
+		vi.spyOn(uiStore, 'isReadOnlyView', 'get').mockReturnValue(false);
+		vi.spyOn(sourceControlStore, 'preferences', 'get').mockReturnValue({
+			branchReadOnly: false,
+		} as never);
+	});
+
+	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 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
index fb5a089d7c..8ec6ce8283 100644
--- a/packages/editor-ui/src/composables/__tests__/useDataSchema.test.ts
+++ b/packages/editor-ui/src/composables/__tests__/useDataSchema.test.ts
@@ -1,5 +1,5 @@
 import jp from 'jsonpath';
-import { useDataSchema } from '@/composables';
+import { useDataSchema } from '@/composables/useDataSchema';
 import type { Schema } from '@/Interface';
 
 describe('useDataSchema', () => {
@@ -284,7 +284,7 @@ describe('useDataSchema', () => {
 
 		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 schema = getSchema(input);
 			const pathData = jp.query(
 				input,
 				`$${((schema.value as Schema[])[0].value as Schema[])[0].path}`,
@@ -297,7 +297,7 @@ describe('useDataSchema', () => {
 				{ name: 'John', age: 22, hobbies: ['surfing', 'traveling'] },
 				{ name: 'Joe', age: 33, hobbies: ['skateboarding', 'gaming'] },
 			];
-			const schema = getSchema(input) as Schema;
+			const schema = getSchema(input);
 			const pathData = jp.query(
 				input,
 				`$${(((schema.value as Schema[])[0].value as Schema[])[2].value as Schema[])[1].path}`,
@@ -307,7 +307,7 @@ describe('useDataSchema', () => {
 
 		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 schema = getSchema(input);
 			const pathData = jp.query(
 				input,
 				`$${((schema.value as Schema[])[0].value as Schema[])[1].path}`,
@@ -322,7 +322,7 @@ describe('useDataSchema', () => {
 					{ name: 'Joe', age: 33 },
 				],
 			];
-			const schema = getSchema(input) as Schema;
+			const schema = getSchema(input);
 			const pathData = jp.query(
 				input,
 				`$${(((schema.value as Schema[])[0].value as Schema[])[1].value as Schema[])[1].path}`,
@@ -339,7 +339,7 @@ describe('useDataSchema', () => {
 					],
 				},
 			];
-			const schema = getSchema(input) as Schema;
+			const schema = getSchema(input);
 			const pathData = jp.query(
 				input,
 				`$${
diff --git a/packages/editor-ui/src/composables/__tests__/useDebounce.test.ts b/packages/editor-ui/src/composables/__tests__/useDebounce.test.ts
index 7de407d96a..ea342da77a 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__/useHistoryHelper.test.ts b/packages/editor-ui/src/composables/__tests__/useHistoryHelper.test.ts
index 9176fd9d2e..a035654b1f 100644
--- a/packages/editor-ui/src/composables/__tests__/useHistoryHelper.test.ts
+++ b/packages/editor-ui/src/composables/__tests__/useHistoryHelper.test.ts
@@ -22,7 +22,13 @@ vi.mock('@/stores/history.store', () => {
 		}),
 	};
 });
-vi.mock('@/stores/ui.store');
+vi.mock('@/stores/ui.store', () => {
+	return {
+		useUIStore: () => ({
+			isAnyModalOpen: false,
+		}),
+	};
+});
 vi.mock('vue-router', () => ({
 	useRoute: () => ({}),
 }));
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 0000000000..1969b3d5b8
--- /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 0000000000..1cd25c7864
--- /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 0000000000..499c371496
--- /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/index.ts b/packages/editor-ui/src/composables/index.ts
deleted file mode 100644
index 2561f7936c..0000000000
--- a/packages/editor-ui/src/composables/index.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-export { default as useCanvasMouseSelect } from './useCanvasMouseSelect';
-export * from './useCopyToClipboard';
-export * from './useDebounce';
-export { default as useDeviceSupport } from './useDeviceSupport';
-export * from './useExternalHooks';
-export * from './useExternalSecretsProvider';
-export { default as useGlobalLinkActions } from './useGlobalLinkActions';
-export * from './useHistoryHelper';
-export * from './useI18n';
-export * from './useLoadingService';
-export * from './useMessage';
-export * from './useTelemetry';
-export * from './useTitleChange';
-export * from './useToast';
-export * from './useNodeSpecificationValues';
-export * from './useDataSchema';
-export * from './useExecutionDebugging';
diff --git a/packages/editor-ui/src/composables/useActiveNode.ts b/packages/editor-ui/src/composables/useActiveNode.ts
new file mode 100644
index 0000000000..6faf76b93b
--- /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/useCanvasMouseSelect.ts b/packages/editor-ui/src/composables/useCanvasMouseSelect.ts
index 843cab09a9..a04342db23 100644
--- a/packages/editor-ui/src/composables/useCanvasMouseSelect.ts
+++ b/packages/editor-ui/src/composables/useCanvasMouseSelect.ts
@@ -1,11 +1,12 @@
 import type { INodeUi, XYPosition } from '@/Interface';
 
-import useDeviceSupport from './useDeviceSupport';
+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;
@@ -20,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);
@@ -127,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();
@@ -156,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;
diff --git a/packages/editor-ui/src/composables/useClipboard.ts b/packages/editor-ui/src/composables/useClipboard.ts
new file mode 100644
index 0000000000..c25bc824fc
--- /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();
+
+	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 0000000000..012235bd15
--- /dev/null
+++ b/packages/editor-ui/src/composables/useContextMenu.ts
@@ -0,0 +1,261 @@
+import type { XYPosition } from '@/Interface';
+import {
+	NOT_DUPLICATABE_NODE_TYPES,
+	PIN_DATA_NODE_TYPES_DENYLIST,
+	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 { IActionDropdownItem } from 'n8n-design-system/src/components/N8nActionDropdown/ActionDropdown.vue';
+import type { INode, INodeTypeDescription } from 'n8n-workflow';
+import { computed, ref, watch } from 'vue';
+import { getMousePosition } from '../utils/nodeViewUtils';
+import { useI18n } from './useI18n';
+import { useDataSchema } from './useDataSchema';
+
+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<IActionDropdownItem[]>([]);
+const actionCallback = ref<ContextMenuActionCallback>(() => {});
+
+export const useContextMenu = (onAction: ContextMenuActionCallback = () => {}) => {
+	const uiStore = useUIStore();
+	const nodeTypesStore = useNodeTypesStore();
+	const workflowsStore = useWorkflowsStore();
+	const sourceControlStore = useSourceControlStore();
+	const { getInputDataWithPinned } = useDataSchema();
+	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 canPinNode = (node: INode): boolean => {
+		const nodeType = nodeTypesStore.getNodeType(node.type, node.typeVersion);
+		const dataToPin = getInputDataWithPinned(node);
+		if (!nodeType || dataToPin.length === 0) return false;
+		return nodeType.outputs.length === 1 && !PIN_DATA_NODE_TYPES_DENYLIST.includes(node.type);
+	};
+
+	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: IActionDropdownItem[] = [
+				!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(canPinNode),
+				},
+				{
+					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 IActionDropdownItem[];
+
+			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 7e71370d3b..0000000000
--- 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
index 1ed4c5bdb9..d6c4464218 100644
--- a/packages/editor-ui/src/composables/useDataSchema.ts
+++ b/packages/editor-ui/src/composables/useDataSchema.ts
@@ -8,7 +8,7 @@ import {
 import { merge } from 'lodash-es';
 import { generatePath } from '@/utils/mappingUtils';
 import { isObj } from '@/utils/typeGuards';
-import { useWorkflowsStore } from '@/stores';
+import { useWorkflowsStore } from '@/stores/workflows.store';
 
 export function useDataSchema() {
 	function getSchema(
diff --git a/packages/editor-ui/src/composables/useDebounce.ts b/packages/editor-ui/src/composables/useDebounce.ts
index a5b4c40316..457f85d154 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 function useDebounceHelper() {
+export type DebouncedFunction<R = void> = (...args: unknown[]) => R;
+
+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) as ReturnType<T>;
 	};
 
 	return {
+		debounce,
 		callDebounced,
 	};
 }
diff --git a/packages/editor-ui/src/composables/useExecutionDebugging.ts b/packages/editor-ui/src/composables/useExecutionDebugging.ts
index 2e422b6d4e..b0f9a60cf9 100644
--- a/packages/editor-ui/src/composables/useExecutionDebugging.ts
+++ b/packages/editor-ui/src/composables/useExecutionDebugging.ts
@@ -1,16 +1,24 @@
 import { h, computed } from 'vue';
 import { useRouter } from 'vue-router';
-import { useI18n, useMessage, useToast } from '@/composables';
+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 { useSettingsStore, useUIStore, useWorkflowsStore } from '@/stores';
 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();
@@ -88,17 +96,22 @@ export const useExecutionDebugging = () => {
 		workflowsStore.setWorkflowExecutionData(execution);
 
 		// Pin data of all nodes which do not have a parent node
-		workflowNodes
-			.filter((node: INodeUi) => !workflow.getParentNodes(node.name).length)
-			.forEach((node: INodeUi) => {
-				const nodeData = runData[node.name]?.[0].data?.main[0];
-				if (nodeData) {
-					workflowsStore.pinData({
-						node,
-						data: nodeData,
-					});
-				}
-			});
+		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'),
@@ -115,6 +128,13 @@ export const useExecutionDebugging = () => {
 				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 => {
diff --git a/packages/editor-ui/src/composables/useExternalHooks.ts b/packages/editor-ui/src/composables/useExternalHooks.ts
index bc37d97456..6e69d6f035 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 type {
+	ExternalHooks,
+	ExternalHooksKey,
+	ExternalHooksGenericContext,
+	ExtractExternalHooksMethodPayloadFromKey,
+} from '@/types/externalHooks';
 import { useWebhooksStore } from '@/stores/webhooks.store';
-import { runExternalHook } from '@/utils';
 
-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 runExternalHook(eventName, useWebhooksStore(), metadata);
-		},
+		run: runExternalHook,
 	};
 }
diff --git a/packages/editor-ui/src/composables/useGlobalLinkActions.ts b/packages/editor-ui/src/composables/useGlobalLinkActions.ts
index 51f92c6eec..801fe1f71b 100644
--- a/packages/editor-ui/src/composables/useGlobalLinkActions.ts
+++ b/packages/editor-ui/src/composables/useGlobalLinkActions.ts
@@ -2,11 +2,12 @@
  * Creates event listeners for `data-action` attribute to allow for actions to be called from locale without using
  * unsafe onclick attribute
  */
-import { reactive, 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 () => {
@@ -17,6 +18,18 @@ export default () => {
 		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;
@@ -24,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);
 		}
 	}
 
@@ -42,15 +57,17 @@ export default () => {
 	}));
 
 	onMounted(() => {
-		const instance = getCurrentInstance();
+		if (state.delegatedClickHandler) return;
+
+		state.delegatedClickHandler = delegateClick;
 		window.addEventListener('click', delegateClick);
 
 		globalLinkActionsEventBus.on('registerGlobalLinkAction', registerCustomAction);
 	});
 
 	onUnmounted(() => {
-		const instance = getCurrentInstance();
 		window.removeEventListener('click', delegateClick);
+		state.delegatedClickHandler = null;
 
 		globalLinkActionsEventBus.off('registerGlobalLinkAction', registerCustomAction);
 	});
diff --git a/packages/editor-ui/src/composables/useHistoryHelper.ts b/packages/editor-ui/src/composables/useHistoryHelper.ts
index b7de489c9d..edba55b12d 100644
--- a/packages/editor-ui/src/composables/useHistoryHelper.ts
+++ b/packages/editor-ui/src/composables/useHistoryHelper.ts
@@ -1,31 +1,29 @@
 import { MAIN_HEADER_TABS } from '@/constants';
 import { useNDVStore } from '@/stores/ndv.store';
 import type { Undoable } from '@/models/history';
-import { BulkCommand } from '@/models/history';
+import { BulkCommand, Command } from '@/models/history';
 import { useHistoryStore } from '@/stores/history.store';
 import { useUIStore } from '@/stores/ui.store';
 
-import { ref, onMounted, onUnmounted, 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 isNDVOpen = ref<boolean>(ndvStore.activeNodeName !== null);
+	const { callDebounced } = useDebounce();
+	const { isCtrlKeyPressed } = useDeviceSupport();
 
 	const undo = async () =>
 		callDebounced(
@@ -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) {
-					void redo();
-				} else {
-					void undo();
-				}
-			} else if (!event.shiftKey) {
-				trackUndoAttempt(event);
+			if (event.shiftKey) {
+				void redo();
+			} else {
+				void undo();
 			}
 		}
 	}
diff --git a/packages/editor-ui/src/composables/useLoadingService.ts b/packages/editor-ui/src/composables/useLoadingService.ts
index 2ec61c5d94..c96ff16acd 100644
--- a/packages/editor-ui/src/composables/useLoadingService.ts
+++ b/packages/editor-ui/src/composables/useLoadingService.ts
@@ -1,4 +1,4 @@
-import { ref } from 'vue';
+import { ref, computed } from 'vue';
 import { useI18n } from '@/composables/useI18n';
 import { ElLoading as Loading } from 'element-plus';
 
@@ -19,8 +19,7 @@ export function useLoadingService() {
 		loadingService.value = Loading.service({
 			lock: true,
 			text: text || i18n.baseText('genericHelpers.loading'),
-			spinner: 'el-icon-loading',
-			background: 'rgba(255, 255, 255, 0.8)',
+			background: 'var(--color-dialog-overlay-background)',
 		}) as unknown as LoadingService;
 	}
 
@@ -37,8 +36,11 @@ export function useLoadingService() {
 		}
 	}
 
+	const isLoading = computed(() => loadingService.value !== null);
+
 	return {
 		loadingService,
+		isLoading,
 		startLoading,
 		setLoadingText,
 		stopLoading,
diff --git a/packages/editor-ui/src/composables/useNodeHelpers.ts b/packages/editor-ui/src/composables/useNodeHelpers.ts
new file mode 100644
index 0000000000..45293cc706
--- /dev/null
+++ b/packages/editor-ui/src/composables/useNodeHelpers.ts
@@ -0,0 +1,722 @@
+import { useHistoryStore } from '@/stores/history.store';
+import { CUSTOM_API_CALL_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,
+} 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';
+
+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();
+
+	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);
+
+			if (selectedCredsDoNotExist(node, nodeCredentialType, stored)) {
+				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[] {
+		if (
+			!connectionsData ||
+			!connectionsData.hasOwnProperty(connectionType) ||
+			connectionsData[connectionType] === undefined ||
+			connectionsData[connectionType].length < outputIndex ||
+			connectionsData[connectionType][outputIndex] === null
+		) {
+			return [];
+		}
+		return connectionsData[connectionType][outputIndex] as INodeExecutionData[];
+	}
+
+	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;
+
+		if (!runData?.[node]?.[runIndex]?.data) {
+			return [];
+		}
+
+		const inputData = getInputData(runData[node][runIndex].data!, outputIndex, connectionType);
+
+		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;
+	}
+
+	function disableNodes(nodes: INodeUi[], trackHistory = false) {
+		const telemetry = useTelemetry();
+
+		if (trackHistory) {
+			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;
+
+			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, oldState === true, node.disabled === true),
+				);
+			}
+		}
+		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;
+	}
+
+	return {
+		hasProxyAuth,
+		isCustomApiCallSelected,
+		getParameterValue,
+		displayParameter,
+		getNodeIssues,
+		refreshNodeIssues,
+		updateNodesInputIssues,
+		updateNodesExecutionIssues,
+		updateNodeCredentialIssuesByName,
+		updateNodeCredentialIssues,
+		updateNodeParameterIssuesByName,
+		updateNodeParameterIssues,
+		getBinaryData,
+		disableNodes,
+		getNodeSubtitle,
+		updateNodesCredentialsIssues,
+		getNodeInputData,
+	};
+}
diff --git a/packages/editor-ui/src/composables/useNodeType.ts b/packages/editor-ui/src/composables/useNodeType.ts
new file mode 100644
index 0000000000..5fa67e2c35
--- /dev/null
+++ b/packages/editor-ui/src/composables/useNodeType.ts
@@ -0,0 +1,46 @@
+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(() => (nodeType.value?.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 0000000000..31efcb950a
--- /dev/null
+++ b/packages/editor-ui/src/composables/usePinnedData.ts
@@ -0,0 +1,253 @@
+import { useToast } from '@/composables/useToast';
+import { useI18n } from '@/composables/useI18n';
+import type { INodeExecutionData, IPinData } from 'n8n-workflow';
+import { jsonParse, jsonStringify } 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';
+
+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';
+
+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 { sessionId } = 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 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,
+			session_id: sessionId.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,
+			session_id: sessionId.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,
+			session_id: sessionId.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,
+		setData,
+		onSetDataSuccess,
+		onSetDataError,
+		unsetData,
+		onUnsetData,
+		isValidJSON,
+		isValidSize,
+	};
+}
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 0000000000..cbe58864d1
--- /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 0000000000..2feeafe1f4
--- /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 17f5cfcc27..7f22cf9e4f 100644
--- a/packages/editor-ui/src/composables/useTitleChange.ts
+++ b/packages/editor-ui/src/composables/useTitleChange.ts
@@ -1,5 +1,5 @@
 import type { WorkflowTitleStatus } from '@/Interface';
-import { useSettingsStore } from '@/stores';
+import { useSettingsStore } from '@/stores/settings.store';
 
 export function useTitleChange() {
 	const prependBeta = (title: string) => {
diff --git a/packages/editor-ui/src/composables/useToast.ts b/packages/editor-ui/src/composables/useToast.ts
index 3b5256ba5c..fb5f12a61a 100644
--- a/packages/editor-ui/src/composables/useToast.ts
+++ b/packages/editor-ui/src/composables/useToast.ts
@@ -1,10 +1,12 @@
 import { ElNotification as Notification } from 'element-plus';
 import type { NotificationInstance, NotificationOptions, MessageBoxState } from 'element-plus';
-import { sanitizeHtml } from '@/utils';
+import { sanitizeHtml } from '@/utils/htmlUtils';
 import { useTelemetry } from '@/composables/useTelemetry';
 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<NotificationOptions, 'message'>> = {
 	dangerouslyUseHTMLString: true,
@@ -16,6 +18,7 @@ const stickyNotificationQueue: NotificationInstance[] = [];
 export function useToast() {
 	const telemetry = useTelemetry();
 	const workflowsStore = useWorkflowsStore();
+	const uiStore = useUIStore();
 	const externalHooks = useExternalHooks();
 	const i18n = useI18n();
 
@@ -155,11 +158,30 @@ export function useToast() {
 		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/constants.ts b/packages/editor-ui/src/constants.ts
index 0dab6b84f8..182bfa4107 100644
--- a/packages/editor-ui/src/constants.ts
+++ b/packages/editor-ui/src/constants.ts
@@ -1,9 +1,12 @@
 import type { NodeCreatorOpenSource } from './Interface';
 import { NodeConnectionType } from 'n8n-workflow';
 
-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;
+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]';
@@ -53,6 +56,8 @@ 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';
 
@@ -123,6 +128,11 @@ 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_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';
@@ -152,6 +162,25 @@ 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 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,
@@ -170,9 +199,15 @@ export const NON_ACTIVATABLE_TRIGGER_NODE_TYPES = [
 
 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];
+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];
+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<
@@ -187,6 +222,8 @@ export const NODE_CREATOR_OPEN_SOURCES: Record<
 	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';
@@ -219,9 +256,8 @@ export const REQUEST_NODE_FORM_URL = 'https://n8n-community.typeform.com/to/K1fB
 
 // Node Connection Types
 export const NODE_CONNECTION_TYPE_ALLOW_MULTIPLE: NodeConnectionType[] = [
-	// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
 	NodeConnectionType.AiTool,
-	// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+
 	NodeConnectionType.Main,
 ];
 
@@ -394,6 +430,7 @@ export const enum VIEWS {
 	EXECUTION_DEBUG = 'ExecutionDebug',
 	EXECUTION_HOME = 'ExecutionsLandingPage',
 	TEMPLATE = 'TemplatesWorkflowView',
+	TEMPLATE_SETUP = 'TemplatesWorkflowSetupView',
 	TEMPLATES = 'TemplatesSearchView',
 	CREDENTIALS = 'CredentialsView',
 	VARIABLES = 'VariablesView',
@@ -426,8 +463,11 @@ export const enum VIEWS {
 	AUDIT_LOGS = 'AuditLogs',
 	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',
@@ -453,6 +493,7 @@ export const MAPPING_PARAMS = [
 	'$env',
 	'$evaluateExpression',
 	'$execution',
+	'$ifEmpty',
 	'$input',
 	'$item',
 	'$jmespath',
@@ -498,6 +539,8 @@ export const enum EnterpriseEditionFeature {
 	AuditLogs = 'auditLogs',
 	DebugInEditor = 'debugInEditor',
 	WorkflowHistory = 'workflowHistory',
+	WorkerView = 'workerView',
+	AdvancedPermissions = 'advancedPermissions',
 }
 export const MAIN_NODE_PANEL_WIDTH = 360;
 
@@ -557,6 +600,9 @@ export const enum STORES {
 	WEBHOOKS = 'webhooks',
 	HISTORY = 'history',
 	CLOUD_PLAN = 'cloudPlan',
+	RBAC = 'rbac',
+	COLLABORATION = 'collaboration',
+	PUSH = 'push',
 }
 
 export const enum SignInType {
@@ -574,6 +620,8 @@ 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';
@@ -585,7 +633,9 @@ export const ASK_AI_EXPERIMENT = {
 	gpt4: 'gpt4',
 };
 
-export const EXPERIMENTS_TO_TRACK = [ASK_AI_EXPERIMENT.name];
+export const TEMPLATE_CREDENTIAL_SETUP_EXPERIMENT = '017_template_credential_setup_v2';
+
+export const EXPERIMENTS_TO_TRACK = [ASK_AI_EXPERIMENT.name, TEMPLATE_CREDENTIAL_SETUP_EXPERIMENT];
 
 export const MFA_AUTHENTICATION_REQUIRED_ERROR_CODE = 998;
 
@@ -611,6 +661,7 @@ export const ALLOWED_HTML_TAGS = [
 	'small',
 	'details',
 	'summary',
+	'mark',
 ];
 
 export const CLOUD_CHANGE_PLAN_PAGE = window.location.host.includes('stage-app.n8n.cloud')
@@ -637,3 +688,17 @@ 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';
diff --git a/packages/editor-ui/src/hooks/cloud.ts b/packages/editor-ui/src/hooks/cloud.ts
new file mode 100644
index 0000000000..4c68bc4d28
--- /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.sessionId,
+				};
+
+				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.sessionId,
+					},
+				};
+
+				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.sessionId,
+					},
+				};
+				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 0000000000..86bf2fc416
--- /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 0000000000..d486884d2a
--- /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 0000000000..b2fc0d3b65
--- /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 0000000000..1c293a5888
--- /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 0000000000..e768983c90
--- /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 0000000000..d7874e7c5c
--- /dev/null
+++ b/packages/editor-ui/src/hooks/utils/hooksNodesPanel.ts
@@ -0,0 +1,30 @@
+export const nodesPanelSession = {
+	sessionId: '',
+	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.sessionId,
+		},
+	};
+};
+
+export const hooksResetNodesPanelSession = () => {
+	nodesPanelSession.sessionId = `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 0000000000..43979c5141
--- /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 0000000000..ed76b904bc
--- /dev/null
+++ b/packages/editor-ui/src/init.ts
@@ -0,0 +1,84 @@
+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();
+	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 0103429e0a..33cf110c2a 100644
--- a/packages/editor-ui/src/main.ts
+++ b/packages/editor-ui/src/main.ts
@@ -5,7 +5,6 @@ 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';
@@ -20,10 +19,9 @@ import { GlobalComponentsPlugin } from './plugins/components';
 import { GlobalDirectivesPlugin } from './plugins/directives';
 import { FontAwesomePlugin } from './plugins/icons';
 
-import { runExternalHook } from '@/utils';
 import { createPinia, PiniaVuePlugin } from 'pinia';
-import { useWebhooksStore } from '@/stores';
 import { JsPlumbPlugin } from '@/plugins/jsplumb';
+import { ChartJSPlugin } from '@/plugins/chartjs';
 
 const pinia = createPinia();
 
@@ -39,13 +37,10 @@ app.use(JsPlumbPlugin);
 app.use(pinia);
 app.use(router);
 app.use(i18nInstance);
+app.use(ChartJSPlugin);
 
 app.mount('#app');
 
-router.afterEach((to, from) => {
-	void runExternalHook('main.routeChange', useWebhooksStore(), { from, to });
-});
-
 if (!import.meta.env.PROD) {
 	// Make sure that we get all error messages properly displayed
 	// as long as we are not in production mode
diff --git a/packages/editor-ui/src/mixins/__tests__/workflowHelpers.spec.ts b/packages/editor-ui/src/mixins/__tests__/workflowHelpers.spec.ts
index 4142097d4e..8870976fb5 100644
--- a/packages/editor-ui/src/mixins/__tests__/workflowHelpers.spec.ts
+++ b/packages/editor-ui/src/mixins/__tests__/workflowHelpers.spec.ts
@@ -1,5 +1,6 @@
 import { createPinia, setActivePinia } from 'pinia';
-import { useSettingsStore, useWorkflowsStore } from '@/stores';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
 import { setupServer } from '@/__tests__/server';
 import { executeData } from '@/mixins/workflowHelpers';
 import type { IExecutionResponse } from '@/Interface';
diff --git a/packages/editor-ui/src/mixins/copyPaste.ts b/packages/editor-ui/src/mixins/copyPaste.ts
deleted file mode 100644
index c2fdb22328..0000000000
--- 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
-			}
-		},
-	},
-	beforeUnmount() {
-		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 e4c9a34454..0000000000
--- a/packages/editor-ui/src/mixins/debounce.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { debounce } from 'lodash-es';
-import { defineComponent } from 'vue';
-
-export const debounceHelper = defineComponent({
-	data() {
-		return {
-			debouncedFunctions: [] as any[],
-		};
-	},
-	methods: {
-		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 a8f87f8820..0000000000
--- 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/executionsHelpers.ts b/packages/editor-ui/src/mixins/executionsHelpers.ts
index 29a6c72948..116b64b148 100644
--- a/packages/editor-ui/src/mixins/executionsHelpers.ts
+++ b/packages/editor-ui/src/mixins/executionsHelpers.ts
@@ -2,8 +2,8 @@ import { defineComponent } from 'vue';
 import { mapStores } from 'pinia';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { i18n as locale } from '@/plugins/i18n';
-import { genericHelpers } from './genericHelpers';
 import type { IExecutionsSummary } from 'n8n-workflow';
+import { convertToDisplayDate } from '@/utils/formatters/dateFormatter';
 
 export interface IExecutionUIData {
 	name: string;
@@ -13,7 +13,6 @@ export interface IExecutionUIData {
 }
 
 export const executionHelpers = defineComponent({
-	mixins: [genericHelpers],
 	computed: {
 		...mapStores(useWorkflowsStore),
 		executionId(): string {
@@ -63,7 +62,7 @@ export const executionHelpers = defineComponent({
 				const stoppedAt = execution.stoppedAt
 					? new Date(execution.stoppedAt).getTime()
 					: Date.now();
-				status.runningTime = this.displayTimer(
+				status.runningTime = this.$locale.displayTimer(
 					stoppedAt - new Date(execution.startedAt).getTime(),
 					true,
 				);
@@ -72,7 +71,7 @@ export const executionHelpers = defineComponent({
 			return status;
 		},
 		formatDate(fullDate: Date | string | number) {
-			const { date, time } = this.convertToDisplayDate(fullDate);
+			const { date, time } = convertToDisplayDate(fullDate);
 			return locale.baseText('executionsList.started', { interpolate: { time, date } });
 		},
 	},
diff --git a/packages/editor-ui/src/mixins/externalHooks.ts b/packages/editor-ui/src/mixins/externalHooks.ts
deleted file mode 100644
index 52c14b9e10..0000000000
--- 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.store';
-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 4b28e9d045..0000000000
--- a/packages/editor-ui/src/mixins/genericHelpers.ts
+++ /dev/null
@@ -1,98 +0,0 @@
-import { defineComponent } from 'vue';
-import { mapStores } from 'pinia';
-import dateformat from 'dateformat';
-import { VIEWS } from '@/constants';
-import { useToast } from '@/composables';
-import { useSourceControlStore } from '@/stores';
-
-export const genericHelpers = defineComponent({
-	setup() {
-		return {
-			...useToast(),
-		};
-	},
-	data() {
-		return {
-			loadingService: null as any | null,
-		};
-	},
-	computed: {
-		...mapStores(useSourceControlStore),
-		isReadOnlyRoute(): boolean {
-			return ![
-				VIEWS.WORKFLOW,
-				VIEWS.NEW_WORKFLOW,
-				VIEWS.LOG_STREAMING_SETTINGS,
-				VIEWS.EXECUTION_DEBUG,
-			].includes(this.$route.name as VIEWS);
-		},
-		readOnlyEnv(): boolean {
-			return this.sourceControlStore.preferences.branchReadOnly;
-		},
-	},
-	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 };
-		},
-
-		/**
-		 * @note Loading helpers extracted as composable in useLoadingService
-		 */
-
-		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;
-			}
-		},
-		isRedirectSafe() {
-			const redirect = this.getRedirectQueryParameter();
-			return redirect.startsWith('/');
-		},
-		getRedirectQueryParameter() {
-			let redirect = '';
-			if (typeof this.$route.query.redirect === 'string') {
-				redirect = decodeURIComponent(this.$route.query.redirect);
-			}
-			return redirect;
-		},
-	},
-});
diff --git a/packages/editor-ui/src/mixins/moveNodeWorkflow.ts b/packages/editor-ui/src/mixins/moveNodeWorkflow.ts
index 2b2edb2d78..8e91af0ab0 100644
--- a/packages/editor-ui/src/mixins/moveNodeWorkflow.ts
+++ b/packages/editor-ui/src/mixins/moveNodeWorkflow.ts
@@ -1,12 +1,11 @@
 import { defineComponent } from 'vue';
 import { mapStores } from 'pinia';
 
-import { deviceSupportHelpers } from '@/mixins/deviceSupportHelpers';
 import { getMousePosition } from '@/utils/nodeViewUtils';
 import { useUIStore } from '@/stores/ui.store';
+import { useDeviceSupport } from 'n8n-design-system';
 
 export const moveNodeWorkflow = defineComponent({
-	mixins: [deviceSupportHelpers],
 	data() {
 		return {
 			moveLastPosition: [0, 0],
@@ -30,7 +29,9 @@ export const moveNodeWorkflow = defineComponent({
 			this.moveLastPosition[1] = y;
 		},
 		mouseDownMoveWorkflow(e: MouseEvent, moveButtonPressed: boolean) {
-			if (this.isCtrlKeyPressed(e) === false && !moveButtonPressed) {
+			const deviceSupport = useDeviceSupport();
+
+			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;
@@ -55,7 +56,7 @@ export const moveNodeWorkflow = defineComponent({
 			this.$el.addEventListener('mousemove', this.mouseMoveNodeWorkflow);
 		},
 		mouseUpMoveWorkflow(e: MouseEvent) {
-			if (this.uiStore.nodeViewMoveInProgress === false) {
+			if (!this.uiStore.nodeViewMoveInProgress) {
 				// If it is not active return directly.
 				// Else normal node dragging will not work.
 				return;
diff --git a/packages/editor-ui/src/mixins/newVersions.ts b/packages/editor-ui/src/mixins/newVersions.ts
deleted file mode 100644
index 0b865263f5..0000000000
--- a/packages/editor-ui/src/mixins/newVersions.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-import { defineComponent } from 'vue';
-import { useToast } from '@/composables';
-import { VERSIONS_MODAL_KEY } from '@/constants';
-import { mapStores } from 'pinia';
-import { useUIStore } from '@/stores/ui.store';
-import { useVersionsStore } from '@/stores/versions.store';
-
-export const newVersions = defineComponent({
-	setup() {
-		return {
-			...useToast(),
-		};
-	},
-	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 d7a1fba092..6d9193250c 100644
--- a/packages/editor-ui/src/mixins/nodeBase.ts
+++ b/packages/editor-ui/src/mixins/nodeBase.ts
@@ -3,7 +3,6 @@ import type { PropType } from 'vue';
 import { mapStores } from 'pinia';
 
 import type { INodeUi } from '@/Interface';
-import { deviceSupportHelpers } from '@/mixins/deviceSupportHelpers';
 import {
 	NO_OP_NODE_TYPE,
 	NODE_CONNECTION_TYPE_ALLOW_MULTIPLE,
@@ -17,6 +16,7 @@ import type {
 	INodeInputConfiguration,
 	INodeTypeDescription,
 	INodeOutputConfiguration,
+	Workflow,
 } from 'n8n-workflow';
 import { useUIStore } from '@/stores/ui.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
@@ -27,6 +27,7 @@ import * as NodeViewUtils from '@/utils/nodeViewUtils';
 import { useHistoryStore } from '@/stores/history.store';
 import { useCanvasStore } from '@/stores/canvas.store';
 import type { EndpointSpec } from '@jsplumb/common';
+import { useDeviceSupport } from 'n8n-design-system';
 
 const createAddInputEndpointSpec = (
 	connectionName: NodeConnectionType,
@@ -55,7 +56,12 @@ const createDiamondOutputEndpointSpec = (): EndpointSpec => ({
 });
 
 export const nodeBase = defineComponent({
-	mixins: [deviceSupportHelpers],
+	data() {
+		return {
+			inputs: [] as Array<ConnectionTypes | INodeInputConfiguration>,
+			outputs: [] as Array<ConnectionTypes | INodeOutputConfiguration>,
+		};
+	},
 	mounted() {
 		// Initialize the node
 		if (this.data !== null) {
@@ -67,12 +73,6 @@ export const nodeBase = defineComponent({
 			}
 		}
 	},
-	data() {
-		return {
-			inputs: [] as Array<ConnectionTypes | INodeInputConfiguration>,
-			outputs: [] as Array<ConnectionTypes | INodeOutputConfiguration>,
-		};
-	},
 	computed: {
 		...mapStores(useNodeTypesStore, useUIStore, useCanvasStore, useWorkflowsStore, useHistoryStore),
 		data(): INodeUi | null {
@@ -85,6 +85,7 @@ export const nodeBase = defineComponent({
 	props: {
 		name: {
 			type: String,
+			required: true,
 		},
 		instance: {
 			type: Object as PropType<BrowserJsPlumbInstance>,
@@ -104,6 +105,10 @@ export const nodeBase = defineComponent({
 		showCustomTooltip: {
 			type: Boolean,
 		},
+		workflow: {
+			type: Object as () => Workflow,
+			required: true,
+		},
 	},
 	methods: {
 		__addEndpointTestingData(endpoint: Endpoint, type: string, inputIndex: number) {
@@ -123,9 +128,8 @@ export const nodeBase = defineComponent({
 				[key: string]: number;
 			} = {};
 
-			const workflow = this.workflowsStore.getCurrentWorkflow();
 			const inputs: Array<ConnectionTypes | INodeInputConfiguration> =
-				NodeHelpers.getNodeInputs(workflow, this.data!, nodeTypeData) || [];
+				NodeHelpers.getNodeInputs(this.workflow, this.data!, nodeTypeData) || [];
 			this.inputs = inputs;
 
 			const sortedInputs = [...inputs];
@@ -338,14 +342,13 @@ export const nodeBase = defineComponent({
 				[key: string]: number;
 			} = {};
 
-			const workflow = this.workflowsStore.getCurrentWorkflow();
-			const outputs = NodeHelpers.getNodeOutputs(workflow, this.data, nodeTypeData) || [];
-			this.outputs = outputs;
+			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
-
-			outputs.forEach((value, i) => {
+			let maxLabelLength = 0;
+			const outputConfigurations: INodeOutputConfiguration[] = [];
+			this.outputs.forEach((value, i) => {
 				let outputConfiguration: INodeOutputConfiguration;
 				if (typeof value === 'string') {
 					outputConfiguration = {
@@ -354,6 +357,24 @@ export const nodeBase = defineComponent({
 				} 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 = maxLabelLength < 4 ? 'short' : 'medium';
+
+			this.outputs.forEach((value, i) => {
+				const outputConfiguration = outputConfigurations[i];
 
 				const outputName: ConnectionTypes = outputConfiguration.type;
 
@@ -376,7 +397,7 @@ export const nodeBase = defineComponent({
 				const rootTypeIndex = rootTypeIndexData[rootCategoryOutputName];
 				const typeIndex = typeIndexData[outputName];
 
-				const outputsOfSameRootType = outputs.filter((outputData) => {
+				const outputsOfSameRootType = this.outputs.filter((outputData) => {
 					const thisOutputName: string =
 						typeof outputData === 'string' ? outputData : outputData.type;
 					return outputName === NodeConnectionType.Main
@@ -417,7 +438,7 @@ export const nodeBase = defineComponent({
 					hoverClass: 'dot-output-endpoint-hover',
 					connectionsDirected: true,
 					dragAllowedWhenFull: false,
-					...this.__getOutputConnectionStyle(outputName, nodeTypeData),
+					...this.__getOutputConnectionStyle(outputName, outputConfiguration, nodeTypeData),
 				};
 
 				const endpoint = this.instance.addEndpoint(
@@ -426,11 +447,12 @@ export const nodeBase = defineComponent({
 				);
 
 				this.__addEndpointTestingData(endpoint, 'output', typeIndex);
-				if (outputConfiguration.displayName || nodeTypeData.outputNames?.[i]) {
+				if (outputConfiguration.displayName) {
 					// Apply output names if they got set
 					const overlaySpec = NodeViewUtils.getOutputNameOverlay(
-						outputConfiguration.displayName || nodeTypeData.outputNames[i],
+						outputConfiguration.displayName,
 						outputName,
+						outputConfiguration?.category,
 					);
 					endpoint.addOverlay(overlaySpec);
 				}
@@ -441,7 +463,7 @@ export const nodeBase = defineComponent({
 						nodeId: this.nodeId,
 						index: typeIndex,
 						totalEndpoints: outputsOfSameRootType.length,
-						nodeType: node.type,
+						endpointLabelLength,
 					};
 				}
 
@@ -455,9 +477,9 @@ export const nodeBase = defineComponent({
 							options: {
 								dimensions: 24,
 								connectedEndpoint: endpoint,
-								showOutputLabel: outputs.length === 1,
-								size: outputs.length >= 3 ? 'small' : 'medium',
-								nodeType: node.type,
+								showOutputLabel: this.outputs.length === 1,
+								size: this.outputs.length >= 3 ? 'small' : 'medium',
+								endpointLabelLength,
 								hoverMessage: this.$locale.baseText('nodeBase.clickToAddNodeOrDragToConnect'),
 							},
 						},
@@ -475,10 +497,16 @@ export const nodeBase = defineComponent({
 							nodeId: this.nodeId,
 							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,
@@ -538,6 +566,7 @@ export const nodeBase = defineComponent({
 		},
 		__getOutputConnectionStyle(
 			connectionType: ConnectionTypes,
+			outputConfiguration: INodeOutputConfiguration,
 			nodeTypeData: INodeTypeDescription,
 		): EndpointOptions {
 			const type = 'output';
@@ -557,6 +586,18 @@ export const nodeBase = defineComponent({
 			});
 
 			if (connectionType === NodeConnectionType.Main) {
+				if (outputConfiguration.category === 'error') {
+					return {
+						paintStyle: {
+							...NodeViewUtils.getOutputEndpointStyle(
+								nodeTypeData,
+								this.__getEndpointColor(NodeConnectionType.Main),
+							),
+							fill: 'var(--node-error-output-color)',
+						},
+						cssClass: `dot-${type}-endpoint`,
+					};
+				}
 				return {
 					paintStyle: NodeViewUtils.getOutputEndpointStyle(
 						nodeTypeData,
@@ -573,13 +614,16 @@ export const nodeBase = defineComponent({
 			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++) {
@@ -592,11 +636,11 @@ export const nodeBase = defineComponent({
 				}
 			}
 
-			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 1a9a11e815..0000000000
--- a/packages/editor-ui/src/mixins/nodeHelpers.ts
+++ /dev/null
@@ -1,726 +0,0 @@
-import { EnableNodeToggleCommand } from './../models/history';
-import { useHistoryStore } from '@/stores/history.store';
-import { PLACEHOLDER_FILLED_AT_EXECUTION_TIME, CUSTOM_API_CALL_KEY } from '@/constants';
-
-import type {
-	ConnectionTypes,
-	IBinaryKeyData,
-	ICredentialType,
-	INodeCredentialDescription,
-	INodeCredentialsDetails,
-	INodeExecutionData,
-	INodeIssues,
-	INodeIssueObjectProperty,
-	INodeParameters,
-	INodeProperties,
-	INodeTypeDescription,
-	IRunData,
-	ITaskDataConnections,
-	INode,
-	INodePropertyOptions,
-	IDataObject,
-	Workflow,
-	INodeInputConfiguration,
-} from 'n8n-workflow';
-import { NodeHelpers, ExpressionEvaluatorProxy, NodeConnectionType } from 'n8n-workflow';
-
-import type {
-	ICredentialsResponse,
-	INodeUi,
-	INodeUpdatePropertiesInformation,
-	IUser,
-	NodePanelType,
-} from '@/Interface';
-
-import { get } from 'lodash-es';
-
-import { isObjectLiteral } from '@/utils';
-import { getCredentialPermissions } from '@/permissions';
-import { mapStores } from 'pinia';
-import { useSettingsStore } from '@/stores/settings.store';
-import { useUsersStore } from '@/stores/users.store';
-import { useWorkflowsStore } from '@/stores/workflows.store';
-import { useRootStore } from '@/stores';
-import { useNodeTypesStore } from '@/stores/nodeTypes.store';
-import { useCredentialsStore } from '@/stores/credentials.store';
-import { defineComponent } from 'vue';
-
-export const nodeHelpers = defineComponent({
-	computed: {
-		...mapStores(
-			useCredentialsStore,
-			useHistoryStore,
-			useNodeTypesStore,
-			useSettingsStore,
-			useWorkflowsStore,
-			useUsersStore,
-			useRootStore,
-		),
-	},
-	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);
-		},
-
-		// Updates all the issues on all the nodes
-		refreshNodeIssues(): void {
-			const nodes = this.workflowsStore.allNodes;
-			let nodeType: INodeTypeDescription | null;
-			let foundNodeIssues: INodeIssues | null;
-
-			nodes.forEach((node) => {
-				if (node.disabled === true) {
-					return;
-				}
-				nodeType = this.nodeTypesStore.getNodeType(node.type, node.typeVersion);
-				foundNodeIssues = this.getNodeIssues(nodeType, node);
-				if (foundNodeIssues !== null) {
-					node.issues = foundNodeIssues;
-				}
-			});
-		},
-
-		// 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);
-					}
-				}
-
-				const workflow = this.workflowsStore.getCurrentWorkflow();
-				const nodeInputIssues = this.getNodeInputIssues(workflow, node, nodeType);
-				if (nodeIssues === null) {
-					nodeIssues = nodeInputIssues;
-				} else {
-					NodeHelpers.mergeIssues(nodeIssues, nodeInputIssues);
-				}
-			}
-
-			if (this.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
-		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,
-							},
-						}),
-					],
-				},
-			};
-		},
-
-		updateNodesInputIssues() {
-			const nodes = this.workflowsStore.allNodes;
-			const workflow = this.workflowsStore.getCurrentWorkflow();
-
-			for (const node of nodes) {
-				const nodeType = this.nodeTypesStore.getNodeType(node.type, node.typeVersion);
-				if (!nodeType) {
-					return;
-				}
-				const nodeInputIssues = this.getNodeInputIssues(workflow, node, nodeType);
-
-				this.workflowsStore.setNodeIssue({
-					node: node.name,
-					type: 'input',
-					value: nodeInputIssues?.input ? nodeInputIssues.input : null,
-				});
-			}
-		},
-
-		// 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,
-				});
-			}
-		},
-
-		updateNodeCredentialIssuesByName(name: string): void {
-			const node = this.workflowsStore.getNodeByName(name);
-
-			if (node) {
-				this.updateNodeCredentialIssues(node);
-			}
-		},
-
-		// 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,
-			});
-		},
-
-		updateNodeParameterIssuesByName(name: string): void {
-			const node = this.workflowsStore.getNodeByName(name);
-
-			if (node) {
-				this.updateNodeParameterIssues(node);
-			}
-		},
-
-		// 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 input-issues of the node
-		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] = [
-						this.$locale.baseText('nodeIssues.input.missing', {
-							interpolate: { inputName: input.displayName || input.type },
-						}),
-					];
-				}
-			});
-
-			if (Object.keys(foundIssues).length) {
-				return {
-					input: foundIssues,
-				};
-			}
-
-			return null;
-		},
-
-		// 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 | 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 = this.credentialsStore.getCredentialTypeByName(genericAuthType);
-				return credential ? this.reportUnsetCredential(credential) : null;
-			}
-
-			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 credential ? this.reportUnsetCredential(credential) : null;
-				}
-			}
-
-			if (
-				this.hasProxyAuth(node) &&
-				authentication === 'predefinedCredentialType' &&
-				nodeCredentialType !== '' &&
-				selectedCredsAreUnusable(node, nodeCredentialType)
-			) {
-				const credential = this.credentialsStore.getCredentialTypeByName(nodeCredentialType);
-				return credential ? this.reportUnsetCredential(credential) : null;
-			}
-
-			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?.[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];
-					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 isInstanceOwner = this.usersStore.isInstanceOwner;
-						const isCredentialUsedInWorkflow =
-							this.workflowsStore.usedCredentials?.[selectedCredentials.id as string];
-
-						if (!isCredentialUsedInWorkflow && !isInstanceOwner) {
-							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,
-			paneType: NodePanelType = 'output',
-			connectionType: ConnectionTypes = NodeConnectionType.Main,
-		): INodeExecutionData[] {
-			if (node === null) {
-				return [];
-			}
-			if (this.workflowsStore.getWorkflowExecution === null) {
-				return [];
-			}
-
-			const executionData = this.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 this.getInputData(data, outputIndex, connectionType);
-		},
-
-		// Returns the data of the main input
-		getInputData(
-			connectionsData: ITaskDataConnections,
-			outputIndex: number,
-			connectionType: ConnectionTypes = NodeConnectionType.Main,
-		): INodeExecutionData[] {
-			if (
-				!connectionsData ||
-				!connectionsData.hasOwnProperty(connectionType) ||
-				connectionsData[connectionType] === undefined ||
-				connectionsData[connectionType].length < outputIndex ||
-				connectionsData[connectionType][outputIndex] === null
-			) {
-				return [];
-			}
-			return connectionsData[connectionType][outputIndex] as INodeExecutionData[];
-		},
-
-		// Returns all the binary data of all the entries
-		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;
-
-			if (!runData?.[node]?.[runIndex]?.data) {
-				return [];
-			}
-
-			const inputData = this.getInputData(
-				runData[node][runIndex].data!,
-				outputIndex,
-				connectionType,
-			);
-
-			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);
-				this.updateNodesInputIssues();
-				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) {
-				try {
-					ExpressionEvaluatorProxy.setEvaluator(
-						useSettingsStore().settings.expressions?.evaluator ?? 'tmpl',
-					);
-					return workflow.expression.getSimpleParameterValue(
-						data as INode,
-						nodeType.subtitle,
-						'internal',
-						this.rootStore.timezone,
-						{},
-						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: 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 7191bb0590..0000000000
--- a/packages/editor-ui/src/mixins/pinData.ts
+++ /dev/null
@@ -1,104 +0,0 @@
-import { defineComponent } 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.store';
-import { useToast } from '@/composables';
-
-export interface IPinDataContext {
-	node: INodeUi;
-	nodeType: INodeTypeDescription;
-	$showError(error: Error, title: string): void;
-}
-
-export const pinData = defineComponent({
-	setup() {
-		return {
-			...useToast(),
-		};
-	},
-	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
index 44f2b5f2a5..86d2cb2d2a 100644
--- a/packages/editor-ui/src/mixins/pushConnection.ts
+++ b/packages/editor-ui/src/mixins/pushConnection.ts
@@ -5,9 +5,9 @@ import type {
 	IPushDataExecutionFinished,
 } from '@/Interface';
 
-import { externalHooks } from '@/mixins/externalHooks';
-import { nodeHelpers } from '@/mixins/nodeHelpers';
-import { useTitleChange, useToast } from '@/composables';
+import { useNodeHelpers } from '@/composables/useNodeHelpers';
+import { useTitleChange } from '@/composables/useTitleChange';
+import { useToast } from '@/composables/useToast';
 import { workflowHelpers } from '@/mixins/workflowHelpers';
 
 import type {
@@ -19,11 +19,12 @@ import type {
 	IWorkflowBase,
 	SubworkflowOperationError,
 	IExecuteContextData,
+	NodeOperationError,
 } from 'n8n-workflow';
 import { TelemetryHelpers } from 'n8n-workflow';
 
 import { WORKFLOW_SETTINGS_MODAL_KEY } from '@/constants';
-import { getTriggerNodeServiceName } from '@/utils';
+import { getTriggerNodeServiceName } from '@/utils/nodeTypesUtils';
 import { codeNodeEditorEventBus, globalLinkActionsEventBus } from '@/event-bus';
 import { mapStores } from 'pinia';
 import { useUIStore } from '@/stores/ui.store';
@@ -34,25 +35,37 @@ import { useSettingsStore } from '@/stores/settings.store';
 import { parse } from 'flatted';
 import { useSegment } from '@/stores/segment.store';
 import { defineComponent } 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';
 
 export const pushConnection = defineComponent({
+	mixins: [workflowHelpers],
 	setup() {
 		return {
 			...useTitleChange(),
 			...useToast(),
+			nodeHelpers: useNodeHelpers(),
 		};
 	},
-	mixins: [externalHooks, nodeHelpers, workflowHelpers],
 	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,
+			pushMessageQueue: [] as Array<{ message: IPushData; retriesLeft: number }>,
+			removeEventListener: null as (() => void) | null,
 		};
 	},
+	created() {
+		this.removeEventListener = this.pushStore.addEventListener((message) => {
+			void this.pushMessageReceived(message);
+		});
+	},
+	unmounted() {
+		if (typeof this.removeEventListener === 'function') {
+			this.removeEventListener();
+		}
+	},
 	computed: {
 		...mapStores(
 			useCredentialsStore,
@@ -61,92 +74,23 @@ export const pushConnection = defineComponent({
 			useWorkflowsStore,
 			useSettingsStore,
 			useSegment,
+			useOrchestrationStore,
+			usePushConnectionStore,
+			useCollaborationStore,
 		),
 		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 * 2000, 8000), // maximum 8 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 });
+		queuePushMessage(event: IPushData, retryAttempts: number) {
+			this.pushMessageQueue.push({ message: event, retriesLeft: retryAttempts });
 
 			if (this.retryTimeout === null) {
 				this.retryTimeout = setTimeout(this.processWaitingPushMessages, 20);
@@ -156,7 +100,7 @@ export const pushConnection = defineComponent({
 		/**
 		 * Process the push messages which are waiting in the queue
 		 */
-		processWaitingPushMessages() {
+		async processWaitingPushMessages() {
 			if (this.retryTimeout !== null) {
 				clearTimeout(this.retryTimeout);
 				this.retryTimeout = null;
@@ -166,7 +110,8 @@ export const pushConnection = defineComponent({
 			for (let i = 0; i < queueLength; i++) {
 				const messageData = this.pushMessageQueue.shift();
 
-				if (this.pushMessageReceived(messageData!.event, true) === false) {
+				const result = await this.pushMessageReceived(messageData!.message, true);
+				if (!result) {
 					// Was not successful
 					messageData!.retriesLeft -= 1;
 
@@ -186,14 +131,13 @@ export const pushConnection = defineComponent({
 		/**
 		 * Process a newly received message
 		 */
-		async pushMessageReceived(event: Event, isRetry?: boolean): Promise<boolean> {
+		async pushMessageReceived(receivedData: IPushData, 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 === 'sendWorkerStatusMessage') {
+				const pushData = receivedData.data;
+				this.orchestrationManagerStore.updateWorkerStatus(pushData.status);
+				return true;
 			}
 
 			if (receivedData.type === 'sendConsoleMessage') {
@@ -209,7 +153,7 @@ export const pushConnection = defineComponent({
 			) {
 				// If there are already messages in the queue add the new one that all of them
 				// get executed in order
-				this.queuePushMessage(event, retryAttempts);
+				this.queuePushMessage(receivedData, retryAttempts);
 				return false;
 			}
 
@@ -280,11 +224,38 @@ export const pushConnection = defineComponent({
 				}
 			}
 
+			if (
+				receivedData.type === 'workflowFailedToActivate' &&
+				this.workflowsStore.workflowId === receivedData.data.workflowId
+			) {
+				this.workflowsStore.setWorkflowInactive(receivedData.data.workflowId);
+				this.workflowsStore.setActive(false);
+
+				this.showError(
+					new Error(receivedData.data.errorMessage),
+					this.$locale.baseText('workflowActivator.showError.title', {
+						interpolate: { newStateName: 'activated' },
+					}) + ':',
+				);
+
+				return true;
+			}
+
+			if (receivedData.type === 'workflowActivated') {
+				this.workflowsStore.setWorkflowActive(receivedData.data.workflowId);
+				return true;
+			}
+
+			if (receivedData.type === 'workflowDeactivated') {
+				this.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 as IPushDataExecutionFinished;
+					pushData = recoveredPushData;
 				} else {
 					pushData = receivedData.data as IPushDataExecutionFinished;
 				}
@@ -310,7 +281,8 @@ export const pushConnection = defineComponent({
 					return false;
 				}
 
-				if (this.workflowsStore.activeExecutionId !== pushData.executionId) {
+				const { activeExecutionId } = this.workflowsStore;
+				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) {
@@ -323,18 +295,20 @@ export const pushConnection = defineComponent({
 
 				let runDataExecutedErrorMessage = this.getExecutionError(runDataExecuted.data);
 
-				if (pushData.data.status === 'crashed') {
+				if (runDataExecuted.status === 'crashed') {
 					runDataExecutedErrorMessage = this.$locale.baseText(
 						'pushConnection.executionFailed.message',
 					);
+				} else if (runDataExecuted.status === 'canceled') {
+					runDataExecutedErrorMessage = this.$locale.baseText(
+						'executionsList.showMessage.stopExecution.message',
+						{
+							interpolate: { activeExecutionId },
+						},
+					);
 				}
 
-				const lineNumber =
-					runDataExecuted &&
-					runDataExecuted.data &&
-					runDataExecuted.data.resultData &&
-					runDataExecuted.data.resultData.error &&
-					runDataExecuted.data.resultData.error.lineNumber;
+				const lineNumber = runDataExecuted?.data?.resultData?.error?.lineNumber;
 
 				codeNodeEditorEventBus.emit('error-line-number', lineNumber || 'final');
 
@@ -413,7 +387,9 @@ export const pushConnection = defineComponent({
 								}
 							}
 
-							this.$telemetry.track('Instance FE emitted paired item error', eventData);
+							this.$telemetry.track('Instance FE emitted paired item error', eventData, {
+								withPostHog: true,
+							});
 						});
 					}
 
@@ -428,38 +404,73 @@ export const pushConnection = defineComponent({
 							type: 'error',
 							duration: 0,
 						});
-					} else {
+					} 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;
-						if (runDataExecuted.data.resultData.lastNodeExecuted) {
-							title = `Problem in node ‘${runDataExecuted.data.resultData.lastNodeExecuted}‘`;
+						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';
 						}
 
 						this.showMessage({
 							title,
-							message: runDataExecutedErrorMessage,
+							message:
+								(nodeError?.description ?? runDataExecutedErrorMessage) +
+								this.$locale.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) {
+							this.showMessage({
+								title: this.$locale.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';
+							}
+
+							this.showMessage({
+								title,
+								message: runDataExecutedErrorMessage,
+								type: 'error',
+								duration: 0,
+								dangerouslyUseHTMLString: true,
+							});
+						}
 					}
 				} else {
 					// Workflow did execute without a problem
 					this.titleSet(workflow.name as string, 'IDLE');
 
 					const execution = this.workflowsStore.getWorkflowExecution;
-					if (execution && execution.executedNode) {
+					if (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 (nodeType && nodeType.polling && !nodeOutput) {
+							execution.data?.resultData?.runData?.[execution.executedNode];
+						if (nodeType?.polling && !nodeOutput) {
 							this.showMessage({
 								title: this.$locale.baseText('pushConnection.pollingNode.dataNotFound', {
 									interpolate: {
@@ -500,22 +511,21 @@ export const pushConnection = defineComponent({
 
 				// 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();
+				this.nodeHelpers.updateNodesExecutionIssues();
 
 				const lastNodeExecuted: string | undefined =
 					runDataExecuted.data.resultData.lastNodeExecuted;
 				let itemsCount = 0;
 				if (
 					lastNodeExecuted &&
-					runDataExecuted.data.resultData.runData[lastNodeExecuted as string] &&
+					runDataExecuted.data.resultData.runData[lastNodeExecuted] &&
 					!runDataExecutedErrorMessage
 				) {
 					itemsCount =
-						runDataExecuted.data.resultData.runData[lastNodeExecuted as string][0].data!.main[0]!
-							.length;
+						runDataExecuted.data.resultData.runData[lastNodeExecuted][0].data!.main[0]!.length;
 				}
 
-				void this.$externalHooks().run('pushConnection.executionFinished', {
+				void useExternalHooks().run('pushConnection.executionFinished', {
 					itemsCount,
 					nodeName: runDataExecuted.data.resultData.lastNodeExecuted,
 					errorMessage: runDataExecutedErrorMessage,
@@ -565,7 +575,7 @@ export const pushConnection = defineComponent({
 					this.workflowsStore.activeExecutionId = pushData.executionId;
 				}
 
-				this.processWaitingPushMessages();
+				void this.processWaitingPushMessages();
 			} else if (receivedData.type === 'reloadNodeType') {
 				await this.nodeTypesStore.getNodeTypes();
 				await this.nodeTypesStore.getFullNodesProperties([receivedData.data]);
@@ -596,7 +606,7 @@ export const pushConnection = defineComponent({
 					interpolate: { error: '!' },
 				});
 
-				if (error && error.message) {
+				if (error?.message) {
 					let nodeName: string | undefined;
 					if ('node' in error) {
 						nodeName = typeof error.node === 'string' ? error.node : error.node!.name;
diff --git a/packages/editor-ui/src/mixins/userHelpers.ts b/packages/editor-ui/src/mixins/userHelpers.ts
index 01d2e02551..b45bd676b1 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.store';
 import { defineComponent } from 'vue';
 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 {
+		canUserAccessRouteByName(name: string) {
 			const route = this.$router.resolve({ name });
 
 			return this.canUserAccessRoute(route);
 		},
 
-		canUserAccessCurrentRoute(): boolean {
+		canUserAccessCurrentRoute() {
 			return this.canUserAccessRoute(this.$route);
 		},
 
-		canUserAccessRoute(route: RouteLocation): 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 9dd68c88eb..30233a9fe2 100644
--- a/packages/editor-ui/src/mixins/workflowActivate.ts
+++ b/packages/editor-ui/src/mixins/workflowActivate.ts
@@ -1,9 +1,9 @@
 import { defineComponent } from 'vue';
 import { mapStores } from 'pinia';
+import { useStorage } from '@/composables/useStorage';
 
-import { externalHooks } from '@/mixins/externalHooks';
 import { workflowHelpers } from '@/mixins/workflowHelpers';
-import { useToast } from '@/composables';
+import { useToast } from '@/composables/useToast';
 
 import {
 	LOCAL_STORAGE_ACTIVATION_FLAG,
@@ -13,9 +13,10 @@ import {
 import { useUIStore } from '@/stores/ui.store';
 import { useSettingsStore } from '@/stores/settings.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
+import { useExternalHooks } from '@/composables/useExternalHooks';
 
 export const workflowActivate = defineComponent({
-	mixins: [externalHooks, workflowHelpers],
+	mixins: [workflowHelpers],
 	setup() {
 		return {
 			...useToast(),
@@ -40,7 +41,7 @@ export const workflowActivate = defineComponent({
 			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) {
@@ -49,7 +50,7 @@ export const workflowActivate = defineComponent({
 					this.updatingWorkflowActivation = false;
 					return;
 				}
-				currWorkflowId = this.workflowsStore.workflowId as string;
+				currWorkflowId = this.workflowsStore.workflowId;
 			}
 			const isCurrentWorkflow = currWorkflowId === this.workflowsStore.workflowId;
 
@@ -63,7 +64,7 @@ export const workflowActivate = defineComponent({
 				ndv_input: telemetrySource === 'ndv',
 			};
 			this.$telemetry.track('User set workflow active status', telemetryPayload);
-			void this.$externalHooks().run('workflowActivate.updateWorkflowActivation', telemetryPayload);
+			void useExternalHooks().run('workflowActivate.updateWorkflowActivation', telemetryPayload);
 
 			try {
 				if (isWorkflowActive && newActiveState) {
@@ -76,7 +77,7 @@ export const workflowActivate = defineComponent({
 					return;
 				}
 
-				if (isCurrentWorkflow && nodesIssuesExist && newActiveState === true) {
+				if (isCurrentWorkflow && nodesIssuesExist && newActiveState) {
 					this.showMessage({
 						title: this.$locale.baseText(
 							'workflowActivator.showMessage.activeChangedNodesIssuesExistTrue.title',
@@ -96,7 +97,7 @@ export const workflowActivate = defineComponent({
 					!this.uiStore.stateIsDirty,
 				);
 			} catch (error) {
-				const newStateName = newActiveState === true ? 'activated' : 'deactivated';
+				const newStateName = newActiveState ? 'activated' : 'deactivated';
 				this.showError(
 					error,
 					this.$locale.baseText('workflowActivator.showError.title', {
@@ -110,7 +111,7 @@ export const workflowActivate = defineComponent({
 			const activationEventName = isCurrentWorkflow
 				? 'workflow.activeChangeCurrent'
 				: 'workflow.activeChange';
-			void this.$externalHooks().run(activationEventName, {
+			void useExternalHooks().run(activationEventName, {
 				workflowId: currWorkflowId,
 				active: newActiveState,
 			});
@@ -119,10 +120,7 @@ export const workflowActivate = defineComponent({
 			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 {
 					await this.settingsStore.fetchPromptsData();
diff --git a/packages/editor-ui/src/mixins/workflowHelpers.ts b/packages/editor-ui/src/mixins/workflowHelpers.ts
index 9a43d70a0a..fbb54621f8 100644
--- a/packages/editor-ui/src/mixins/workflowHelpers.ts
+++ b/packages/editor-ui/src/mixins/workflowHelpers.ts
@@ -1,5 +1,6 @@
 import {
 	EnterpriseEditionFeature,
+	HTTP_REQUEST_NODE_TYPE,
 	MODAL_CONFIRM,
 	PLACEHOLDER_EMPTY_WORKFLOW_ID,
 	PLACEHOLDER_FILLED_AT_EXECUTION_TIME,
@@ -42,14 +43,13 @@ import type {
 	IWorkflowDb,
 	TargetItem,
 	XYPosition,
-} from '../Interface';
+} from '@/Interface';
 
-import { useMessage, useToast } from '@/composables';
-import { externalHooks } from '@/mixins/externalHooks';
-import { genericHelpers } from '@/mixins/genericHelpers';
-import { nodeHelpers } from '@/mixins/nodeHelpers';
+import { useMessage } from '@/composables/useMessage';
+import { useToast } from '@/composables/useToast';
+import { useNodeHelpers } from '@/composables/useNodeHelpers';
 
-import { isEqual } from 'lodash-es';
+import { get, isEqual } from 'lodash-es';
 
 import type { IPermissions } from '@/permissions';
 import { getWorkflowPermissions } from '@/permissions';
@@ -62,9 +62,13 @@ 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';
+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';
 
 export function getParentMainInputNode(workflow: Workflow, node: INode): INode {
 	const nodeType = useNodeTypesStore().getNodeType(node.type);
@@ -164,6 +168,13 @@ export function resolveParameter(
 		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 = {
@@ -184,6 +195,7 @@ export function resolveParameter(
 			id: PLACEHOLDER_FILLED_AT_EXECUTION_TIME,
 			mode: 'test',
 			resumeUrl: PLACEHOLDER_FILLED_AT_EXECUTION_TIME,
+			resumeFormUrl: PLACEHOLDER_FILLED_AT_EXECUTION_TIME,
 		},
 		$vars: useEnvironmentsStore().variablesAsObject,
 
@@ -194,6 +206,16 @@ export function resolveParameter(
 		...opts.additionalKeys,
 	};
 
+	if (activeNode?.type === HTTP_REQUEST_NODE_TYPE) {
+		// Add $response for HTTP Request-Nodes as it is used
+		// in pagination expressions
+		additionalKeys.$response = get(
+			executionData,
+			`data.executionData.contextData['node:${activeNode.name}'].response`,
+			{},
+		);
+	}
+
 	let runIndexCurrent = opts?.targetItem?.runIndex ?? 0;
 	if (
 		opts?.targetItem === undefined &&
@@ -216,7 +238,6 @@ export function resolveParameter(
 		activeNode!.name,
 		_connectionInputData,
 		'manual',
-		useRootStore().timezone,
 		additionalKeys,
 		_executeData,
 		false,
@@ -389,7 +410,7 @@ export function executeData(
 	// Find the parent node which has data
 	for (const parentNodeName of parentNodes) {
 		if (workflowsStore.shouldReplaceInputDataWithPinData) {
-			const parentPinData = workflowsStore.getPinData![parentNodeName];
+			const parentPinData = workflowsStore.pinnedWorkflowData![parentNodeName];
 
 			// populate `executeData` from `pinData`
 
@@ -462,11 +483,13 @@ export function executeData(
 }
 
 export const workflowHelpers = defineComponent({
-	mixins: [externalHooks, nodeHelpers, genericHelpers],
 	setup() {
+		const nodeHelpers = useNodeHelpers();
+
 		return {
 			...useToast(),
 			...useMessage(),
+			nodeHelpers,
 		};
 	},
 	computed: {
@@ -560,7 +583,8 @@ export const workflowHelpers = defineComponent({
 						workflow.nodes[nodeName].disabled !== true &&
 						workflow.nodes[nodeName].type === WEBHOOK_NODE_TYPE
 					) {
-						checkWebhook = [nodeName, ...checkWebhook, ...workflow.getChildNodes(nodeName)];
+						const childNodes = workflow.getChildNodes(nodeName);
+						checkWebhook = [nodeName, ...checkWebhook, ...childNodes];
 					}
 				}
 
@@ -570,8 +594,14 @@ export const workflowHelpers = defineComponent({
 					// 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);
+						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);
+						}
 					}
 				}
 			}
@@ -593,7 +623,9 @@ export const workflowHelpers = defineComponent({
 						typeUnknown: true,
 					};
 				} else {
-					nodeIssues = this.getNodeIssues(nodeType.description, node, ['execution']);
+					nodeIssues = useNodeHelpers().getNodeIssues(nodeType.description, node, workflow, [
+						'execution',
+					]);
 				}
 
 				if (nodeIssues !== null) {
@@ -626,12 +658,13 @@ export const workflowHelpers = defineComponent({
 			const data: IWorkflowData = {
 				name: this.workflowsStore.workflowName,
 				nodes,
-				pinData: this.workflowsStore.getPinData,
+				pinData: this.workflowsStore.pinnedWorkflowData,
 				connections: workflowConnections,
 				active: this.workflowsStore.isWorkflowActive,
 				settings: this.workflowsStore.workflow.settings,
 				tags: this.workflowsStore.workflowTags,
 				versionId: this.workflowsStore.workflow.versionId,
+				meta: this.workflowsStore.workflow.meta,
 			};
 
 			const workflowId = this.workflowsStore.workflowId;
@@ -650,6 +683,7 @@ export const workflowHelpers = defineComponent({
 				'credentials',
 				'disabled',
 				'issues',
+				'onError',
 				'notes',
 				'parameters',
 				'status',
@@ -672,11 +706,18 @@ export const workflowHelpers = defineComponent({
 			const nodeType = this.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,
-					false,
+					isCredentialOnly,
 					false,
 					node,
 				);
@@ -687,7 +728,7 @@ export const workflowHelpers = defineComponent({
 					const saveCredentials: INodeCredentials = {};
 					for (const nodeCredentialTypeName of Object.keys(node.credentials)) {
 						if (
-							this.hasProxyAuth(node) ||
+							useNodeHelpers().hasProxyAuth(node) ||
 							Object.keys(node.parameters).includes('genericAuthType')
 						) {
 							saveCredentials[nodeCredentialTypeName] = node.credentials[nodeCredentialTypeName];
@@ -696,7 +737,7 @@ export const workflowHelpers = defineComponent({
 
 						const credentialTypeDescription = nodeType.credentials
 							// filter out credentials with same name in different node versions
-							.filter((c) => this.displayParameter(node.parameters, c, '', node))
+							.filter((c) => useNodeHelpers().displayParameter(node.parameters, c, '', node))
 							.find((c) => c.name === nodeCredentialTypeName);
 
 						if (credentialTypeDescription === undefined) {
@@ -704,7 +745,14 @@ export const workflowHelpers = defineComponent({
 							continue;
 						}
 
-						if (!this.displayParameter(node.parameters, credentialTypeDescription, '', node)) {
+						if (
+							!useNodeHelpers().displayParameter(
+								node.parameters,
+								credentialTypeDescription,
+								'',
+								node,
+							)
+						) {
 							// Credential should not be displayed so do also not save
 							continue;
 						}
@@ -726,14 +774,16 @@ export const workflowHelpers = defineComponent({
 				}
 			}
 
-			// Save the disabled property and continueOnFail only when is set
+			// 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;
@@ -754,12 +804,16 @@ export const workflowHelpers = defineComponent({
 		},
 
 		getWebhookUrl(webhookData: IWebhookDescription, node: INode, showUrlFor?: string): string {
-			if (webhookData.restartWebhook === true) {
-				return '$execution.resumeUrl';
+			const { isForm, restartWebhook } = webhookData;
+			if (restartWebhook === true) {
+				return isForm ? '$execution.resumeFormUrl' : '$execution.resumeUrl';
 			}
-			let baseUrl = this.rootStore.getWebhookUrl;
+
+			let baseUrl;
 			if (showUrlFor === 'test') {
-				baseUrl = this.rootStore.getWebhookTestUrl;
+				baseUrl = isForm ? this.rootStore.getFormTestUrl : this.rootStore.getWebhookTestUrl;
+			} else {
+				baseUrl = isForm ? this.rootStore.getFormUrl : this.rootStore.getWebhookUrl;
 			}
 
 			const workflowId = this.workflowsStore.workflowId;
@@ -841,12 +895,13 @@ export const workflowHelpers = defineComponent({
 			redirect = true,
 			forceSave = false,
 		): Promise<boolean> {
-			if (this.readOnlyEnv) {
-				return;
+			const readOnlyEnv = useSourceControlStore().preferences.branchReadOnly;
+			if (readOnlyEnv) {
+				return false;
 			}
 
+			const isLoading = useCanvasStore().isLoading;
 			const currentWorkflow = id || this.$route.params.name;
-			const isLoading = this.loadingService !== null;
 
 			if (!currentWorkflow || ['new', PLACEHOLDER_EMPTY_WORKFLOW_ID].includes(currentWorkflow)) {
 				return this.saveAsNewWorkflow({ name, tags }, redirect);
@@ -890,7 +945,7 @@ export const workflowHelpers = defineComponent({
 
 				this.uiStore.stateIsDirty = false;
 				this.uiStore.removeActiveAction('workflowSaving');
-				void this.$externalHooks().run('workflow.afterUpdate', { workflowData });
+				void useExternalHooks().run('workflow.afterUpdate', { workflowData });
 
 				return true;
 			} catch (error) {
@@ -997,9 +1052,8 @@ export const workflowHelpers = defineComponent({
 				const workflowData = await this.workflowsStore.createNewWorkflow(workflowDataRequest);
 
 				this.workflowsStore.addWorkflow(workflowData);
-
 				if (
-					this.settingsStore.isEnterpriseFeatureEnabled(EnterpriseEditionFeature.Sharing) &&
+					useSettingsStore().isEnterpriseFeatureEnabled(EnterpriseEditionFeature.Sharing) &&
 					this.usersStore.currentUser
 				) {
 					this.workflowsEEStore.setWorkflowOwnedBy({
@@ -1055,7 +1109,7 @@ export const workflowHelpers = defineComponent({
 
 				this.uiStore.removeActiveAction('workflowSaving');
 				this.uiStore.stateIsDirty = false;
-				void this.$externalHooks().run('workflow.afterUpdate', { workflowData });
+				void useExternalHooks().run('workflow.afterUpdate', { workflowData });
 
 				getCurrentWorkflow(true); // refresh cache
 				return true;
diff --git a/packages/editor-ui/src/mixins/workflowRun.ts b/packages/editor-ui/src/mixins/workflowRun.ts
index 8a52446e62..58842f6a13 100644
--- a/packages/editor-ui/src/mixins/workflowRun.ts
+++ b/packages/editor-ui/src/mixins/workflowRun.ts
@@ -1,8 +1,14 @@
-import { defineComponent } from 'vue';
-import { mapStores } from 'pinia';
 import type { IExecutionPushResponse, IExecutionResponse, IStartRunData } from '@/Interface';
+import { mapStores } from 'pinia';
+import { defineComponent } from 'vue';
 
-import type { IRunData, IRunExecutionData, ITaskData, IWorkflowBase } from 'n8n-workflow';
+import type {
+	IDataObject,
+	IRunData,
+	IRunExecutionData,
+	ITaskData,
+	IWorkflowBase,
+} from 'n8n-workflow';
 import {
 	NodeHelpers,
 	NodeConnectionType,
@@ -10,23 +16,27 @@ import {
 	FORM_TRIGGER_PATH_IDENTIFIER,
 } from 'n8n-workflow';
 
-import { externalHooks } from '@/mixins/externalHooks';
+import { useToast } from '@/composables/useToast';
+import { useNodeHelpers } from '@/composables/useNodeHelpers';
 import { workflowHelpers } from '@/mixins/workflowHelpers';
-import { useToast } from '@/composables';
 
+import { FORM_TRIGGER_NODE_TYPE, WAIT_NODE_TYPE } 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 { useRootStore } from '@/stores/n8nRoot.store';
-import { FORM_TRIGGER_NODE_TYPE } from '../constants';
 import { openPopUpWindow } from '@/utils/executionUtils';
+import { useExternalHooks } from '@/composables/useExternalHooks';
 
 export const workflowRun = defineComponent({
-	mixins: [externalHooks, workflowHelpers],
+	mixins: [workflowHelpers],
 	setup() {
+		const nodeHelpers = useNodeHelpers();
+
 		return {
 			...useTitleChange(),
 			...useToast(),
+			nodeHelpers,
 		};
 	},
 	computed: {
@@ -83,6 +93,7 @@ export const workflowRun = defineComponent({
 
 			try {
 				// Check first if the workflow has any issues before execute it
+				this.nodeHelpers.refreshNodeIssues();
 				const issuesExist = this.workflowsStore.nodesIssuesExist;
 				if (issuesExist) {
 					// If issues exist get all of the issues of all nodes
@@ -112,7 +123,9 @@ export const workflowRun = defineComponent({
 							};
 
 							for (const nodeIssue of nodeIssues) {
-								errorMessages.push(`<strong>${nodeName}</strong>: ${nodeIssue}`);
+								errorMessages.push(
+									`<a data-action='openNodeDetail' data-action-parameter-node='${nodeName}'>${nodeName}</a>: ${nodeIssue}`,
+								);
 								trackNodeIssue.error = trackNodeIssue.error.concat(', ', nodeIssue);
 							}
 							trackNodeIssues.push(trackNodeIssue);
@@ -125,7 +138,7 @@ export const workflowRun = defineComponent({
 							duration: 0,
 						});
 						this.titleSet(workflow.name as string, 'ERROR');
-						void this.$externalHooks().run('workflowRun.runError', {
+						void useExternalHooks().run('workflowRun.runError', {
 							errorMessages,
 							nodeName: options.destinationNode,
 						});
@@ -262,32 +275,62 @@ export const workflowRun = defineComponent({
 					},
 				};
 				this.workflowsStore.setWorkflowExecutionData(executionData);
-				this.updateNodesExecutionIssues();
+				this.nodeHelpers.updateNodesExecutionIssues();
 
 				const runWorkflowApiResponse = await this.runWorkflowApi(startRunData);
 
-				if (runWorkflowApiResponse.waitingForWebhook) {
-					for (const node of workflowData.nodes) {
-						if (node.type !== FORM_TRIGGER_NODE_TYPE) {
-							continue;
+				for (const node of workflowData.nodes) {
+					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 = `${this.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 = `${this.rootStore.getFormTestUrl}/${webhookPath}`;
 						}
 
 						if (
-							options.destinationNode &&
-							options.destinationNode !== node.name &&
-							!directParentNodes.includes(node.name)
+							node.type === WAIT_NODE_TYPE &&
+							node.parameters.resume === 'form' &&
+							runWorkflowApiResponse.executionId
 						) {
-							continue;
+							const workflowTriggerNodes = workflow.getTriggerNodes().map((node) => node.name);
+
+							const showForm =
+								options.destinationNode === node.name ||
+								directParentNodes.includes(node.name) ||
+								workflowTriggerNodes.some((triggerNode) =>
+									this.workflowsStore.isNodeInOutgoingNodeConnections(triggerNode, node.name),
+								);
+
+							if (!showForm) continue;
+
+							const { webhookSuffix } = (node.parameters.options || {}) as IDataObject;
+							const suffix = webhookSuffix ? `/${webhookSuffix}` : '';
+							testUrl = `${this.rootStore.getFormWaitingUrl}/${runWorkflowApiResponse.executionId}${suffix}`;
 						}
 
-						if (node.name === options.destinationNode || !node.disabled) {
-							const testUrl = `${this.rootStore.getWebhookTestUrl}/${node.webhookId}/${FORM_TRIGGER_PATH_IDENTIFIER}`;
-							openPopUpWindow(testUrl);
-						}
+						if (testUrl) openPopUpWindow(testUrl);
 					}
 				}
 
-				await this.$externalHooks().run('workflowRun.runWorkflow', {
+				await useExternalHooks().run('workflowRun.runWorkflow', {
 					nodeName: options.destinationNode,
 					source: options.source,
 				});
diff --git a/packages/editor-ui/src/models/history.ts b/packages/editor-ui/src/models/history.ts
index 2c94cc0741..4a17048131 100644
--- a/packages/editor-ui/src/models/history.ts
+++ b/packages/editor-ui/src/models/history.ts
@@ -1,6 +1,5 @@
-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 'n8n-design-system/utils';
 
 // Command names don't serve any particular purpose in the app
@@ -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) {
@@ -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) {
@@ -229,6 +232,7 @@ export class EnableNodeToggleCommand extends Command {
 
 export class RenameNodeCommand extends Command {
 	currentName: string;
+
 	newName: string;
 
 	constructor(currentName: string, newName: string) {
diff --git a/packages/editor-ui/src/n8n-theme-variables.scss b/packages/editor-ui/src/n8n-theme-variables.scss
index 356053b621..b2040dba3e 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);
@@ -100,7 +100,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);
 
diff --git a/packages/editor-ui/src/n8n-theme.scss b/packages/editor-ui/src/n8n-theme.scss
index b05f1d20b8..d6bf0f9a81 100644
--- a/packages/editor-ui/src/n8n-theme.scss
+++ b/packages/editor-ui/src/n8n-theme.scss
@@ -1,13 +1,9 @@
+@import '@n8n/chat/css';
+@import 'styles/plugins';
+
 :root {
 	--node-type-background-l: 95%;
-	--node-type-main-color-h: var(--color-foreground-xdark-h);
-	--node-type-main-color-s: var(--color-foreground-xdark-s);
-	--node-type-main-color-l: var(--color-foreground-xdark-l);
-	--node-type-main-color: hsl(
-		var(--node-type-main-color-h),
-		var(--node-type-main-color-s),
-		var(--node-type-main-color-l)
-	);
+
 	--node-type-supplemental-label-color-h: 235;
 	--node-type-supplemental-label-color-s: 28%;
 	--node-type-supplemental-label-color-l: 40%;
@@ -174,6 +170,9 @@
 		var(--node-type-ai_vectorStore-color-s),
 		var(--node-type-background-l)
 	);
+	--node-error-output-color: #991818;
+
+	--chat--spacing: var(--spacing-s);
 }
 
 .clickable {
@@ -187,19 +186,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;
-	margin-top: 15vh;
 
-	@media (max-height: 1050px) {
-		margin: 4em auto !important;
-	}
-
-	@media (max-height: 930px) {
-		margin: 1em auto !important;
-	}
 	&.classic {
 		.el-dialog__header {
 			padding: 15px 20px;
@@ -279,20 +275,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,
@@ -415,6 +397,7 @@
 		&,
 		&: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 04c4bb6c7f..639ced5659 100644
--- a/packages/editor-ui/src/permissions.ts
+++ b/packages/editor-ui/src/permissions.ts
@@ -6,7 +6,13 @@
 
 import type { IUser, ICredentialsResponse, IWorkflowDb } from '@/Interface';
 import { EnterpriseEditionFeature, PLACEHOLDER_EMPTY_WORKFLOW_ID } from '@/constants';
-import { useSettingsStore } from './stores/settings.store';
+import { useSettingsStore } from '@/stores/settings.store';
+import { hasPermission } from './rbac/permissions';
+
+/**
+ * Old permissions implementation
+ * @deprecated
+ */
 
 export const enum UserRole {
 	InstanceOwner = 'isInstanceOwner',
@@ -36,15 +42,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?.isOwner },
+	];
 
-	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;
+		},
+		{},
+	);
 };
 
 /**
@@ -60,30 +71,40 @@ 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) => !!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);
@@ -99,32 +120,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,
+			test: () => !!(isNewWorkflow || workflow?.ownedBy?.id === user?.id) || !isSharingEnabled,
 		},
 		{
-			name: UserRole.ResourceSharee,
-			test: () =>
-				!!(
-					workflow &&
-					workflow.sharedWith &&
-					workflow.sharedWith.find((sharee) => sharee.id === user?.id)
-				),
+			name: 'updateSharing',
+			test: (permissions) =>
+				hasPermission(['rbac'], { rbac: { scope: 'workflow:share' } }) || !!permissions.isOwner,
 		},
 		{
-			name: 'read',
-			test: [UserRole.ResourceOwner, UserRole.InstanceOwner, UserRole.ResourceSharee],
-		},
-		{ 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,
 		},
 	];
 
@@ -133,19 +139,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
index 9693f86cbb..b9faf7489c 100644
--- a/packages/editor-ui/src/plugins/__tests__/telemetry.test.ts
+++ b/packages/editor-ui/src/plugins/__tests__/telemetry.test.ts
@@ -8,6 +8,8 @@ let telemetry: Telemetry;
 
 let settingsStore: ReturnType<typeof useSettingsStore>;
 
+const MOCK_VERSION_CLI = '0.0.0';
+
 describe('telemetry', () => {
 	beforeAll(() => {
 		telemetry = new Telemetry();
@@ -137,4 +139,44 @@ describe('telemetry', () => {
 			expect(resetFunction).toHaveBeenCalledTimes(1);
 		});
 	});
+
+	describe('track function', () => {
+		it('should call Rudderstack track method with correct parameters and', () => {
+			const trackFunction = vi.spyOn(window.rudderanalytics, 'track');
+
+			const event = 'testEvent';
+			const properties = { test: '1' };
+			const options = { withPostHog: false, withAppCues: false };
+
+			telemetry.track(event, properties, options);
+
+			expect(trackFunction).toHaveBeenCalledTimes(1);
+			expect(trackFunction).toHaveBeenCalledWith(event, {
+				...properties,
+				version_cli: MOCK_VERSION_CLI,
+			});
+		});
+
+		it('should call Rudderstack track method with correct parameters and withAppCues option set to true', () => {
+			window.Appcues = { track: () => {} };
+			const trackFunction = vi.spyOn(window.rudderanalytics, 'track');
+			const appCuesTrackFunction = vi.spyOn(window.Appcues, 'track');
+
+			const event = 'testEvent';
+			const properties = { test: '1' };
+			const options = { withPostHog: false, withAppCues: true };
+
+			telemetry.track(event, properties, options);
+
+			expect(trackFunction).toHaveBeenCalledTimes(1);
+			expect(trackFunction).toHaveBeenCalledWith(event, {
+				...properties,
+				version_cli: MOCK_VERSION_CLI,
+			});
+			expect(appCuesTrackFunction).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 0000000000..5b4c2fc5a6
--- /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__/mock.ts b/packages/editor-ui/src/plugins/codemirror/completions/__tests__/mock.ts
index 9616deb087..9e9b371b9a 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/datatype.completions.ts b/packages/editor-ui/src/plugins/codemirror/completions/datatype.completions.ts
index 6d650c9ac9..2a1728a97f 100644
--- a/packages/editor-ui/src/plugins/codemirror/completions/datatype.completions.ts
+++ b/packages/editor-ui/src/plugins/codemirror/completions/datatype.completions.ts
@@ -1,6 +1,5 @@
 import type { IDataObject, DocMetadata, NativeDoc } from 'n8n-workflow';
-import { Expression } from 'n8n-workflow';
-import { ExpressionExtensions, NativeMethods } from 'n8n-workflow';
+import { Expression, ExpressionExtensions, NativeMethods } from 'n8n-workflow';
 import { DateTime } from 'luxon';
 import { i18n } from '@/plugins/i18n';
 import { resolveParameter } from '@/mixins/workflowHelpers';
@@ -18,11 +17,12 @@ import {
 } from './utils';
 import type { Completion, CompletionContext, CompletionResult } from '@codemirror/autocomplete';
 import type { AutocompleteOptionType, ExtensionTypeName, FnToDoc, Resolved } from './types';
-import { sanitizeHtml } from '@/utils';
+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, useExternalSecretsStore } from '@/stores';
+import { useEnvironmentsStore } from '@/stores/environments.ee.store';
+import { useExternalSecretsStore } from '@/stores/externalSecrets.ee.store';
 
 /**
  * Resolution-based completions offered according to datatype.
@@ -196,7 +196,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
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 4ef653f56e..4f5c101d2f 100644
--- a/packages/editor-ui/src/plugins/codemirror/completions/dollar.completions.ts
+++ b/packages/editor-ui/src/plugins/codemirror/completions/dollar.completions.ts
@@ -10,7 +10,7 @@ import {
 	isCredentialsModalOpen,
 } from './utils';
 import type { Completion, CompletionContext, CompletionResult } from '@codemirror/autocomplete';
-import { useExternalSecretsStore } from '@/stores';
+import { useExternalSecretsStore } from '@/stores/externalSecrets.ee.store';
 
 /**
  * Completions offered at the dollar position: `$|`
@@ -47,7 +47,7 @@ export function dollarCompletions(context: CompletionContext): CompletionResult
 export function dollarOptions() {
 	const rank = setRank(['$json', '$input']);
 	const SKIP = new Set();
-	const DOLLAR_FUNCTIONS = ['$jmespath'];
+	const DOLLAR_FUNCTIONS = ['$jmespath', '$ifEmpty'];
 
 	if (isCredentialsModalOpen()) {
 		return useExternalSecretsStore().isEnterpriseExternalSecretsEnabled
diff --git a/packages/editor-ui/src/plugins/codemirror/completions/utils.ts b/packages/editor-ui/src/plugins/codemirror/completions/utils.ts
index edc22a8a74..169f4d7296 100644
--- a/packages/editor-ui/src/plugins/codemirror/completions/utils.ts
+++ b/packages/editor-ui/src/plugins/codemirror/completions/utils.ts
@@ -34,7 +34,7 @@ export function longestCommonPrefix(...strings: string[]) {
 		}
 
 		return acc.slice(0, i);
-	});
+	}, '');
 }
 
 // Process user input if expressions are used as part of complex expression
diff --git a/packages/editor-ui/src/plugins/components.ts b/packages/editor-ui/src/plugins/components.ts
index e5d8d6cde5..7a775322fe 100644
--- a/packages/editor-ui/src/plugins/components.ts
+++ b/packages/editor-ui/src/plugins/components.ts
@@ -2,17 +2,18 @@ import type { Plugin } from 'vue';
 
 import 'regenerator-runtime/runtime';
 
-import ElementPlus from 'element-plus';
-import { ElLoading, ElMessageBox } from 'element-plus';
+import ElementPlus, { ElLoading, ElMessageBox } from 'element-plus';
 import { N8nPlugin } from 'n8n-design-system';
 import { useMessage } from '@/composables/useMessage';
 import EnterpriseEdition from '@/components/EnterpriseEdition.ee.vue';
+import RBAC from '@/components/RBAC.vue';
 
 export const GlobalComponentsPlugin: Plugin<{}> = {
 	install(app) {
 		const messageService = useMessage();
 
-		app.component('enterprise-edition', EnterpriseEdition);
+		app.component('EnterpriseEdition', EnterpriseEdition);
+		app.component('RBAC', RBAC);
 
 		app.use(ElementPlus);
 		app.use(N8nPlugin);
diff --git a/packages/editor-ui/src/plugins/connectors/N8nCustomConnector.ts b/packages/editor-ui/src/plugins/connectors/N8nCustomConnector.ts
index 07f44e50bb..cf0d97793c 100644
--- a/packages/editor-ui/src/plugins/connectors/N8nCustomConnector.ts
+++ b/packages/editor-ui/src/plugins/connectors/N8nCustomConnector.ts
@@ -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,22 +140,37 @@ 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(
@@ -310,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,
@@ -340,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,
 		});
@@ -366,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 {
@@ -494,6 +509,7 @@ export class N8nConnector extends AbstractConnector {
 			}
 		} catch (error) {}
 	}
+
 	/**
 	 * Set target endpoint
 	 * (to override default behavior tracking mouse when dragging mouse)
@@ -502,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/i18n/index.ts b/packages/editor-ui/src/plugins/i18n/index.ts
index 834ed9b594..6b5d1b5f2a 100644
--- a/packages/editor-ui/src/plugins/i18n/index.ts
+++ b/packages/editor-ui/src/plugins/i18n/index.ts
@@ -1,20 +1,20 @@
 import type { Plugin } from 'vue';
 import axios from 'axios';
 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 { 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.store';
-import { useNDVStore } from '@/stores/ndv.store';
-import type { INodeProperties, INodePropertyCollection, INodePropertyOptions } from 'n8n-workflow';
-import { useRootStore } from '@/stores';
 
 export const i18nInstance = createI18n({
 	locale: 'en',
@@ -23,6 +23,8 @@ export const i18nInstance = createI18n({
 });
 
 export class I18nClass {
+	private baseTextCache = new Map<string, string>();
+
 	private get i18n() {
 		return i18nInstance.global;
 	}
@@ -50,11 +52,25 @@ export class I18nClass {
 		key: BaseTextKey,
 		options?: { adjustToNumber?: number; interpolate?: { [key: string]: string } },
 	): string {
-		if (options?.adjustToNumber !== undefined) {
-			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;
 		}
 
-		return this.i18n.t(key, options && options.interpolate).toString();
+		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();
+		}
+
+		// Store the result in the cache
+		this.baseTextCache.set(cacheKey, result);
+
+		return result;
 	}
 
 	/**
@@ -64,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.
@@ -164,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;
 
@@ -328,6 +360,7 @@ export class I18nClass {
 	rootVars: Record<string, string | undefined> = {
 		$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'),
@@ -365,6 +398,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'),
diff --git a/packages/editor-ui/src/plugins/i18n/locales/en.json b/packages/editor-ui/src/plugins/i18n/locales/en.json
index 7e2c183dd7..af5cbe9c4b 100644
--- a/packages/editor-ui/src/plugins/i18n/locales/en.json
+++ b/packages/editor-ui/src/plugins/i18n/locales/en.json
@@ -63,6 +63,8 @@
 	"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",
@@ -93,7 +95,7 @@
 	"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.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",
@@ -103,6 +105,7 @@
 	"auth.password": "Password",
 	"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.next": "Next",
@@ -138,6 +141,8 @@
 	"chat.window.noExecution": "Nothing got executed yet",
 	"chat.window.chat.placeholder": "Type in message",
 	"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",
@@ -156,6 +161,7 @@
 	"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",
@@ -164,10 +170,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",
@@ -413,7 +421,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...",
@@ -608,6 +617,19 @@
 	"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",
@@ -660,6 +682,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",
@@ -671,6 +694,14 @@
 	"genericHelpers.minShort": "m",
 	"genericHelpers.sec": "sec",
 	"genericHelpers.secShort": "s",
+	"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.",
@@ -709,6 +740,7 @@
 	"mainSidebar.workflows": "Workflows",
 	"mainSidebar.workflows.readOnlyEnv.tooltip": "Protected mode is active, so no workflows changes are allowed. Change this in Settings, under 'Source Control'",
 	"mainSidebar.executions": "All executions",
+	"mainSidebar.workersView": "Workers",
 	"menuActions.duplicate": "Duplicate",
 	"menuActions.download": "Download",
 	"menuActions.push": "Push to Git",
@@ -722,12 +754,13 @@
 	"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.testChat": "Test Chat",
 	"ndv.execute.testStep": "Test Step",
 	"ndv.execute.stopListening": "Stop Listening",
 	"ndv.execute.nodeIsDisabled": "Enable node to execute",
@@ -763,7 +796,7 @@
 	"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”.",
@@ -772,9 +805,10 @@
 	"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",
@@ -789,23 +823,25 @@
 	"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",
 	"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.changeColor": "Change color",
 	"node.disabled": "Disabled",
-	"node.duplicateNode": "Duplicate Node",
-	"node.editNode": "Edit Node",
-	"node.executeNode": "Execute Node",
+	"node.testStep": "Test Step",
+	"node.deleteNode": "Delete node",
 	"node.issues": "Issues",
 	"node.nodeIsExecuting": "Node is executing",
 	"node.nodeIsWaitingTill": "Node is waiting until {date} {time}",
@@ -844,7 +880,7 @@
 	"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.",
@@ -863,7 +899,7 @@
 	"nodeCreator.subcategoryNames.dataTransformation": "Data transformation",
 	"nodeCreator.subcategoryNames.files": "Files",
 	"nodeCreator.subcategoryNames.flow": "Flow",
-	"nodeCreator.subcategoryNames.helpers": "Helpers",
+	"nodeCreator.subcategoryNames.helpers": "Advanced",
 	"nodeCreator.subcategoryNames.otherTriggerNodes": "Other ways...",
 	"nodeCreator.subcategoryNames.agents": "Agents",
 	"nodeCreator.subcategoryNames.chains": "Chains",
@@ -877,6 +913,11 @@
 	"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?",
@@ -898,6 +939,7 @@
 	"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 interrogate 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=\"/collections/8\" target=\"_blank\">templates</a> for workflow examples and inspiration.",
@@ -928,6 +970,7 @@
 	"nodeErrorView.dataBelowMayContain": "Data below may contain sensitive information. Proceed with caution when sharing.",
 	"nodeErrorView.details": "Details",
 	"nodeErrorView.error": "ERROR",
+	"nodeErrorView.errorSubNode": "Error in sub-node ‘{node}’",
 	"nodeErrorView.httpCode": "HTTP Code",
 	"nodeErrorView.inParameter": "In or underneath Parameter",
 	"nodeErrorView.itemIndex": "Item Index",
@@ -941,8 +984,14 @@
 	"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",
@@ -971,24 +1020,29 @@
 	"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.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",
@@ -1001,7 +1055,7 @@
 	"nodeView.redirecting": "Redirecting",
 	"nodeView.refresh": "Refresh",
 	"nodeView.resetZoom": "Reset Zoom",
-	"nodeView.runButtonText.executeWorkflow": "Execute Workflow",
+	"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",
@@ -1043,20 +1097,45 @@
 	"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 {subject} | Duplicate {count} {subject}",
+	"contextMenu.open": "Open node...",
+	"contextMenu.test": "Test node",
+	"contextMenu.rename": "Rename node",
+	"contextMenu.copy": "Copy {subject} | Copy {count} {subject}",
+	"contextMenu.deactivate": "Deactivate {subject} | Deactivate {count} {subject}",
+	"contextMenu.activate": "Activate node | Activate {count} nodes",
+	"contextMenu.pin": "Pin node | Pin {count} nodes",
+	"contextMenu.unpin": "Unpin node | Unpin {count} nodes",
+	"contextMenu.delete": "Delete {subject} | 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",
@@ -1181,6 +1260,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.",
@@ -1191,6 +1277,7 @@
 	"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",
@@ -1210,7 +1297,7 @@
 	"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 a 'set' node before this node to change them if required.)",
+	"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}",
@@ -1259,8 +1346,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",
@@ -1291,6 +1380,7 @@
 	"runData.aiContentBlock.tokens.completion": "Completion:",
 	"saveButton.save": "@:_reusableBaseText.save",
 	"saveButton.saved": "Saved",
+	"saveButton.hint": "Save workflow",
 	"saveButton.saving": "Saving",
 	"settings": "Settings",
 	"settings.communityNodes": "Community nodes",
@@ -1400,6 +1490,8 @@
 	"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",
@@ -1428,6 +1520,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",
@@ -1612,6 +1705,8 @@
 	"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",
 	"settings.auditLogs.title": "Audit Logs",
 	"settings.auditLogs.actionBox.title": "Available on the Enterprise plan",
@@ -1671,7 +1766,7 @@
 	"templates.collectionsNotFound": "Collection could not be found",
 	"templates.connectionWarning": "⚠️ There was a problem fetching workflow templates. Check your internet connection.",
 	"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",
@@ -1710,15 +1805,18 @@
 	"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).",
@@ -1730,6 +1828,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",
@@ -1940,7 +2044,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",
@@ -2192,6 +2296,11 @@
 	"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",
@@ -2209,5 +2318,58 @@
 	"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."
+	"executionUsage.ranOutOfExecutions.text": "You’re out of executions. Upgrade your plan to keep automating.",
+	"filter.operatorGroup.basic": "Basic",
+	"filter.operatorGroup.string": "String",
+	"filter.operatorGroup.number": "Number",
+	"filter.operatorGroup.date": "Date & Time",
+	"filter.operatorGroup.boolean": "Boolean",
+	"filter.operatorGroup.array": "Array",
+	"filter.operatorGroup.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",
+	"filter.operator.lte": "is less than or equal",
+	"filter.operator.after": "is after",
+	"filter.operator.before": "is before",
+	"filter.operator.afterOrEquals": "is after or equal",
+	"filter.operator.beforeOrEquals": "is before or equal",
+	"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",
+	"filter.operator.lengthLte": "length less than or equal",
+	"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",
+	"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"
 }
diff --git a/packages/editor-ui/src/plugins/icons/index.ts b/packages/editor-ui/src/plugins/icons/index.ts
index 8ffe9e5dce..338ba2295a 100644
--- a/packages/editor-ui/src/plugins/icons/index.ts
+++ b/packages/editor-ui/src/plugins/icons/index.ts
@@ -94,6 +94,7 @@ import {
 	faMapSigns,
 	faMousePointer,
 	faNetworkWired,
+	faPalette,
 	faPause,
 	faPauseCircle,
 	faPen,
@@ -253,6 +254,7 @@ export const FontAwesomePlugin: Plugin<{}> = {
 		addIcon(faMapSigns);
 		addIcon(faMousePointer);
 		addIcon(faNetworkWired);
+		addIcon(faPalette);
 		addIcon(faPause);
 		addIcon(faPauseCircle);
 		addIcon(faPen);
@@ -314,6 +316,6 @@ export const FontAwesomePlugin: Plugin<{}> = {
 		addIcon(faXmark);
 		addIcon(faDownload);
 
-		app.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 809f2a95fc..0a059f6924 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
index 98884f61e3..54d4d98695 100644
--- a/packages/editor-ui/src/plugins/jsplumb/N8nAddInputEndpointRenderer.ts
+++ b/packages/editor-ui/src/plugins/jsplumb/N8nAddInputEndpointRenderer.ts
@@ -16,7 +16,7 @@ export const register = () => {
 			const sizeDifference = (unconnectedPlusSize - unconnectedDiamondWidth) / 2;
 
 			const container = svg.node('g', {
-				style: `--svg-color: var(${endpointInstance.params.color})`,
+				style: `--svg-color: var(--endpoint-svg-color, var(${endpointInstance.params.color}))`,
 				width,
 				height,
 			});
@@ -70,7 +70,6 @@ export const register = () => {
 			container.appendChild(unconnectedGroup);
 			container.appendChild(defaultGroup);
 
-			endpointInstance.setupOverlays();
 			endpointInstance.setVisible(false);
 
 			return container;
diff --git a/packages/editor-ui/src/plugins/jsplumb/N8nAddInputEndpointType.ts b/packages/editor-ui/src/plugins/jsplumb/N8nAddInputEndpointType.ts
index afd3e5a4ab..4bd54ae486 100644
--- a/packages/editor-ui/src/plugins/jsplumb/N8nAddInputEndpointType.ts
+++ b/packages/editor-ui/src/plugins/jsplumb/N8nAddInputEndpointType.ts
@@ -30,18 +30,25 @@ export class N8nAddInputEndpoint extends EndpointRepresentation<ComputedN8nAddIn
 	}
 
 	static type = N8nAddInputEndpointType;
+
 	type = N8nAddInputEndpoint.type;
 
-	setupOverlays() {
-		this.endpoint.instance.setSuspendDrawing(true);
-		this.endpoint.instance.setSuspendDrawing(false);
-	}
 	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);
diff --git a/packages/editor-ui/src/plugins/jsplumb/N8nPlusEndpointType.ts b/packages/editor-ui/src/plugins/jsplumb/N8nPlusEndpointType.ts
index e7928ee2ed..9af9738f98 100644
--- a/packages/editor-ui/src/plugins/jsplumb/N8nPlusEndpointType.ts
+++ b/packages/editor-ui/src/plugins/jsplumb/N8nPlusEndpointType.ts
@@ -14,7 +14,7 @@ interface N8nPlusEndpointParams extends EndpointRepresentationParams {
 	dimensions: number;
 	connectedEndpoint: Endpoint;
 	hoverMessage: string;
-	nodeType: string;
+	endpointLabelLength: 'small' | 'medium';
 	size: 'small' | 'medium';
 	showOutputLabel: boolean;
 }
@@ -49,13 +49,12 @@ export class N8nPlusEndpoint extends EndpointRepresentation<ComputedN8nPlusEndpo
 
 	setupOverlays() {
 		this.clearOverlays();
-		this.endpoint.instance.setSuspendDrawing(true);
 		this.stalkOverlay = this.endpoint.addOverlay({
 			type: 'Custom',
 			options: {
 				id: PlusStalkOverlay,
 				attributes: {
-					'data-endpoint-node-type': this.params.nodeType,
+					'data-endpoint-label-length': this.params.endpointLabelLength,
 				},
 				create: () => {
 					const stalk = createElement('div', {}, `${PlusStalkOverlay} ${this.params.size}`);
@@ -69,7 +68,7 @@ export class N8nPlusEndpoint extends EndpointRepresentation<ComputedN8nPlusEndpo
 				id: HoverMessageOverlay,
 				location: 0.5,
 				attributes: {
-					'data-endpoint-node-type': this.params.nodeType,
+					'data-endpoint-label-length': this.params.endpointLabelLength,
 				},
 				create: () => {
 					const hoverMessage = createElement('p', {}, `${HoverMessageOverlay} ${this.params.size}`);
@@ -78,7 +77,6 @@ export class N8nPlusEndpoint extends EndpointRepresentation<ComputedN8nPlusEndpo
 				},
 			},
 		});
-		this.endpoint.instance.setSuspendDrawing(false);
 	}
 
 	bindEvents() {
@@ -151,18 +149,14 @@ export class N8nPlusEndpoint extends EndpointRepresentation<ComputedN8nPlusEndpo
 	}
 
 	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) {
@@ -199,7 +193,8 @@ export const N8nPlusEndpointHandler: EndpointHandler<N8nPlusEndpoint, ComputedN8
 		ep.w = w;
 		ep.h = h;
 
-		ep.canvas?.setAttribute('data-endpoint-node-type', ep.params.nodeType);
+		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/telemetry/index.ts b/packages/editor-ui/src/plugins/telemetry/index.ts
index 5663f26f18..dda799d279 100644
--- a/packages/editor-ui/src/plugins/telemetry/index.ts
+++ b/packages/editor-ui/src/plugins/telemetry/index.ts
@@ -4,17 +4,18 @@ import type { RouteLocation } from 'vue-router';
 
 import type { INodeCreateElement, IUpdateInformation } from '@/Interface';
 import type { IUserNodesPanelSession } from './telemetry.types';
-import { useSettingsStore } from '@/stores/settings.store';
-import { useRootStore } from '@/stores/n8nRoot.store';
-import { useTelemetryStore } from '@/stores/telemetry.store';
 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 { useNDVStore } from '@/stores';
+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: RouteLocation }>;
@@ -98,7 +99,7 @@ export class Telemetry {
 	track(
 		event: string,
 		properties?: ITelemetryTrackProperties,
-		{ withPostHog } = { withPostHog: false },
+		options: { withPostHog?: boolean; withAppCues?: boolean } = {},
 	) {
 		if (!this.rudderStack) return;
 
@@ -109,9 +110,13 @@ export class Telemetry {
 
 		this.rudderStack.track(event, updatedProperties);
 
-		if (withPostHog) {
+		if (options.withPostHog) {
 			usePostHog().capture(event, updatedProperties);
 		}
+
+		if (options.withAppCues && window.Appcues) {
+			window.Appcues.track(event, updatedProperties);
+		}
 	}
 
 	page(route: Route) {
@@ -128,6 +133,8 @@ export class Telemetry {
 				properties = route.meta.telemetry.getProperties(route);
 			}
 
+			properties.theme = useUIStore().appliedTheme;
+
 			const category = route.meta?.telemetry?.pageCategory || 'Editor';
 			this.rudderStack.page(category, pageName, properties);
 		} else {
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 0000000000..01ff6b9bf1
--- /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 0000000000..5bc0538047
--- /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 '@/utils/userUtils';
+
+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,
+					globalRole: { name: 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,
+					globalRole: { name: ROLE.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 0000000000..bf33c75e56
--- /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 0000000000..96fd17aaab
--- /dev/null
+++ b/packages/editor-ui/src/rbac/checks/__tests__/isAuthenticated.test.ts
@@ -0,0 +1,27 @@
+import { useUsersStore } from '@/stores/users.store';
+import { isAuthenticated } from '@/rbac/checks/isAuthenticated';
+
+vi.mock('@/stores/users.store', () => ({
+	useUsersStore: vi.fn(),
+}));
+
+describe('Checks', () => {
+	describe('isAuthenticated()', () => {
+		it('should return true 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(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);
+		});
+	});
+});
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 0000000000..815c021768
--- /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 0000000000..9de45f6bd6
--- /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 0000000000..8f539ded62
--- /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 0000000000..b63e55bb06
--- /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 0000000000..644f816330
--- /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 0000000000..f9938e7266
--- /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 '@/utils/userUtils';
+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.globalRole?.name;
+		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 0000000000..60ba995de0
--- /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 0000000000..a6f6f580f4
--- /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 0000000000..ed8654410f
--- /dev/null
+++ b/packages/editor-ui/src/rbac/checks/isAuthenticated.ts
@@ -0,0 +1,7 @@
+import { useUsersStore } from '@/stores/users.store';
+import type { RBACPermissionCheck, AuthenticatedPermissionOptions } from '@/types/rbac';
+
+export const isAuthenticated: RBACPermissionCheck<AuthenticatedPermissionOptions> = () => {
+	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 0000000000..f0f812df69
--- /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 0000000000..652e7ec0be
--- /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 0000000000..d3de02a37d
--- /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 0000000000..fe52d9933a
--- /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 0000000000..35b1244ab1
--- /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 0000000000..e6805b3813
--- /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 0000000000..50a9320c1c
--- /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 0000000000..54960ba037
--- /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 0000000000..d550dd9fe0
--- /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 0000000000..330e7aaa5e
--- /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 0000000000..6b27a23283
--- /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 0000000000..0743936330
--- /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 0000000000..18cd46a6b3
--- /dev/null
+++ b/packages/editor-ui/src/rbac/middleware/__tests__/role.test.ts
@@ -0,0 +1,82 @@
+import { roleMiddleware } from '@/rbac/middleware/role';
+import { useUsersStore } from '@/stores/users.store';
+import { ROLE } from '@/utils/userUtils';
+import type { IUser } from '@/Interface';
+import type { RouteLocationNormalized } from 'vue-router';
+import { VIEWS } 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,
+					globalRole: {
+						id: '123',
+						createdAt: new Date(),
+						name: 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,
+					globalRole: {
+						id: '123',
+						createdAt: new Date(),
+						name: 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 0000000000..20100f78f0
--- /dev/null
+++ b/packages/editor-ui/src/rbac/middleware/authenticated.ts
@@ -0,0 +1,18 @@
+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,
+) => {
+	const valid = isAuthenticated();
+	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 0000000000..debf9e8ba9
--- /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 0000000000..bab12869f9
--- /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 0000000000..88f09a8557
--- /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 0000000000..05095469f6
--- /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 0000000000..e3c25ec433
--- /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 0000000000..b4614aa547
--- /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 0000000000..3ceb244287
--- /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 8e854ff431..4831dba9c8 100644
--- a/packages/editor-ui/src/router.ts
+++ b/packages/editor-ui/src/router.ts
@@ -1,62 +1,64 @@
-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 { RouteLocation, RouteRecordRaw } from 'vue-router';
+import { useStorage } from '@/composables/useStorage';
+
+import type {
+	NavigationGuardNext,
+	RouteLocation,
+	RouteRecordRaw,
+	RouteLocationRaw,
+	RouteLocationNormalized,
+} from 'vue-router';
 import { createRouter, createWebHistory } 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 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 { useSettingsStore } from './stores/settings.store';
-import { useTemplatesStore } from './stores/templates.store';
-import { useSSOStore } from './stores/sso.store';
-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 SettingsSourceControl from './views/SettingsSourceControl.vue';
-import SettingsExternalSecrets from './views/SettingsExternalSecrets.vue';
-import SettingsAuditLogs from './views/SettingsAuditLogs.vue';
-import WorkflowHistory from '@/views/WorkflowHistory.vue';
-import WorkflowOnboardingView from '@/views/WorkflowOnboardingView.vue';
-import { EnterpriseEditionFeature, VIEWS } from '@/constants';
-
-interface IRouteConfig {
-	meta: {
-		nodeView?: boolean;
-		templatesEnabled?: boolean;
-		getRedirect?: () => { name: string } | false;
-		permissions: IPermissions;
-		telemetry?: {
-			disabled?: true;
-			getProperties: (route: RouteLocation) => object;
-		};
-		scrollOffset?: number;
-	};
-}
+const ChangePasswordView = async () => import('./views/ChangePasswordView.vue');
+const ErrorView = async () => import('./views/ErrorView.vue');
+const ForgotMyPasswordView = async () => import('./views/ForgotMyPasswordView.vue');
+const MainHeader = async () => import('@/components/MainHeader/MainHeader.vue');
+const MainSidebar = async () => import('@/components/MainSidebar.vue');
+const NodeView = async () => import('@/views/NodeView.vue');
+const WorkflowExecutionsList = async () => import('@/components/ExecutionsView/ExecutionsList.vue');
+const ExecutionsLandingPage = async () =>
+	import('@/components/ExecutionsView/ExecutionsLandingPage.vue');
+const ExecutionPreview = async () => import('@/components/ExecutionsView/ExecutionPreview.vue');
+const SettingsView = async () => import('./views/SettingsView.vue');
+const SettingsLdapView = async () => import('./views/SettingsLdapView.vue');
+const SettingsPersonalView = async () => import('./views/SettingsPersonalView.vue');
+const SettingsUsersView = async () => import('./views/SettingsUsersView.vue');
+const SettingsCommunityNodesView = async () => import('./views/SettingsCommunityNodesView.vue');
+const SettingsApiView = async () => import('./views/SettingsApiView.vue');
+const SettingsLogStreamingView = async () => import('./views/SettingsLogStreamingView.vue');
+const SettingsFakeDoorView = async () => import('./views/SettingsFakeDoorView.vue');
+const SetupView = async () => import('./views/SetupView.vue');
+const SigninView = async () => import('./views/SigninView.vue');
+const SignupView = async () => import('./views/SignupView.vue');
+const TemplatesCollectionView = async () => import('@/views/TemplatesCollectionView.vue');
+const TemplatesWorkflowView = async () => import('@/views/TemplatesWorkflowView.vue');
+const SetupWorkflowFromTemplateView = async () =>
+	import('@/views/SetupWorkflowFromTemplateView/SetupWorkflowFromTemplateView.vue');
+const TemplatesSearchView = async () => import('@/views/TemplatesSearchView.vue');
+const CredentialsView = async () => import('@/views/CredentialsView.vue');
+const ExecutionsView = async () => import('@/views/ExecutionsView.vue');
+const WorkflowsView = async () => import('@/views/WorkflowsView.vue');
+const VariablesView = async () => import('@/views/VariablesView.vue');
+const SettingsUsageAndPlan = async () => import('./views/SettingsUsageAndPlan.vue');
+const SettingsSso = async () => import('./views/SettingsSso.vue');
+const SignoutView = async () => import('@/views/SignoutView.vue');
+const SamlOnboarding = async () => import('@/views/SamlOnboarding.vue');
+const SettingsSourceControl = async () => import('./views/SettingsSourceControl.vue');
+const SettingsExternalSecrets = async () => import('./views/SettingsExternalSecrets.vue');
+const SettingsAuditLogs = async () => import('./views/SettingsAuditLogs.vue');
+const WorkerView = async () => import('./views/WorkerView.vue');
+const WorkflowHistory = async () => import('@/views/WorkflowHistory.vue');
+const WorkflowOnboardingView = async () => import('@/views/WorkflowOnboardingView.vue');
 
 function getTemplatesRedirect(defaultRedirect: VIEWS[keyof VIEWS]) {
 	const settingsStore = useSettingsStore();
@@ -76,11 +78,7 @@ export const routes = [
 			return { name: VIEWS.WORKFLOWS };
 		},
 		meta: {
-			permissions: {
-				allow: {
-					loginStatus: [LOGIN_STATUS.LoggedIn],
-				},
-			},
+			middleware: ['authenticated'],
 		},
 	},
 	{
@@ -102,11 +100,7 @@ export const routes = [
 				},
 			},
 			getRedirect: getTemplatesRedirect,
-			permissions: {
-				allow: {
-					loginStatus: [LOGIN_STATUS.LoggedIn],
-				},
-			},
+			middleware: ['authenticated'],
 		},
 	},
 	{
@@ -128,11 +122,29 @@ export const routes = [
 					};
 				},
 			},
-			permissions: {
-				allow: {
-					loginStatus: [LOGIN_STATUS.LoggedIn],
+			middleware: ['authenticated'],
+		},
+	},
+	{
+		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: route.params.id,
+						wf_template_repo_session_id: templatesStore.currentSessionId,
+					};
 				},
 			},
+			middleware: ['authenticated'],
 		},
 	},
 	{
@@ -158,11 +170,7 @@ export const routes = [
 			setScrollPosition(pos: number) {
 				this.scrollOffset = pos;
 			},
-			permissions: {
-				allow: {
-					loginStatus: [LOGIN_STATUS.LoggedIn],
-				},
-			},
+			middleware: ['authenticated'],
 		},
 	},
 	{
@@ -173,11 +181,7 @@ export const routes = [
 			sidebar: MainSidebar,
 		},
 		meta: {
-			permissions: {
-				allow: {
-					loginStatus: [LOGIN_STATUS.LoggedIn],
-				},
-			},
+			middleware: ['authenticated'],
 		},
 	},
 	{
@@ -187,13 +191,7 @@ export const routes = [
 			default: VariablesView,
 			sidebar: MainSidebar,
 		},
-		meta: {
-			permissions: {
-				allow: {
-					loginStatus: [LOGIN_STATUS.LoggedIn],
-				},
-			},
-		},
+		meta: { middleware: ['authenticated'] },
 	},
 	{
 		path: '/executions',
@@ -203,11 +201,7 @@ export const routes = [
 			sidebar: MainSidebar,
 		},
 		meta: {
-			permissions: {
-				allow: {
-					loginStatus: [LOGIN_STATUS.LoggedIn],
-				},
-			},
+			middleware: ['authenticated'],
 		},
 	},
 	{
@@ -218,11 +212,7 @@ export const routes = [
 			sidebar: MainSidebar,
 		},
 		meta: {
-			permissions: {
-				allow: {
-					loginStatus: [LOGIN_STATUS.LoggedIn],
-				},
-			},
+			middleware: ['authenticated'],
 		},
 	},
 	{
@@ -235,13 +225,11 @@ export const routes = [
 		},
 		meta: {
 			nodeView: true,
-			permissions: {
-				allow: {
-					loginStatus: [LOGIN_STATUS.LoggedIn],
-				},
-				deny: {
-					shouldDeny: () =>
-						!useSettingsStore().isEnterpriseFeatureEnabled(EnterpriseEditionFeature.DebugInEditor),
+			keepWorkflowAlive: true,
+			middleware: ['authenticated', 'enterprise'],
+			middlewareOptions: {
+				enterprise: {
+					feature: [EnterpriseEditionFeature.DebugInEditor],
 				},
 			},
 		},
@@ -256,11 +244,7 @@ export const routes = [
 		},
 		meta: {
 			keepWorkflowAlive: true,
-			permissions: {
-				allow: {
-					loginStatus: [LOGIN_STATUS.LoggedIn],
-				},
-			},
+			middleware: ['authenticated'],
 		},
 		children: [
 			{
@@ -271,11 +255,7 @@ export const routes = [
 				},
 				meta: {
 					keepWorkflowAlive: true,
-					permissions: {
-						allow: {
-							loginStatus: [LOGIN_STATUS.LoggedIn],
-						},
-					},
+					middleware: ['authenticated'],
 				},
 			},
 			{
@@ -286,11 +266,7 @@ export const routes = [
 				},
 				meta: {
 					keepWorkflowAlive: true,
-					permissions: {
-						allow: {
-							loginStatus: [LOGIN_STATUS.LoggedIn],
-						},
-					},
+					middleware: ['authenticated'],
 				},
 			},
 		],
@@ -303,15 +279,10 @@ export const routes = [
 			sidebar: MainSidebar,
 		},
 		meta: {
-			permissions: {
-				allow: {
-					loginStatus: [LOGIN_STATUS.LoggedIn],
-				},
-				deny: {
-					shouldDeny: () =>
-						!useSettingsStore().isEnterpriseFeatureEnabled(
-							EnterpriseEditionFeature.WorkflowHistory,
-						),
+			middleware: ['authenticated', 'enterprise'],
+			middlewareOptions: {
+				enterprise: {
+					feature: [EnterpriseEditionFeature.WorkflowHistory],
 				},
 			},
 		},
@@ -326,12 +297,9 @@ export const routes = [
 		},
 		meta: {
 			templatesEnabled: true,
+			keepWorkflowAlive: true,
 			getRedirect: getTemplatesRedirect,
-			permissions: {
-				allow: {
-					loginStatus: [LOGIN_STATUS.LoggedIn],
-				},
-			},
+			middleware: ['authenticated'],
 		},
 	},
 	{
@@ -344,12 +312,9 @@ export const routes = [
 		},
 		meta: {
 			templatesEnabled: true,
+			keepWorkflowAlive: true,
 			getRedirect: () => getTemplatesRedirect(VIEWS.NEW_WORKFLOW),
-			permissions: {
-				allow: {
-					loginStatus: [LOGIN_STATUS.LoggedIn],
-				},
-			},
+			middleware: ['authenticated'],
 		},
 	},
 	{
@@ -362,11 +327,8 @@ export const routes = [
 		},
 		meta: {
 			nodeView: true,
-			permissions: {
-				allow: {
-					loginStatus: [LOGIN_STATUS.LoggedIn],
-				},
-			},
+			keepWorkflowAlive: true,
+			middleware: ['authenticated'],
 		},
 	},
 	{
@@ -376,11 +338,7 @@ export const routes = [
 			default: NodeView,
 		},
 		meta: {
-			permissions: {
-				allow: {
-					loginStatus: [LOGIN_STATUS.LoggedIn],
-				},
-			},
+			middleware: ['authenticated'],
 		},
 	},
 	{
@@ -393,11 +351,8 @@ export const routes = [
 		},
 		meta: {
 			nodeView: true,
-			permissions: {
-				allow: {
-					loginStatus: [LOGIN_STATUS.LoggedIn],
-				},
-			},
+			keepWorkflowAlive: true,
+			middleware: ['authenticated'],
 		},
 	},
 	{
@@ -414,11 +369,7 @@ export const routes = [
 			telemetry: {
 				pageCategory: 'auth',
 			},
-			permissions: {
-				allow: {
-					loginStatus: [LOGIN_STATUS.LoggedOut],
-				},
-			},
+			middleware: ['guest'],
 		},
 	},
 	{
@@ -431,11 +382,7 @@ export const routes = [
 			telemetry: {
 				pageCategory: 'auth',
 			},
-			permissions: {
-				allow: {
-					loginStatus: [LOGIN_STATUS.LoggedOut],
-				},
-			},
+			middleware: ['guest'],
 		},
 	},
 	{
@@ -448,11 +395,7 @@ export const routes = [
 			telemetry: {
 				pageCategory: 'auth',
 			},
-			permissions: {
-				allow: {
-					loginStatus: [LOGIN_STATUS.LoggedIn],
-				},
-			},
+			middleware: ['authenticated'],
 		},
 	},
 	{
@@ -462,14 +405,10 @@ export const routes = [
 			default: SetupView,
 		},
 		meta: {
+			middleware: ['defaultUser'],
 			telemetry: {
 				pageCategory: 'auth',
 			},
-			permissions: {
-				allow: {
-					role: [ROLE.Default],
-				},
-			},
 		},
 	},
 	{
@@ -479,14 +418,10 @@ export const routes = [
 			default: ForgotMyPasswordView,
 		},
 		meta: {
+			middleware: ['guest'],
 			telemetry: {
 				pageCategory: 'auth',
 			},
-			permissions: {
-				allow: {
-					loginStatus: [LOGIN_STATUS.LoggedOut],
-				},
-			},
 		},
 	},
 	{
@@ -496,14 +431,10 @@ export const routes = [
 			default: ChangePasswordView,
 		},
 		meta: {
+			middleware: ['guest'],
 			telemetry: {
 				pageCategory: 'auth',
 			},
-			permissions: {
-				allow: {
-					loginStatus: [LOGIN_STATUS.LoggedOut],
-				},
-			},
 		},
 	},
 	{
@@ -515,9 +446,19 @@ 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 ||
+								settingsStore.settings.deployment?.type === 'cloud'
+							);
+						},
+					},
 					telemetry: {
 						pageCategory: 'settings',
 						getProperties(route: RouteLocation) {
@@ -526,20 +467,6 @@ export const routes = [
 							};
 						},
 					},
-					permissions: {
-						allow: {
-							loginStatus: [LOGIN_STATUS.LoggedIn],
-						},
-						deny: {
-							shouldDeny: () => {
-								const settingsStore = useSettingsStore();
-								return (
-									settingsStore.settings.hideUsagePage ||
-									settingsStore.settings.deployment?.type === 'cloud'
-								);
-							},
-						},
-					},
 				},
 			},
 			{
@@ -549,6 +476,7 @@ export const routes = [
 					settingsView: SettingsPersonalView,
 				},
 				meta: {
+					middleware: ['authenticated'],
 					telemetry: {
 						pageCategory: 'settings',
 						getProperties(route: RouteLocation) {
@@ -557,14 +485,6 @@ export const routes = [
 							};
 						},
 					},
-					permissions: {
-						allow: {
-							loginStatus: [LOGIN_STATUS.LoggedIn],
-						},
-						deny: {
-							role: [ROLE.Default],
-						},
-					},
 				},
 			},
 			{
@@ -574,6 +494,12 @@ export const routes = [
 					settingsView: SettingsUsersView,
 				},
 				meta: {
+					middleware: ['authenticated', 'rbac'],
+					middlewareOptions: {
+						rbac: {
+							scope: ['user:create', 'user:update'],
+						},
+					},
 					telemetry: {
 						pageCategory: 'settings',
 						getProperties(route: RouteLocation) {
@@ -582,11 +508,6 @@ export const routes = [
 							};
 						},
 					},
-					permissions: {
-						allow: {
-							role: [ROLE.Owner],
-						},
-					},
 				},
 			},
 			{
@@ -596,6 +517,7 @@ export const routes = [
 					settingsView: SettingsApiView,
 				},
 				meta: {
+					middleware: ['authenticated'],
 					telemetry: {
 						pageCategory: 'settings',
 						getProperties(route: RouteLocation) {
@@ -604,17 +526,6 @@ export const routes = [
 							};
 						},
 					},
-					permissions: {
-						allow: {
-							loginStatus: [LOGIN_STATUS.LoggedIn],
-						},
-						deny: {
-							shouldDeny: () => {
-								const settingsStore = useSettingsStore();
-								return !settingsStore.isPublicApiEnabled;
-							},
-						},
-					},
 				},
 			},
 			{
@@ -624,6 +535,12 @@ export const routes = [
 					settingsView: SettingsSourceControl,
 				},
 				meta: {
+					middleware: ['authenticated', 'rbac'],
+					middlewareOptions: {
+						rbac: {
+							scope: 'sourceControl:manage',
+						},
+					},
 					telemetry: {
 						pageCategory: 'settings',
 						getProperties(route: RouteLocation) {
@@ -632,11 +549,6 @@ export const routes = [
 							};
 						},
 					},
-					permissions: {
-						allow: {
-							role: [ROLE.Owner],
-						},
-					},
 				},
 			},
 			{
@@ -646,19 +558,20 @@ export const routes = [
 					settingsView: SettingsExternalSecrets,
 				},
 				meta: {
+					middleware: ['authenticated', 'rbac'],
+					middlewareOptions: {
+						rbac: {
+							scope: ['externalSecretsProvider:list', 'externalSecretsProvider:update'],
+						},
+					},
 					telemetry: {
 						pageCategory: 'settings',
-						getProperties(route: Route) {
+						getProperties(route: RouteLocation) {
 							return {
 								feature: 'external-secrets',
 							};
 						},
 					},
-					permissions: {
-						allow: {
-							role: [ROLE.Owner],
-						},
-					},
 				},
 			},
 			{
@@ -668,6 +581,16 @@ 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: RouteLocation) {
@@ -676,17 +599,6 @@ export const routes = [
 							};
 						},
 					},
-					permissions: {
-						allow: {
-							role: [ROLE.Owner],
-						},
-						deny: {
-							shouldDeny: () => {
-								const settingsStore = useSettingsStore();
-								return settingsStore.isDesktopDeployment;
-							},
-						},
-					},
 				},
 			},
 			{
@@ -696,17 +608,25 @@ export const routes = [
 					settingsView: SettingsLogStreamingView,
 				},
 				meta: {
+					middleware: ['authenticated', 'rbac'],
+					middlewareOptions: {
+						rbac: {
+							scope: 'logStreaming:manage',
+						},
+					},
 					telemetry: {
 						pageCategory: 'settings',
 					},
-					permissions: {
-						allow: {
-							role: [ROLE.Owner],
-						},
-						deny: {
-							role: [ROLE.Member],
-						},
-					},
+				},
+			},
+			{
+				path: 'workers',
+				name: VIEWS.WORKER_VIEW,
+				components: {
+					settingsView: WorkerView,
+				},
+				meta: {
+					middleware: ['authenticated'],
 				},
 			},
 			{
@@ -716,20 +636,19 @@ export const routes = [
 					settingsView: SettingsCommunityNodesView,
 				},
 				meta: {
+					middleware: ['authenticated', 'rbac', 'custom'],
+					middlewareOptions: {
+						rbac: {
+							scope: ['communityPackage:list', 'communityPackage:update'],
+						},
+						custom: () => {
+							const settingsStore = useSettingsStore();
+							return settingsStore.isCommunityNodesFeatureEnabled;
+						},
+					},
 					telemetry: {
 						pageCategory: 'settings',
 					},
-					permissions: {
-						allow: {
-							role: [ROLE.Owner],
-						},
-						deny: {
-							shouldDeny: () => {
-								const settingsStore = useSettingsStore();
-								return !settingsStore.isCommunityNodesFeatureEnabled;
-							},
-						},
-					},
 				},
 			},
 			{
@@ -739,6 +658,7 @@ export const routes = [
 					settingsView: SettingsFakeDoorView,
 				},
 				meta: {
+					middleware: ['authenticated'],
 					telemetry: {
 						pageCategory: 'settings',
 						getProperties(route: RouteLocation) {
@@ -747,11 +667,6 @@ export const routes = [
 							};
 						},
 					},
-					permissions: {
-						allow: {
-							loginStatus: [LOGIN_STATUS.LoggedIn],
-						},
-					},
 				},
 			},
 			{
@@ -761,12 +676,10 @@ export const routes = [
 					settingsView: SettingsLdapView,
 				},
 				meta: {
-					permissions: {
-						allow: {
-							role: [ROLE.Owner],
-						},
-						deny: {
-							role: [ROLE.Member],
+					middleware: ['authenticated', 'rbac'],
+					middlewareOptions: {
+						rbac: {
+							scope: 'ldap:manage',
 						},
 					},
 				},
@@ -778,6 +691,15 @@ export const routes = [
 					settingsView: SettingsAuditLogs,
 				},
 				meta: {
+					middleware: ['authenticated', 'rbac', 'custom'],
+					middlewareOptions: {
+						custom: () => {
+							return !!useStorage('audit-logs').value;
+						},
+						rbac: {
+							scope: 'auditLogs:manage',
+						},
+					},
 					telemetry: {
 						pageCategory: 'settings',
 						getProperties(route: RouteLocation) {
@@ -786,14 +708,6 @@ export const routes = [
 							};
 						},
 					},
-					permissions: {
-						allow: {
-							role: [ROLE.Owner],
-						},
-						deny: {
-							shouldDeny: () => !window.localStorage.getItem('audit-logs'),
-						},
-					},
 				},
 			},
 		],
@@ -805,25 +719,21 @@ 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
-						);
-					},
-				},
-			},
 		},
 	},
 	{
@@ -841,26 +751,103 @@ 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 Array<RouteRecordRaw & 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 = createRouter({
 	history: createWebHistory(import.meta.env.DEV ? '/' : window.BASE_PATH ?? '/'),
-	scrollBehavior(to, from, savedPosition) {
+	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) => {
+	/**
+	 * 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();
+});
+
+router.afterEach((to, from) => {
+	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);
 });
 
 export default router;
diff --git a/packages/editor-ui/src/shims.d.ts b/packages/editor-ui/src/shims.d.ts
index 0cc01780ae..b4da29d592 100644
--- a/packages/editor-ui/src/shims.d.ts
+++ b/packages/editor-ui/src/shims.d.ts
@@ -1,6 +1,6 @@
 import { VNode, ComponentPublicInstance } from 'vue';
-import type { Store } from 'pinia';
-import type { IDataObject } from 'n8n-workflow';
+import { PartialDeep } from 'type-fest';
+import { ExternalHooks } from '@/types/externalHooks';
 
 declare module 'markdown-it-link-attributes';
 declare module 'markdown-it-emoji';
@@ -13,16 +13,14 @@ declare global {
 			PROD: boolean;
 			NODE_ENV: 'development' | 'production';
 			VUE_APP_URL_BASE_API: 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 {
diff --git a/packages/editor-ui/src/stores/__tests__/environments.spec.ts b/packages/editor-ui/src/stores/__tests__/environments.spec.ts
index 7b956cdf3d..123254ff75 100644
--- a/packages/editor-ui/src/stores/__tests__/environments.spec.ts
+++ b/packages/editor-ui/src/stores/__tests__/environments.spec.ts
@@ -4,7 +4,7 @@ import { setupServer } from '@/__tests__/server';
 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 398ba4ef46..d485dc5af6 100644
--- a/packages/editor-ui/src/stores/__tests__/posthog.test.ts
+++ b/packages/editor-ui/src/stores/__tests__/posthog.test.ts
@@ -5,6 +5,8 @@ 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';
 
 const DEFAULT_POSTHOG_SETTINGS: IN8nUISettings['posthog'] = {
 	enabled: true,
@@ -55,7 +57,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 +118,7 @@ describe('Posthog store', () => {
 			});
 		});
 
-		it('sets override feature flags', () => {
+		it('sets override feature flags', async () => {
 			const TEST = 'test';
 			const flags = {
 				[TEST]: 'variant',
@@ -126,17 +127,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 0000000000..b0e06c643e
--- /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__/ui.test.ts b/packages/editor-ui/src/stores/__tests__/ui.test.ts
index 359b9baee0..39ff24cf76 100644
--- a/packages/editor-ui/src/stores/__tests__/ui.test.ts
+++ b/packages/editor-ui/src/stores/__tests__/ui.test.ts
@@ -1,6 +1,7 @@
 import { createPinia, setActivePinia } from 'pinia';
 import { useUIStore } from '@/stores/ui.store';
-import { useSettingsStore, useUsersStore } from '@/stores/settings.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';
@@ -164,11 +165,15 @@ describe('UI store', () => {
 		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');
@@ -182,10 +187,15 @@ describe('UI store', () => {
 			.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');
diff --git a/packages/editor-ui/src/stores/__tests__/utils/cloudStoreUtils.ts b/packages/editor-ui/src/stores/__tests__/utils/cloudStoreUtils.ts
index 35010b2898..a74e7db78e 100644
--- a/packages/editor-ui/src/stores/__tests__/utils/cloudStoreUtils.ts
+++ b/packages/editor-ui/src/stores/__tests__/utils/cloudStoreUtils.ts
@@ -10,7 +10,7 @@ function getUserPlanData(trialExpirationDate: Date, isTrial = true): Cloud.PlanD
 		isActive: true,
 		displayName: 'Trial',
 		metadata: {
-			group: isTrial ? 'trial' : 'pro',
+			group: isTrial ? 'trial' : 'opt-in',
 			slug: 'trial-1',
 			trial: {
 				gracePeriod: 3,
diff --git a/packages/editor-ui/src/stores/__tests__/workflows.spec.ts b/packages/editor-ui/src/stores/__tests__/workflows.spec.ts
index 78396b75ef..c2f6a54d54 100644
--- a/packages/editor-ui/src/stores/__tests__/workflows.spec.ts
+++ b/packages/editor-ui/src/stores/__tests__/workflows.spec.ts
@@ -1,10 +1,10 @@
 import { setActivePinia, createPinia } from 'pinia';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import type { IWorkflowDataUpdate } from '@/Interface';
-import { makeRestApiRequest } from '@/utils';
+import { makeRestApiRequest } from '@/utils/apiUtils';
 import { useRootStore } from '../n8nRoot.store';
 
-vi.mock('@/utils', () => ({
+vi.mock('@/utils/apiUtils', () => ({
 	makeRestApiRequest: vi.fn(),
 }));
 
diff --git a/packages/editor-ui/src/stores/__tests__/workflows.test.ts b/packages/editor-ui/src/stores/__tests__/workflows.test.ts
index 51d0a001bb..0fd67f88bf 100644
--- a/packages/editor-ui/src/stores/__tests__/workflows.test.ts
+++ b/packages/editor-ui/src/stores/__tests__/workflows.test.ts
@@ -1,5 +1,5 @@
 import { createTestingPinia } from '@pinia/testing';
-import { useWorkflowsStore } from '@/stores';
+import { useWorkflowsStore } from '@/stores/workflows.store';
 
 let pinia: ReturnType<typeof createTestingPinia>;
 beforeAll(() => {
diff --git a/packages/editor-ui/src/stores/auditLogs.store.ts b/packages/editor-ui/src/stores/auditLogs.store.ts
index 7fec2b2db1..12c42dcfd0 100644
--- a/packages/editor-ui/src/stores/auditLogs.store.ts
+++ b/packages/editor-ui/src/stores/auditLogs.store.ts
@@ -1,7 +1,7 @@
 import { computed } from 'vue';
 import { defineStore } from 'pinia';
 import { EnterpriseEditionFeature } from '@/constants';
-import { useSettingsStore } from '@/stores';
+import { useSettingsStore } from '@/stores/settings.store';
 
 export const useAuditLogsStore = defineStore('auditLogs', () => {
 	const settingsStore = useSettingsStore();
diff --git a/packages/editor-ui/src/stores/canvas.store.ts b/packages/editor-ui/src/stores/canvas.store.ts
index 137baeac9e..5eaa867680 100644
--- a/packages/editor-ui/src/stores/canvas.store.ts
+++ b/packages/editor-ui/src/stores/canvas.store.ts
@@ -1,13 +1,11 @@
 import { computed, ref, watch } from 'vue';
 import { defineStore } from 'pinia';
 import { v4 as uuid } from 'uuid';
-import {
-	useWorkflowsStore,
-	useNodeTypesStore,
-	useUIStore,
-	useHistoryStore,
-	useSourceControlStore,
-} from '@/stores';
+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,
@@ -16,7 +14,7 @@ import {
 	scaleBigger,
 	scaleReset,
 	scaleSmaller,
-} from '@/utils';
+} from '@/utils/canvasUtils';
 import { START_NODE_TYPE } from '@/constants';
 import type {
 	BeforeStartEventParams,
@@ -42,6 +40,7 @@ import {
 	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();
@@ -49,6 +48,7 @@ export const useCanvasStore = defineStore('canvas', () => {
 	const uiStore = useUIStore();
 	const historyStore = useHistoryStore();
 	const sourceControlStore = useSourceControlStore();
+	const loadingService = useLoadingService();
 
 	const jsPlumbInstanceRef = ref<BrowserJsPlumbInstance>();
 	const isDragging = ref<boolean>(false);
@@ -98,8 +98,8 @@ export const useCanvasStore = defineStore('canvas', () => {
 		const sidebarWidth = isDemo.value
 			? 0
 			: uiStore.sidebarMenuCollapsed
-			? SIDEBAR_WIDTH
-			: SIDEBAR_WIDTH_EXPANDED;
+			  ? SIDEBAR_WIDTH
+			  : SIDEBAR_WIDTH_EXPANDED;
 
 		const relativeX = position[0] - sidebarWidth;
 		const relativeY = isDemo.value
@@ -250,8 +250,8 @@ export const useCanvasStore = defineStore('canvas', () => {
 							}
 
 							newNodePosition = [
-								parseInt(element.style.left!.slice(0, -2), 10),
-								parseInt(element.style.top!.slice(0, -2), 10),
+								parseInt(element.style.left.slice(0, -2), 10),
+								parseInt(element.style.top.slice(0, -2), 10),
 							];
 
 							const updateInformation = {
@@ -297,6 +297,10 @@ export const useCanvasStore = defineStore('canvas', () => {
 		lastSelectedConnection,
 		newNodeInsertPosition,
 		jsPlumbInstance,
+		isLoading: loadingService.isLoading,
+		startLoading: loadingService.startLoading,
+		setLoadingText: loadingService.setLoadingText,
+		stopLoading: loadingService.stopLoading,
 		setRecenteredCanvasAddButtonPosition,
 		getNodesWithPlaceholderNode,
 		canvasPositionFromPagePosition,
diff --git a/packages/editor-ui/src/stores/cloudPlan.store.ts b/packages/editor-ui/src/stores/cloudPlan.store.ts
index 42929d2469..a17f6db035 100644
--- a/packages/editor-ui/src/stores/cloudPlan.store.ts
+++ b/packages/editor-ui/src/stores/cloudPlan.store.ts
@@ -5,11 +5,18 @@ 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 } from '@/api/cloudPlans';
+import {
+	getAdminPanelLoginCode,
+	getCurrentPlan,
+	getCurrentUsage,
+	fetchSuggestedTemplates,
+} from '@/api/cloudPlans';
 import { DateTime } from 'luxon';
-import { CLOUD_TRIAL_CHECK_INTERVAL, STORES } from '@/constants';
+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,
@@ -54,20 +61,20 @@ export const useCloudPlanStore = defineStore(STORES.CLOUD_PLAN, () => {
 
 	const hasCloudPlan = computed(() => {
 		const cloudUserId = settingsStore.settings.n8nMetadata?.userId;
-		return usersStore.currentUser?.isOwner && settingsStore.isCloudDeployment && cloudUserId;
+		return hasPermission(['instanceOwner']) && settingsStore.isCloudDeployment && cloudUserId;
 	});
 
 	const getUserCloudAccount = async () => {
 		if (!hasCloudPlan.value) throw new Error('User does not have a cloud plan');
 		try {
-			if (useUsersStore().isInstanceOwner) {
+			if (hasPermission(['instanceOwner'])) {
 				await usersStore.fetchUserCloudAccount();
 				if (!usersStore.currentUserCloudInfo?.confirmed && !userIsTrialing.value) {
 					useUIStore().pushBannerToStack('EMAIL_CONFIRMATION');
 				}
 			}
 		} catch (error) {
-			throw new Error(error);
+			throw new Error(error.message);
 		}
 	};
 
@@ -142,17 +149,65 @@ export const useCloudPlanStore = defineStore(STORES.CLOUD_PLAN, () => {
 			if (!userIsTrialing.value) return;
 			await getInstanceCurrentUsage();
 			startPollingInstanceUsageData();
-		} catch {}
+		} catch (e) {
+			throw new Error(e.message);
+		}
 	};
 
 	const fetchUserCloudAccount = async () => {
 		try {
 			await getUserCloudAccount();
-		} catch {}
+		} 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,
@@ -166,5 +221,6 @@ export const useCloudPlanStore = defineStore(STORES.CLOUD_PLAN, () => {
 		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 0000000000..3aa84c1f78
--- /dev/null
+++ b/packages/editor-ui/src/stores/collaboration.store.ts
@@ -0,0 +1,53 @@
+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>({});
+
+	pushStore.addEventListener((event) => {
+		if (event.type === 'activeWorkflowUsersChanged') {
+			const activeWorkflowId = workflowStore.workflowId;
+			if (event.data.workflowId === activeWorkflowId) {
+				usersForWorkflows.value[activeWorkflowId] = event.data.activeUsers;
+			}
+		}
+	});
+
+	const workflowUsersUpdated = (data: ActiveUsersForWorkflows) => {
+		usersForWorkflows.value = data;
+	};
+
+	const notifyWorkflowOpened = (workflowId: string) => {
+		pushStore.send({
+			type: 'workflowOpened',
+			workflowId,
+		});
+	};
+
+	const notifyWorkflowClosed = (workflowId: string) => {
+		pushStore.send({ type: 'workflowClosed', workflowId });
+	};
+
+	const getUsersForCurrentWorkflow = computed(() => {
+		return usersForWorkflows.value[workflowStore.workflowId];
+	});
+
+	return {
+		usersForWorkflows,
+		notifyWorkflowOpened,
+		notifyWorkflowClosed,
+		workflowUsersUpdated,
+		getUsersForCurrentWorkflow,
+	};
+});
diff --git a/packages/editor-ui/src/stores/credentials.store.ts b/packages/editor-ui/src/stores/credentials.store.ts
index 4b5d547491..297bcaebb5 100644
--- a/packages/editor-ui/src/stores/credentials.store.ts
+++ b/packages/editor-ui/src/stores/credentials.store.ts
@@ -6,7 +6,7 @@ import type {
 	ICredentialsResponse,
 	ICredentialsState,
 	ICredentialTypeMap,
-} from '../Interface';
+} from '@/Interface';
 import {
 	createNewCredential,
 	deleteCredential,
@@ -41,6 +41,8 @@ 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: {},
@@ -130,9 +132,9 @@ export const useCredentialsStore = defineStore(STORES.CREDENTIALS, {
 		getNodesWithAccess() {
 			return (credentialTypeName: string) => {
 				const nodeTypesStore = useNodeTypesStore();
-				const allLatestNodeTypes: INodeTypeDescription[] = nodeTypesStore.allLatestNodeTypes;
+				const allNodeTypes: INodeTypeDescription[] = nodeTypesStore.allNodeTypes;
 
-				return allLatestNodeTypes.filter((nodeType: INodeTypeDescription) => {
+				return allNodeTypes.filter((nodeType: INodeTypeDescription) => {
 					if (!nodeType.credentials) {
 						return false;
 					}
@@ -191,6 +193,9 @@ export const useCredentialsStore = defineStore(STORES.CREDENTIALS, {
 				return this.getCredentialOwnerName(credential);
 			};
 		},
+		httpOnlyCredentialTypes(): ICredentialType[] {
+			return this.allCredentialTypes.filter((credentialType) => credentialType.httpRequestNode);
+		},
 	},
 	actions: {
 		setCredentialTypes(credentialTypes: ICredentialType[]): void {
@@ -298,14 +303,6 @@ export const useCredentialsStore = defineStore(STORES.CREDENTIALS, {
 						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);
@@ -360,7 +357,10 @@ export const useCredentialsStore = defineStore(STORES.CREDENTIALS, {
 				ownedBy: payload.ownedBy,
 			};
 		},
-		async setCredentialSharedWith(payload: { sharedWith: IUser[]; credentialId: string }) {
+		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),
@@ -371,6 +371,7 @@ export const useCredentialsStore = defineStore(STORES.CREDENTIALS, {
 					sharedWith: payload.sharedWith,
 				};
 			}
+			return this.credentials[payload.credentialId];
 		},
 		addCredentialSharee(payload: { credentialId: string; sharee: Partial<IUser> }): void {
 			this.credentials[payload.credentialId] = {
@@ -397,3 +398,42 @@ export const useCredentialsStore = defineStore(STORES.CREDENTIALS, {
 		},
 	},
 });
+
+/**
+ * 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/externalSecrets.ee.store.ts b/packages/editor-ui/src/stores/externalSecrets.ee.store.ts
index 66d7349d9e..3039c37cac 100644
--- a/packages/editor-ui/src/stores/externalSecrets.ee.store.ts
+++ b/packages/editor-ui/src/stores/externalSecrets.ee.store.ts
@@ -5,13 +5,13 @@ 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 { useUsersStore } from '@/stores/users.store';
+import { useRBACStore } from '@/stores/rbac.store';
 import type { ExternalSecretsProvider } from '@/Interface';
 
 export const useExternalSecretsStore = defineStore('externalSecrets', () => {
 	const rootStore = useRootStore();
 	const settingsStore = useSettingsStore();
-	const usersStore = useUsersStore();
+	const rbacStore = useRBACStore();
 
 	const state = reactive({
 		providers: [] as ExternalSecretsProvider[],
@@ -37,17 +37,18 @@ export const useExternalSecretsStore = defineStore('externalSecrets', () => {
 							secretAcc[secret] = '*********';
 							return secretAcc;
 						}
-						const obj = (secretAcc[splitSecret[0]] ?? {}) as object;
-						let acc: any = obj;
+						const obj = secretAcc[splitSecret[0]] ?? {};
+						let acc = obj;
 						for (let i = 1; i < splitSecret.length; i++) {
-							const key = splitSecret[i];
+							const key = splitSecret[i] as keyof typeof acc;
 							// Actual value key
 							if (i === splitSecret.length - 1) {
-								acc[key] = '*********';
+								const key = splitSecret[i] as keyof typeof acc;
+								acc[key] = '*********' as (typeof acc)[typeof key];
 								continue;
 							}
-							if (!(key in acc)) {
-								acc[key] = {};
+							if (Object.keys(acc) && !acc[key]) {
+								acc[key] = {} as (typeof acc)[typeof key];
 							}
 							acc = acc[key];
 						}
@@ -64,7 +65,7 @@ export const useExternalSecretsStore = defineStore('externalSecrets', () => {
 	});
 
 	async function fetchAllSecrets() {
-		if (usersStore.isInstanceOwner) {
+		if (rbacStore.hasScope('externalSecret:list')) {
 			try {
 				state.secrets = await externalSecretsApi.getExternalSecrets(rootStore.getRestApiContext);
 			} catch (error) {
diff --git a/packages/editor-ui/src/stores/index.ts b/packages/editor-ui/src/stores/index.ts
deleted file mode 100644
index 0c23969970..0000000000
--- a/packages/editor-ui/src/stores/index.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-export * from './canvas.store';
-export * from './communityNodes.store';
-export * from './credentials.store';
-export * from './environments.ee.store';
-export * from './externalSecrets.ee.store';
-export * from './history.store';
-export * from './logStreaming.store';
-export * from './n8nRoot.store';
-export * from './ndv.store';
-export * from './nodeCreator.store';
-export * from './nodeTypes.store';
-export * from './posthog.store';
-export * from './segment.store';
-export * from './settings.store';
-export * from './tags.store';
-export * from './telemetry.store';
-export * from './templates.store';
-export * from './ui.store';
-export * from './usage.store';
-export * from './users.store';
-export * from './versions.store';
-export * from './webhooks.store';
-export * from './workflows.ee.store';
-export * from './workflows.store';
-export * from './cloudPlan.store';
-export * from './sourceControl.store';
-export * from './sso.store';
-export * from './auditLogs.store';
diff --git a/packages/editor-ui/src/stores/n8nRoot.store.ts b/packages/editor-ui/src/stores/n8nRoot.store.ts
index 3e688cf6f3..5099da91b9 100644
--- a/packages/editor-ui/src/stores/n8nRoot.store.ts
+++ b/packages/editor-ui/src/stores/n8nRoot.store.ts
@@ -1,19 +1,21 @@
 import { CLOUD_BASE_URL_PRODUCTION, CLOUD_BASE_URL_STAGING, STORES } from '@/constants';
 import type { IRestApiContext, RootState } from '@/Interface';
-import type { IDataObject } from 'n8n-workflow';
+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 === '/{{BASE_PATH}}/' ? '/' : window.BASE_PATH),
+		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,
@@ -34,6 +36,18 @@ export const useRootStore = defineStore(STORES.ROOT, {
 			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}`;
 		},
@@ -71,6 +85,15 @@ export const useRootStore = defineStore(STORES.ROOT, {
 			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;
 		},
@@ -79,6 +102,7 @@ export const useRootStore = defineStore(STORES.ROOT, {
 		},
 		setTimezone(timezone: string): void {
 			this.timezone = timezone;
+			setGlobalState({ defaultTimezone: timezone });
 		},
 		setExecutionTimeout(executionTimeout: number): void {
 			this.executionTimeout = executionTimeout;
diff --git a/packages/editor-ui/src/stores/ndv.store.ts b/packages/editor-ui/src/stores/ndv.store.ts
index 45a3e4f180..062cf05ac6 100644
--- a/packages/editor-ui/src/stores/ndv.store.ts
+++ b/packages/editor-ui/src/stores/ndv.store.ts
@@ -1,3 +1,4 @@
+import { useStorage } from '@/composables/useStorage';
 import { LOCAL_STORAGE_MAPPING_IS_ONBOARDED, STORES } from '@/constants';
 import type {
 	INodeUi,
@@ -45,10 +46,10 @@ export const useNDVStore = defineStore(STORES.NDV, {
 			isDragging: false,
 			type: '',
 			data: '',
-			canDrop: false,
+			activeTargetId: null,
 			stickyPosition: null,
 		},
-		isMappingOnboarded: window.localStorage.getItem(LOCAL_STORAGE_MAPPING_IS_ONBOARDED) === 'true',
+		isMappingOnboarded: useStorage(LOCAL_STORAGE_MAPPING_IS_ONBOARDED).value === 'true',
 	}),
 	getters: {
 		activeNode(): INodeUi | null {
@@ -93,7 +94,7 @@ export const useNDVStore = defineStore(STORES.NDV, {
 			return this.draggable.data;
 		},
 		canDraggableDrop(): boolean {
-			return this.draggable.canDrop;
+			return this.draggable.activeTargetId !== null;
 		},
 		outputPanelEditMode(): NDVState['output']['editMode'] {
 			return this.output.editMode;
@@ -138,6 +139,9 @@ export const useNDVStore = defineStore(STORES.NDV, {
 
 			return null;
 		},
+		isNDVOpen(): boolean {
+			return this.activeNodeName !== null;
+		},
 	},
 	actions: {
 		setActiveNodeName(nodeName: string | null): void {
@@ -190,7 +194,7 @@ export const useNDVStore = defineStore(STORES.NDV, {
 				isDragging: true,
 				type,
 				data,
-				canDrop: false,
+				activeTargetId: null,
 				stickyPosition: null,
 			};
 		},
@@ -199,15 +203,15 @@ export const useNDVStore = defineStore(STORES.NDV, {
 				isDragging: false,
 				type: '',
 				data: '',
-				canDrop: false,
+				activeTargetId: null,
 				stickyPosition: null,
 			};
 		},
 		setDraggableStickyPos(position: XYPosition | null): void {
 			this.draggable.stickyPosition = position;
 		},
-		setDraggableCanDrop(canDrop: boolean): void {
-			this.draggable.canDrop = canDrop;
+		setDraggableTargetId(id: string | null): void {
+			this.draggable.activeTargetId = id;
 		},
 		setMappingTelemetry(telemetry: { [key: string]: string | number | boolean }): void {
 			this.mappingTelemetry = { ...this.mappingTelemetry, ...telemetry };
@@ -227,7 +231,7 @@ export const useNDVStore = defineStore(STORES.NDV, {
 		disableMappingHint(store = true) {
 			this.isMappingOnboarded = true;
 			if (store) {
-				window.localStorage.setItem(LOCAL_STORAGE_MAPPING_IS_ONBOARDED, 'true');
+				useStorage(LOCAL_STORAGE_MAPPING_IS_ONBOARDED).value = 'true';
 			}
 		},
 		updateNodeParameterIssues(issues: INodeIssues): void {
diff --git a/packages/editor-ui/src/stores/nodeTypes.store.ts b/packages/editor-ui/src/stores/nodeTypes.store.ts
index fdb8e7ec6b..9e5deda06a 100644
--- a/packages/editor-ui/src/stores/nodeTypes.store.ts
+++ b/packages/editor-ui/src/stores/nodeTypes.store.ts
@@ -6,36 +6,33 @@ import {
 	getResourceLocatorResults,
 	getResourceMapperFields,
 } from '@/api/nodeTypes';
-import { DEFAULT_NODETYPE_VERSION, STORES } from '@/constants';
-import type {
-	INodeTypesState,
-	IResourceLocatorReqParams,
-	ResourceMapperReqParams,
-} from '@/Interface';
+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';
+import { omit } from '@/utils/typesUtils';
 import type {
-	ILoadOptions,
+	ConnectionTypes,
 	INode,
-	INodeCredentials,
 	INodeListSearchResult,
 	INodeOutputConfiguration,
-	INodeParameters,
 	INodePropertyOptions,
 	INodeTypeDescription,
 	INodeTypeNameVersion,
 	ResourceMapperFields,
 	Workflow,
-	ConnectionTypes,
 } from 'n8n-workflow';
+import { NodeConnectionType, NodeHelpers } from 'n8n-workflow';
 import { defineStore } from 'pinia';
 import { useCredentialsStore } from './credentials.store';
 import { useRootStore } from './n8nRoot.store';
-import { NodeHelpers, NodeConnectionType } from 'n8n-workflow';
+import {
+	getCredentialOnlyNodeType,
+	getCredentialTypeName,
+	isCredentialOnlyNodeType,
+} from '@/utils/credentialOnlyNodes';
+import { groupNodeTypesByNameAndType } from '@/utils/nodeTypes/nodeTypeTransforms';
 
-function getNodeVersions(nodeType: INodeTypeDescription) {
-	return Array.isArray(nodeType.version) ? nodeType.version : [nodeType.version];
-}
+export type NodeTypesStore = ReturnType<typeof useNodeTypesStore>;
 
 export const useNodeTypesStore = defineStore(STORES.NODE_TYPES, {
 	state: (): INodeTypesState => ({
@@ -68,18 +65,40 @@ export const useNodeTypesStore = defineStore(STORES.NODE_TYPES, {
 		},
 		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;
+				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;
@@ -141,6 +160,26 @@ export const useNodeTypesStore = defineStore(STORES.NODE_TYPES, {
 							}
 							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;
@@ -174,36 +213,11 @@ export const useNodeTypesStore = defineStore(STORES.NODE_TYPES, {
 	},
 	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 },
-			);
-			this.nodeTypes = nodeTypes;
+			const nodeTypes = groupNodeTypesByNameAndType(newNodeTypes);
+			this.nodeTypes = {
+				...this.nodeTypes,
+				...nodeTypes,
+			};
 		},
 		removeNodeTypes(nodeTypesToRemove: INodeTypeDescription[]): void {
 			this.nodeTypes = nodeTypesToRemove.reduce(
@@ -241,6 +255,14 @@ export const useNodeTypesStore = defineStore(STORES.NODE_TYPES, {
 				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);
@@ -249,25 +271,20 @@ export const useNodeTypesStore = defineStore(STORES.NODE_TYPES, {
 				addHeaders(headers, rootStore.defaultLocale);
 			}
 		},
-		async getNodeParameterOptions(sendData: {
-			nodeTypeAndVersion: INodeTypeNameVersion;
-			path: string;
-			methodName?: string;
-			loadOptions?: ILoadOptions;
-			currentNodeParameters: INodeParameters;
-			credentials?: INodeCredentials;
-		}): Promise<INodePropertyOptions[]> {
+		async getNodeParameterOptions(
+			sendData: DynamicNodeParameters.OptionsRequest,
+		): Promise<INodePropertyOptions[]> {
 			const rootStore = useRootStore();
 			return getNodeParameterOptions(rootStore.getRestApiContext, sendData);
 		},
 		async getResourceLocatorResults(
-			sendData: IResourceLocatorReqParams,
+			sendData: DynamicNodeParameters.ResourceLocatorResultsRequest,
 		): Promise<INodeListSearchResult> {
 			const rootStore = useRootStore();
 			return getResourceLocatorResults(rootStore.getRestApiContext, sendData);
 		},
 		async getResourceMapperFields(
-			sendData: ResourceMapperReqParams,
+			sendData: DynamicNodeParameters.ResourceMapperFieldsRequest,
 		): Promise<ResourceMapperFields | null> {
 			const rootStore = useRootStore();
 			try {
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 0000000000..ae4abe0114
--- /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
index ffe95ed53a..8596c142c1 100644
--- a/packages/editor-ui/src/stores/posthog.store.ts
+++ b/packages/editor-ui/src/stores/posthog.store.ts
@@ -1,23 +1,27 @@
 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 { debounce } from 'lodash-es';
+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({});
@@ -31,20 +35,30 @@ export const usePostHog = defineStore('posthog', () => {
 	};
 
 	const getVariant = (experiment: keyof FeatureFlags): FeatureFlags[keyof FeatureFlags] => {
-		return featureFlags.value?.[experiment];
+		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 cachedOverrdies = localStorage.getItem(LOCAL_STORAGE_EXPERIMENT_OVERRIDES);
-		if (cachedOverrdies) {
+		const cachedOverrides = useStorage(LOCAL_STORAGE_EXPERIMENT_OVERRIDES).value;
+		if (cachedOverrides) {
 			try {
-				console.log('Overriding feature flags', cachedOverrdies);
-				overrides.value = JSON.parse(cachedOverrdies);
+				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);
 			}
@@ -54,17 +68,13 @@ export const usePostHog = defineStore('posthog', () => {
 			// 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));
+					useStorage(LOCAL_STORAGE_EXPERIMENT_OVERRIDES).value = JSON.stringify(overrides.value);
 				} catch (e) {}
 			},
 
 			getVariant,
-			getAll: () => featureFlags.value || {},
+			getAll: () => featureFlags.value ?? {},
 		};
 	}
 
@@ -82,13 +92,27 @@ export const usePostHog = defineStore('posthog', () => {
 		window.posthog?.identify?.(id, traits);
 	};
 
-	const addExperimentOverrides = () => {
-		featureFlags.value = {
-			...featureFlags.value,
-			...overrides.value,
-		};
+	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;
@@ -128,13 +152,11 @@ export const usePostHog = defineStore('posthog', () => {
 			};
 
 			// does not need to be debounced really, but tracking does not fire without delay on page load
-			addExperimentOverrides();
 			trackExperimentsDebounced(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);
@@ -142,25 +164,6 @@ export const usePostHog = defineStore('posthog', () => {
 		}
 	};
 
-	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;
-	};
-
 	const capture = (event: string, properties: IDataObject) => {
 		if (typeof window.posthog?.capture === 'function') {
 			window.posthog.capture(event, properties);
@@ -180,9 +183,11 @@ export const usePostHog = defineStore('posthog', () => {
 
 	return {
 		init,
+		isFeatureEnabled,
 		isVariantEnabled,
 		getVariant,
 		reset,
+		identify,
 		capture,
 		setMetadata,
 	};
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 0000000000..b636303c24
--- /dev/null
+++ b/packages/editor-ui/src/stores/pushConnection.store.ts
@@ -0,0 +1,162 @@
+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 {
+	sessionId: 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 sessionId = computed(() => rootStore.sessionId);
+	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?sessionId=${sessionId.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 {
+		sessionId,
+		pushSource,
+		isConnectionOpen,
+		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 0000000000..fbcb6b80b6
--- /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
index dbeb291562..9e0159685c 100644
--- a/packages/editor-ui/src/stores/segment.store.ts
+++ b/packages/editor-ui/src/stores/segment.store.ts
@@ -7,10 +7,12 @@ import {
 	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',
@@ -27,6 +29,7 @@ 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) {
@@ -34,6 +37,20 @@ export const useSegment = defineStore('segment', () => {
 		}
 	};
 
+	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;
@@ -58,8 +75,7 @@ export const useSegment = defineStore('segment', () => {
 			const node = workflowsStore.getNodeByName(nodeName);
 			const nodeTypeName = node ? node.type : 'unknown';
 			if (
-				nodeRunData[0].data &&
-				nodeRunData[0].data.main &&
+				nodeRunData[0].data?.main &&
 				nodeRunData[0].data.main.some((out) => out && out?.length > 1)
 			) {
 				multipleOutputNodes.add(nodeTypeName);
@@ -120,6 +136,8 @@ export const useSegment = defineStore('segment', () => {
 		track,
 		trackAddedTrigger,
 		trackSuccessfulWorkflowExecution,
+		identify,
+		page,
 		EVENTS,
 	};
 });
diff --git a/packages/editor-ui/src/stores/settings.store.ts b/packages/editor-ui/src/stores/settings.store.ts
index 6350668c47..53ff843daa 100644
--- a/packages/editor-ui/src/stores/settings.store.ts
+++ b/packages/editor-ui/src/stores/settings.store.ts
@@ -25,15 +25,20 @@ import type {
 	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';
+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: {
@@ -69,7 +74,7 @@ export const useSettingsStore = defineStore(STORES.SETTINGS, {
 	}),
 	getters: {
 		isEnterpriseFeatureEnabled() {
-			return (feature: EnterpriseEditionFeature): boolean => this.settings.enterprise[feature];
+			return (feature: EnterpriseEditionFeature): boolean => this.settings.enterprise?.[feature];
 		},
 		versionCli(): string {
 			return this.settings.versionCli;
@@ -111,10 +116,7 @@ export const useSettingsStore = defineStore(STORES.SETTINGS, {
 			return this.settings.deployment?.type.startsWith('desktop_');
 		},
 		isCloudDeployment(): boolean {
-			if (!this.settings.deployment) {
-				return false;
-			}
-			return this.settings.deployment.type === 'cloud';
+			return this.settings.deployment?.type === 'cloud';
 		},
 		isSmtpSetup(): boolean {
 			return this.userManagement.smtpSetup;
@@ -170,6 +172,9 @@ export const useSettingsStore = defineStore(STORES.SETTINGS, {
 		isQueueModeEnabled(): boolean {
 			return this.settings.executionMode === 'queue';
 		},
+		isWorkerViewAvailable(): boolean {
+			return !!this.settings.enterprise?.workerView;
+		},
 		workflowCallerPolicyDefaultOption(): WorkflowSettings.CallerPolicy {
 			return this.settings.workflowCallerPolicyDefaultOption;
 		},
@@ -190,6 +195,33 @@ export const useSettingsStore = defineStore(STORES.SETTINGS, {
 		},
 	},
 	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;
@@ -231,6 +263,9 @@ export const useSettingsStore = defineStore(STORES.SETTINGS, {
 
 			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);
@@ -361,5 +396,3 @@ export const useSettingsStore = defineStore(STORES.SETTINGS, {
 		},
 	},
 });
-
-export { useUsersStore };
diff --git a/packages/editor-ui/src/stores/sso.store.ts b/packages/editor-ui/src/stores/sso.store.ts
index be8b90c2f9..005a816506 100644
--- a/packages/editor-ui/src/stores/sso.store.ts
+++ b/packages/editor-ui/src/stores/sso.store.ts
@@ -4,9 +4,8 @@ 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 } from '@/Interface';
+import type { SamlPreferences, SamlPreferencesExtractedData } from '@/Interface';
 import { updateCurrentUser } from '@/api/users';
-import type { SamlPreferencesExtractedData } from '@/Interface';
 import { useUsersStore } from '@/stores/users.store';
 
 export const useSSOStore = defineStore('sso', () => {
diff --git a/packages/editor-ui/src/stores/templates.store.ts b/packages/editor-ui/src/stores/templates.store.ts
index ab80091fdf..f7ba89d815 100644
--- a/packages/editor-ui/src/stores/templates.store.ts
+++ b/packages/editor-ui/src/stores/templates.store.ts
@@ -22,15 +22,17 @@ import {
 } from '@/api/templates';
 import { getFixedNodesList } from '@/utils/nodeViewUtils';
 
-const TEMPLATES_PAGE_SIZE = 10;
+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: {},
+		categories: [],
 		collections: {},
 		workflows: {},
 		collectionSearches: {},
@@ -47,6 +49,12 @@ export const useTemplatesStore = defineStore(STORES.TEMPLATES, {
 		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];
 		},
@@ -143,7 +151,7 @@ export const useTemplatesStore = defineStore(STORES.TEMPLATES, {
 			collections: ITemplatesCollection[];
 			query: ITemplatesQuery;
 		}): void {
-			const collectionIds = data.collections.map((collection) => collection.id);
+			const collectionIds = data.collections.map((collection) => String(collection.id));
 			const searchKey = getSearchKey(data.query);
 
 			this.collectionSearches = {
@@ -167,6 +175,7 @@ export const useTemplatesStore = defineStore(STORES.TEMPLATES, {
 					[searchKey]: {
 						workflowIds: workflowIds as unknown as string[],
 						totalWorkflows: data.totalWorkflows,
+						categories: this.categories,
 					},
 				};
 
@@ -178,6 +187,7 @@ export const useTemplatesStore = defineStore(STORES.TEMPLATES, {
 				[searchKey]: {
 					workflowIds: [...cachedResults.workflowIds, ...workflowIds] as string[],
 					totalWorkflows: data.totalWorkflows,
+					categories: this.categories,
 				},
 			};
 		},
@@ -214,9 +224,7 @@ export const useTemplatesStore = defineStore(STORES.TEMPLATES, {
 				this.currentSessionId = `templates-${Date.now()}`;
 			}
 		},
-		async fetchTemplateById(
-			templateId: string,
-		): Promise<ITemplatesWorkflow | ITemplatesWorkflowFull> {
+		async fetchTemplateById(templateId: string): Promise<ITemplatesWorkflowFull> {
 			const settingsStore = useSettingsStore();
 			const apiEndpoint: string = settingsStore.templatesHost;
 			const versionCli: string = settingsStore.versionCli;
@@ -285,6 +293,7 @@ export const useTemplatesStore = defineStore(STORES.TEMPLATES, {
 		async getWorkflows(query: ITemplatesQuery): Promise<ITemplatesWorkflow[]> {
 			const cachedResults = this.getSearchedWorkflows(query);
 			if (cachedResults) {
+				this.categories = this.workflowSearches[getSearchKey(query)].categories ?? [];
 				return cachedResults;
 			}
 
@@ -294,7 +303,7 @@ export const useTemplatesStore = defineStore(STORES.TEMPLATES, {
 
 			const payload = await getWorkflows(
 				apiEndpoint,
-				{ ...query, skip: 0, limit: TEMPLATES_PAGE_SIZE },
+				{ ...query, page: 1, limit: TEMPLATES_PAGE_SIZE },
 				{ 'n8n-version': versionCli },
 			);
 
@@ -314,7 +323,7 @@ export const useTemplatesStore = defineStore(STORES.TEMPLATES, {
 			try {
 				const payload = await getWorkflows(apiEndpoint, {
 					...query,
-					skip: cachedResults.length,
+					page: cachedResults.length / TEMPLATES_PAGE_SIZE + 1,
 					limit: TEMPLATES_PAGE_SIZE,
 				});
 
diff --git a/packages/editor-ui/src/stores/ui.store.ts b/packages/editor-ui/src/stores/ui.store.ts
index 0a0de6faff..87c7947a18 100644
--- a/packages/editor-ui/src/stores/ui.store.ts
+++ b/packages/editor-ui/src/stores/ui.store.ts
@@ -37,6 +37,8 @@ import {
 	DEBUG_PAYWALL_MODAL_KEY,
 	N8N_PRICING_PAGE_URL,
 	WORKFLOW_HISTORY_VERSION_RESTORE,
+	SUGGESTED_TEMPLATES_PREVIEW_MODAL_KEY,
+	SETUP_CREDENTIALS_MODAL_KEY,
 } from '@/constants';
 import type {
 	CloudUpdateLinkSourceType,
@@ -51,78 +53,79 @@ import type {
 	XYPosition,
 	Modals,
 	NewCredentialsModal,
+	ThemeOption,
+	AppliedThemeOption,
+	SuggestedTemplates,
 } from '@/Interface';
 import { defineStore } from 'pinia';
 import { useRootStore } from '@/stores/n8nRoot.store';
 import { getCurlToJson } from '@/api/curlHelper';
-import { useWorkflowsStore } from '@/stores/workflows.store';
-import { useSettingsStore, useUsersStore } from '@/stores/settings.store';
 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 { getStyleTokenValue } from '@/utils/htmlUtils';
 import { dismissBannerPermanently } from '@/api/ui';
 import type { BannerName } from 'n8n-workflow';
+import {
+	addThemeToBody,
+	getPreferredTheme,
+	getThemeOverride,
+	isValidTheme,
+	updateTheme,
+} from './ui.utils';
+import { useUsersStore } from './users.store';
+
+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: {
-			[ABOUT_MODAL_KEY]: {
-				open: false,
-			},
-			[CHAT_EMBED_MODAL_KEY]: {
-				open: false,
-			},
-			[CHANGE_PASSWORD_MODAL_KEY]: {
-				open: false,
-			},
-			[CONTACT_PROMPT_MODAL_KEY]: {
-				open: false,
-			},
-			[CREDENTIAL_SELECT_MODAL_KEY]: {
-				open: false,
-			},
+			...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,
+				].map((modalKey) => [modalKey, { 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_LM_CHAT_MODAL_KEY]: {
-				open: false,
-			},
-			[WORKFLOW_SETTINGS_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: '',
@@ -133,9 +136,6 @@ export const useUIStore = defineStore(STORES.UI, {
 				curlCommand: '',
 				httpNodeParameters: '',
 			},
-			[MFA_SETUP_MODAL_KEY]: {
-				open: false,
-			},
 			[LOG_STREAM_MODAL_KEY]: {
 				open: false,
 				data: undefined,
@@ -146,21 +146,6 @@ export const useUIStore = defineStore(STORES.UI, {
 				activeId: null,
 				showAuthSelector: false,
 			},
-			[SOURCE_CONTROL_PUSH_MODAL_KEY]: {
-				open: false,
-			},
-			[SOURCE_CONTROL_PULL_MODAL_KEY]: {
-				open: false,
-			},
-			[EXTERNAL_SECRETS_PROVIDER_MODAL_KEY]: {
-				open: false,
-			},
-			[DEBUG_PAYWALL_MODAL_KEY]: {
-				open: false,
-			},
-			[WORKFLOW_HISTORY_VERSION_RESTORE]: {
-				open: false,
-			},
 		},
 		modalStack: [],
 		sidebarMenuCollapsed: true,
@@ -197,13 +182,23 @@ export const useUIStore = defineStore(STORES.UI, {
 		executionSidebarAutoRefresh: true,
 		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: {
-		logo() {
+		appliedTheme(): AppliedThemeOption {
+			return this.theme === 'system' ? getPreferredTheme() : this.theme;
+		},
+		logo(): string {
 			const { releaseChannel } = useSettingsStore().settings;
+			const type = this.appliedTheme === 'dark' ? '-dark-mode.svg' : '.svg';
+
 			return releaseChannel === 'stable'
-				? 'n8n-logo-expanded.svg'
-				: `n8n-${releaseChannel}-logo.svg`;
+				? `n8n-logo-expanded${type}`
+				: `n8n-${releaseChannel}-logo${type}`;
 		},
 		contextBasedTranslationKeys() {
 			const settingsStore = useSettingsStore();
@@ -349,10 +344,9 @@ export const useUIStore = defineStore(STORES.UI, {
 				let linkUrl = '';
 
 				const searchParams = new URLSearchParams();
+				const { isInstanceOwner } = useUsersStore();
 
-				const isOwner = useUsersStore().isInstanceOwner;
-
-				if (deploymentType === 'cloud' && isOwner) {
+				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`;
@@ -373,10 +367,18 @@ export const useUIStore = defineStore(STORES.UI, {
 			};
 		},
 		headerHeight() {
-			return Number(getStyleTokenValue('--header-height'));
+			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],
@@ -421,17 +423,6 @@ export const useUIStore = defineStore(STORES.UI, {
 				return name !== openModalName;
 			});
 		},
-		closeAllModals(): void {
-			Object.keys(this.modals).forEach((name) => {
-				if (this.modals[name].open) {
-					this.modals[name] = {
-						...this.modals[name],
-						open: false,
-					};
-				}
-			});
-			this.modalStack = [];
-		},
 		draggableStartDragging(type: string, data: string): void {
 			this.draggable = {
 				isDragging: true,
@@ -520,7 +511,10 @@ export const useUIStore = defineStore(STORES.UI, {
 			}
 		},
 		addSelectedNode(node: INodeUi): void {
-			this.selectedNodes.push(node);
+			const isAlreadySelected = this.selectedNodes.some((n) => n.name === node.name);
+			if (!isAlreadySelected) {
+				this.selectedNodes.push(node);
+			}
 		},
 		removeNodeFromSelection(node: INodeUi): void {
 			let index;
@@ -610,5 +604,61 @@ export const useUIStore = defineStore(STORES.UI, {
 		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.utils.ts b/packages/editor-ui/src/stores/ui.utils.ts
new file mode 100644
index 0000000000..9245bc549a
--- /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
index 602e624f1f..92625cc466 100644
--- a/packages/editor-ui/src/stores/usage.store.ts
+++ b/packages/editor-ui/src/stores/usage.store.ts
@@ -1,7 +1,7 @@
 import { computed, reactive } from 'vue';
 import { defineStore } from 'pinia';
 import type { UsageState } from '@/Interface';
-import { activateLicenseKey, getLicense, renewLicense } from '@/api/usage';
+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';
@@ -84,12 +84,29 @@ export const useUsageStore = defineStore('usage', () => {
 		}
 	};
 
+	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,
@@ -111,7 +128,6 @@ export const useUsageStore = defineStore('usage', () => {
 			() =>
 				`${subscriptionAppUrl.value}/manage?token=${managementToken.value}&${commonSubscriptionAppUrlQueryParams.value}`,
 		),
-		canUserActivateLicense: computed(() => usersStore.canUserActivateLicense),
 		isLoading: computed(() => state.loading),
 		telemetryPayload: computed<UsageTelemetry>(() => ({
 			instance_id: instanceId.value,
diff --git a/packages/editor-ui/src/stores/users.store.ts b/packages/editor-ui/src/stores/users.store.ts
index dad8670fad..2959fd2ede 100644
--- a/packages/editor-ui/src/stores/users.store.ts
+++ b/packages/editor-ui/src/stores/users.store.ts
@@ -1,17 +1,14 @@
+import type { UpdateGlobalRolePayload } from '@/api/users';
 import {
 	changePassword,
 	deleteUser,
-	getInviteLink,
 	getPasswordResetLink,
 	getUsers,
-	inviteUsers,
 	login,
 	loginCurrentUser,
 	logout,
-	reinvite,
 	sendForgotPasswordEmail,
 	setupOwner,
-	signup,
 	submitPersonalizationSurvey,
 	updateCurrentUser,
 	updateCurrentUserPassword,
@@ -19,6 +16,7 @@ import {
 	updateOtherUserSettings,
 	validatePasswordToken,
 	validateSignupToken,
+	updateGlobalRole,
 } from '@/api/users';
 import { PERSONALIZATION_MODAL_KEY, STORES } from '@/constants';
 import type {
@@ -30,9 +28,11 @@ import type {
 	IUser,
 	IUserResponse,
 	IUsersState,
+	CurrentUserResponse,
+	InvitableRoleName,
 } from '@/Interface';
 import { getCredentialPermissions } from '@/permissions';
-import { getPersonalizedNodeTypes, isAuthorized, PERMISSIONS, ROLE } from '@/utils';
+import { getPersonalizedNodeTypes, ROLE } from '@/utils/userUtils';
 import { defineStore } from 'pinia';
 import { useRootStore } from './n8nRoot.store';
 import { usePostHog } from './posthog.store';
@@ -41,17 +41,17 @@ 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 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);
+const isPendingUser = (user: IUserResponse | null) => !!user?.isPending;
+const isInstanceOwner = (user: IUserResponse | null) => user?.globalRole?.name === 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,
@@ -81,28 +81,8 @@ export const useUsersStore = defineStore(STORES.USERS, {
 		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;
+			const user = this.currentUser;
 			if (!user) {
 				return [];
 			}
@@ -122,6 +102,29 @@ export const useUsersStore = defineStore(STORES.USERS, {
 		},
 	},
 	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] || {};
@@ -136,7 +139,7 @@ export const useUsersStore = defineStore(STORES.USERS, {
 						: undefined,
 					isDefaultUser: isDefaultUser(updatedUser),
 					isPendingUser: isPendingUser(updatedUser),
-					isOwner: updatedUser.globalRole?.name === ROLE.Owner,
+					isOwner: isInstanceOwner(updatedUser),
 				};
 
 				this.users = {
@@ -169,10 +172,7 @@ export const useUsersStore = defineStore(STORES.USERS, {
 				return;
 			}
 
-			this.addUsers([user]);
-			this.currentUserId = user.id;
-
-			usePostHog().init(user.featureFlags);
+			this.setCurrentUser(user);
 		},
 		async loginWithCreds(params: {
 			email: string;
@@ -186,18 +186,14 @@ export const useUsersStore = defineStore(STORES.USERS, {
 				return;
 			}
 
-			this.addUsers([user]);
-			this.currentUserId = user.id;
-
-			usePostHog().init(user.featureFlags);
+			this.setCurrentUser(user);
 		},
 		async logout(): Promise<void> {
 			const rootStore = useRootStore();
 			await logout(rootStore.getRestApiContext);
-			this.currentUserId = null;
+			this.unsetCurrentUser();
 			useCloudPlanStore().reset();
 			usePostHog().reset();
-			this.currentUserCloudInfo = null;
 			useUIStore().clearBannerStack();
 		},
 		async createOwner(params: {
@@ -210,10 +206,8 @@ export const useUsersStore = defineStore(STORES.USERS, {
 			const user = await setupOwner(rootStore.getRestApiContext, params);
 			const settingsStore = useSettingsStore();
 			if (user) {
-				this.addUsers([user]);
-				this.currentUserId = user.id;
+				this.setCurrentUser(user);
 				settingsStore.stopShowingSetupPage();
-				usePostHog().init(user.featureFlags);
 			}
 		},
 		async validateSignupToken(params: {
@@ -223,7 +217,7 @@ export const useUsersStore = defineStore(STORES.USERS, {
 			const rootStore = useRootStore();
 			return validateSignupToken(rootStore.getRestApiContext, params);
 		},
-		async signup(params: {
+		async acceptInvitation(params: {
 			inviteeId: string;
 			inviterId: string;
 			firstName: string;
@@ -231,11 +225,9 @@ export const useUsersStore = defineStore(STORES.USERS, {
 			password: string;
 		}): Promise<void> {
 			const rootStore = useRootStore();
-			const user = await signup(rootStore.getRestApiContext, params);
+			const user = await acceptInvitation(rootStore.getRestApiContext, params);
 			if (user) {
-				this.addUsers([user]);
-				this.currentUserId = user.id;
-				usePostHog().init(user.featureFlags);
+				this.setCurrentUser(user);
 			}
 		},
 		async sendForgotPasswordEmail(params: { email: string }): Promise<void> {
@@ -311,19 +303,26 @@ export const useUsersStore = defineStore(STORES.USERS, {
 			const users = await getUsers(rootStore.getRestApiContext);
 			this.addUsers(users);
 		},
-		async inviteUsers(params: Array<{ email: string }>): Promise<IInviteResponse[]> {
+		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 }) => ({ isPending: true, ...user })));
+			this.addUsers(
+				users.map(({ user }, index) => ({
+					isPending: true,
+					globalRole: { name: params[index].role },
+					...user,
+				})),
+			);
 			return users;
 		},
-		async reinviteUser(params: { id: string }): Promise<void> {
+		async reinviteUser({ email, role }: { email: string; role: InvitableRoleName }): Promise<void> {
 			const rootStore = useRootStore();
-			await reinvite(rootStore.getRestApiContext, params);
-		},
-		async getUserInviteLink(params: { id: string }): Promise<{ link: string }> {
-			const rootStore = useRootStore();
-			return getInviteLink(rootStore.getRestApiContext, params);
+			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();
@@ -381,5 +380,11 @@ export const useUsersStore = defineStore(STORES.USERS, {
 		async confirmEmail() {
 			await confirmEmail(useRootStore().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/versions.store.ts b/packages/editor-ui/src/stores/versions.store.ts
index 507182311f..5b96f106a7 100644
--- a/packages/editor-ui/src/stores/versions.store.ts
+++ b/packages/editor-ui/src/stores/versions.store.ts
@@ -1,8 +1,10 @@
 import { getNextVersions } from '@/api/versions';
-import { STORES } from '@/constants';
+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 => ({
@@ -45,5 +47,40 @@ export const useVersionsStore = defineStore(STORES.VERSIONS, {
 				}
 			} 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/webhooks.store.ts b/packages/editor-ui/src/stores/webhooks.store.ts
index 69682244ce..25fcd68803 100644
--- a/packages/editor-ui/src/stores/webhooks.store.ts
+++ b/packages/editor-ui/src/stores/webhooks.store.ts
@@ -1,69 +1,19 @@
 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 './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, {
-	getters: {
-		globalRoleName(): string {
-			return useUsersStore().globalRoleName;
-		},
-		getContextBasedTranslationKeys() {
-			return useUIStore().contextBasedTranslationKeys;
-		},
-		getFakeDoorFeatures() {
-			return useUIStore().fakeDoorFeatures;
-		},
-		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;
-		},
-	},
+export const useWebhooksStore = defineStore(STORES.WEBHOOKS, () => {
+	return {
+		...useRootStore(),
+		...useWorkflowsStore(),
+		...useUIStore(),
+		...useUsersStore(),
+		...useNDVStore(),
+		...useSettingsStore(),
+	};
 });
diff --git a/packages/editor-ui/src/stores/workflowHistory.store.ts b/packages/editor-ui/src/stores/workflowHistory.store.ts
index cbb99d1e97..91cd91730f 100644
--- a/packages/editor-ui/src/stores/workflowHistory.store.ts
+++ b/packages/editor-ui/src/stores/workflowHistory.store.ts
@@ -90,7 +90,13 @@ export const useWorkflowHistoryStore = defineStore('workflowHistory', () => {
 			updateData.active = false;
 		}
 
-		return workflowsStore.updateWorkflow(workflowId, updateData, true);
+		return workflowsStore.updateWorkflow(workflowId, updateData, true).catch(async (error) => {
+			if (error.httpStatusCode === 400 && error.message.includes('can not be activated')) {
+				return workflowsStore.fetchWorkflow(workflowId);
+			} else {
+				throw new Error(error);
+			}
+		});
 	};
 
 	return {
diff --git a/packages/editor-ui/src/stores/workflows.ee.store.ts b/packages/editor-ui/src/stores/workflows.ee.store.ts
index d7cb59c20e..c4db192b8a 100644
--- a/packages/editor-ui/src/stores/workflows.ee.store.ts
+++ b/packages/editor-ui/src/stores/workflows.ee.store.ts
@@ -18,7 +18,7 @@ export const useWorkflowsEEStore = defineStore(STORES.WORKFLOWS_EE, {
 				fallback = i18n.baseText('workflows.shareModal.info.sharee.fallback'),
 			): string => {
 				const workflow = useWorkflowsStore().getWorkflowById(workflowId);
-				return workflow && workflow.ownedBy && workflow.ownedBy.firstName
+				return workflow?.ownedBy?.firstName
 					? `${workflow.ownedBy.firstName} ${workflow.ownedBy.lastName} (${workflow.ownedBy.email})`
 					: fallback;
 			};
diff --git a/packages/editor-ui/src/stores/workflows.store.ts b/packages/editor-ui/src/stores/workflows.store.ts
index 2ac885d7f4..61638e3817 100644
--- a/packages/editor-ui/src/stores/workflows.store.ts
+++ b/packages/editor-ui/src/stores/workflows.store.ts
@@ -10,7 +10,6 @@ import {
 } from '@/constants';
 import type {
 	ExecutionsQueryFilter,
-	IActivationError,
 	IExecutionDeleteFilter,
 	IExecutionPushResponse,
 	IExecutionResponse,
@@ -33,6 +32,7 @@ import type {
 	IWorkflowsMap,
 	WorkflowsState,
 	NodeMetadataMap,
+	WorkflowMetadata,
 } from '@/Interface';
 import { defineStore } from 'pinia';
 import type {
@@ -61,7 +61,7 @@ import type {
 import { deepCopy, NodeHelpers, Workflow } from 'n8n-workflow';
 import { findLast } from 'lodash-es';
 
-import { useRootStore } from './n8nRoot.store';
+import { useRootStore } from '@/stores/n8nRoot.store';
 import {
 	getActiveWorkflows,
 	getCurrentExecutions,
@@ -71,21 +71,17 @@ import {
 	getWorkflow,
 	getWorkflows,
 } from '@/api/workflows';
-import { useUIStore } from './ui.store';
+import { useUIStore } from '@/stores/ui.store';
 import { dataPinningEventBus } from '@/event-bus';
-import {
-	isJsonKeyObject,
-	getPairedItemsMapping,
-	stringSizeInBytes,
-	isObjectLiteral,
-	isEmpty,
-	makeRestApiRequest,
-	unflattenExecutionData,
-} from '@/utils';
-import { useNDVStore } from './ndv.store';
-import { useNodeTypesStore } from './nodeTypes.store';
+import { isObject } from '@/utils/objectUtils';
+import { getPairedItemsMapping } from '@/utils/pairedItemUtils';
+import { isJsonKeyObject, isEmpty, stringSizeInBytes } from '@/utils/typesUtils';
+import { makeRestApiRequest, unflattenExecutionData } 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';
 
 const defaults: Omit<IWorkflowDb, 'id'> & { settings: NonNullable<IWorkflowDb['settings']> } = {
 	name: '',
@@ -201,6 +197,17 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, {
 				return {};
 			};
 		},
+		isNodeInOutgoingNodeConnections() {
+			return (firstNode: string, secondNode: string): boolean => {
+				const firstNodeConnections = this.outgoingConnectionsByNodeName(firstNode);
+				if (!firstNodeConnections?.main?.[0]) return false;
+				const connections = firstNodeConnections.main[0];
+				if (connections.some((node) => node.node === secondNode)) return true;
+				return connections.some((node) =>
+					this.isNodeInOutgoingNodeConnections(node.node, secondNode),
+				);
+			};
+		},
 		allNodes(): INodeUi[] {
 			return this.workflow.nodes;
 		},
@@ -234,20 +241,9 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, {
 			}
 			return false;
 		},
-		getPinData(): IPinData | undefined {
+		pinnedWorkflowData(): 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);
-		},
 		shouldReplaceInputDataWithPinData(): boolean {
 			return !this.activeWorkflowExecution || this.activeWorkflowExecution?.mode === 'manual';
 		},
@@ -283,6 +279,11 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, {
 		},
 	},
 	actions: {
+		getPinDataSize(pinData: Record<string, string | INodeExecutionData[]> = {}): number {
+			return Object.values(pinData).reduce<number>((acc, value) => {
+				return acc + stringSizeInBytes(value);
+			}, 0);
+		},
 		getNodeTypes(): INodeTypes {
 			const nodeTypes: INodeTypes = {
 				nodeTypes: {},
@@ -344,7 +345,7 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, {
 				nodeTypes,
 				settings: this.workflowSettings,
 				// @ts-ignore
-				pinData: this.getPinData,
+				pinData: this.pinnedWorkflowData,
 			});
 
 			return cachedWorkflow;
@@ -370,9 +371,13 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, {
 			});
 		},
 
-		async getActivationError(id: string): Promise<IActivationError | undefined> {
+		async getActivationError(id: string): Promise<string | undefined> {
 			const rootStore = useRootStore();
-			return makeRestApiRequest(rootStore.getRestApiContext, 'GET', `/active/error/${id}`);
+			return makeRestApiRequest(
+				rootStore.getRestApiContext,
+				'GET',
+				`/active-workflows/error/${id}`,
+			);
 		},
 
 		async fetchAllWorkflows(): Promise<IWorkflowDb[]> {
@@ -557,6 +562,9 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, {
 			if (this.workflowsById[workflowId]) {
 				this.workflowsById[workflowId].active = true;
 			}
+			if (workflowId === this.workflow.id) {
+				this.setActive(true);
+			}
 		},
 
 		setWorkflowInactive(workflowId: string): void {
@@ -567,6 +575,9 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, {
 			if (this.workflowsById[workflowId]) {
 				this.workflowsById[workflowId].active = false;
 			}
+			if (workflowId === this.workflow.id) {
+				this.setActive(false);
+			}
 		},
 
 		async fetchActiveWorkflows(): Promise<string[]> {
@@ -645,6 +656,17 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, {
 			};
 		},
 
+		setWorkflowMetadata(metadata: WorkflowMetadata | undefined): void {
+			this.workflow.meta = metadata;
+		},
+
+		addToWorkflowMetadata(data: Partial<WorkflowMetadata>): void {
+			this.workflow.meta = {
+				...this.workflow.meta,
+				...data,
+			};
+		},
+
 		setWorkflow(workflow: IWorkflowDb): void {
 			this.workflow = workflow;
 			this.workflow = {
@@ -671,7 +693,7 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, {
 			}
 
 			const storedPinData = payload.data.map((item) =>
-				isJsonKeyObject(item) ? item : { json: item },
+				isJsonKeyObject(item) ? { json: item.json } : { json: item },
 			);
 
 			this.workflow = {
@@ -750,16 +772,14 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, {
 			}
 
 			// Check if the same connection exists already
-			const checkProperties = ['index', 'node', 'type'];
-			let propertyName: string;
+			const checkProperties = ['index', 'node', 'type'] as Array<keyof IConnection>;
+			let propertyName: keyof IConnection;
 			let connectionExists = false;
 			connectionLoop: for (const existingConnection of this.workflow.connections[sourceData.node][
 				sourceData.type
 			][sourceData.index]) {
 				for (propertyName of checkProperties) {
-					if (
-						(existingConnection as any)[propertyName] !== (destinationData as any)[propertyName]
-					) {
+					if (existingConnection[propertyName] !== destinationData[propertyName]) {
 						continue connectionLoop;
 					}
 				}
@@ -889,8 +909,6 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, {
 					},
 				};
 			}
-
-			this.workflowExecutionPairedItemMappings = getPairedItemsMapping(this.workflowExecutionData);
 		},
 
 		resetAllNodesIssues(): boolean {
@@ -960,6 +978,10 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, {
 				return;
 			}
 
+			if (nodeData.extendsCredential) {
+				nodeData.type = getCredentialOnlyNodeTypeName(nodeData.extendsCredential);
+			}
+
 			this.workflow.nodes.push(nodeData);
 			// Init node metadata
 			if (!this.nodeMetadata[nodeData.name]) {
@@ -1065,7 +1087,7 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, {
 			const uiStore = useUIStore();
 			uiStore.stateIsDirty = true;
 			const newParameters =
-				!!append && isObjectLiteral(updateInformation.value)
+				!!append && isObject(updateInformation.value)
 					? { ...node.parameters, ...updateInformation.value }
 					: updateInformation.value;
 
@@ -1121,7 +1143,6 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, {
 				};
 			}
 			this.workflowExecutionData.data!.resultData.runData[pushData.nodeName].push(pushData.data);
-			this.workflowExecutionPairedItemMappings = getPairedItemsMapping(this.workflowExecutionData);
 		},
 		clearNodeExecutionData(nodeName: string): void {
 			if (!this.workflowExecutionData?.data) {
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/plugins/_codemirror.scss
similarity index 89%
rename from packages/editor-ui/src/styles/autocomplete-theme.scss
rename to packages/editor-ui/src/styles/plugins/_codemirror.scss
index 6eda8b76c8..fd6105a228 100644
--- a/packages/editor-ui/src/styles/autocomplete-theme.scss
+++ b/packages/editor-ui/src/styles/plugins/_codemirror.scss
@@ -30,8 +30,12 @@
 	}
 }
 
+.ͼ2 .cm-tooltip-autocomplete ul li[aria-selected] {
+	background-color: var(--color-autocomplete-selected-background);
+}
+
 .ͼ2 .cm-tooltip-autocomplete ul li[aria-selected] .cm-completionLabel {
-	color: var(--color-text-xlight) !important;
+	color: var(--color-autocomplete-selected-font) !important;
 	font-weight: 600;
 }
 
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 0000000000..fda7b1823c
--- /dev/null
+++ b/packages/editor-ui/src/styles/plugins/index.scss
@@ -0,0 +1 @@
+@import "codemirror";
diff --git a/packages/editor-ui/src/types/externalHooks.ts b/packages/editor-ui/src/types/externalHooks.ts
new file mode 100644
index 0000000000..653ab8cfcc
--- /dev/null
+++ b/packages/editor-ui/src/types/externalHooks.ts
@@ -0,0 +1,294 @@
+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 0000000000..7bd3ad2db7
--- /dev/null
+++ b/packages/editor-ui/src/types/index.ts
@@ -0,0 +1 @@
+export * from './externalHooks';
diff --git a/packages/editor-ui/src/types/rbac.ts b/packages/editor-ui/src/types/rbac.ts
new file mode 100644
index 0000000000..4fbff27728
--- /dev/null
+++ b/packages/editor-ui/src/types/rbac.ts
@@ -0,0 +1,45 @@
+import type { EnterpriseEditionFeature } from '@/constants';
+import type { Resource, ScopeOptions, Scope } from '@n8n/permissions';
+import type { IRole } from '@/Interface';
+
+export type AuthenticatedPermissionOptions = {};
+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 0000000000..ddbffeb2f5
--- /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/utils/__tests__/mappingUtils.test.ts b/packages/editor-ui/src/utils/__tests__/mappingUtils.test.ts
index a46912c5e7..97302edd3b 100644
--- a/packages/editor-ui/src/utils/__tests__/mappingUtils.test.ts
+++ b/packages/editor-ui/src/utils/__tests__/mappingUtils.test.ts
@@ -68,10 +68,6 @@ const JSON_PARAM: INodeProperties = {
 	displayName: 'JSON Payload',
 	name: 'payloadJson',
 	type: 'json',
-	typeOptions: {
-		alwaysOpenEditWindow: true,
-		editor: 'code',
-	},
 	default: '',
 };
 
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 0000000000..0dd51f5e80
--- /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__/rbacUtils.test.ts b/packages/editor-ui/src/utils/__tests__/rbacUtils.test.ts
new file mode 100644
index 0000000000..a6612e8b50
--- /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
index 6b79353fdb..ef7141fcd9 100644
--- a/packages/editor-ui/src/utils/__tests__/sourceControlUtils.test.ts
+++ b/packages/editor-ui/src/utils/__tests__/sourceControlUtils.test.ts
@@ -1,6 +1,6 @@
 import type { SourceControlStatus } from '@/Interface';
 import { beforeEach } from 'vitest';
-import { aggregateSourceControlFiles } from '@/utils';
+import { aggregateSourceControlFiles } from '@/utils/sourceControlUtils';
 
 describe('sourceControlUtils', () => {
 	describe('aggregateSourceControlFiles()', () => {
diff --git a/packages/editor-ui/src/utils/__tests__/typesUtils.test.ts b/packages/editor-ui/src/utils/__tests__/typesUtils.test.ts
index ed6c429bd4..a9070dbe84 100644
--- a/packages/editor-ui/src/utils/__tests__/typesUtils.test.ts
+++ b/packages/editor-ui/src/utils/__tests__/typesUtils.test.ts
@@ -1,4 +1,4 @@
-import { isEmpty, intersection, isValidDate } from '@/utils';
+import { isEmpty, intersection, isValidDate } from '@/utils/typesUtils';
 
 describe('Types Utils', () => {
 	describe('isEmpty', () => {
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 8ed6ed606a..0000000000
--- a/packages/editor-ui/src/utils/__tests__/userUtils.test.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-import { beforeAll } from 'vitest';
-import { setActivePinia } from 'pinia';
-import { merge } from 'lodash-es';
-import { isAuthorized, ROLE } from '@/utils';
-import { useSettingsStore } from '@/stores/settings.store';
-import { useSSOStore } from '@/stores/sso.store';
-import type { IUser } from '@/Interface';
-import { SETTINGS_STORE_DEFAULT_STATE } from '@/__tests__/utils';
-import type { IN8nUISettings } from 'n8n-workflow';
-import { createTestingPinia } from '@pinia/testing';
-
-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(createTestingPinia());
-			settingsStore = useSettingsStore();
-			ssoStore = useSSOStore();
-		});
-
-		// @TODO Move to routes tests in the future
-		it('should check SSO settings route permissions', () => {
-			const ssoSettingsPermissions = {
-				allow: {
-					role: [ROLE.Owner],
-				},
-				deny: {
-					shouldDeny: () => {
-						const settingsStore = useSettingsStore();
-						return settingsStore.isDesktopDeployment;
-					},
-				},
-			};
-
-			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 2ed65f4569..d707546570 100644
--- a/packages/editor-ui/src/utils/apiUtils.ts
+++ b/packages/editor-ui/src/utils/apiUtils.ts
@@ -1,12 +1,7 @@
 import type { AxiosRequestConfig, Method } 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';
 
 export const NO_NETWORK_ERROR_CODE = 999;
@@ -48,12 +43,28 @@ 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;
+	data?: IDataObject | IDataObject[];
+	withCredentials?: boolean;
 }) {
 	const { method, baseURL, endpoint, headers, data } = config;
 	const options: AxiosRequestConfig = {
@@ -67,12 +78,13 @@ async function request(config: {
 		!baseURL.includes('api.n8n.io') &&
 		!baseURL.includes('n8n.cloud')
 	) {
-		options.withCredentials = true;
+		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 {
@@ -103,11 +115,11 @@ 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,
@@ -118,7 +130,7 @@ export async function makeRestApiRequest(
 	});
 
 	// @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(
@@ -150,7 +162,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 0000000000..4366324141
--- /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 c10b8bbd37..3d619a17d7 100644
--- a/packages/editor-ui/src/utils/canvasUtils.ts
+++ b/packages/editor-ui/src/utils/canvasUtils.ts
@@ -10,13 +10,14 @@ 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'.
 */
 
-const SCALE_INCREASE_FACTOR = 1.25;
-const SCALE_DECREASE_FACTOR = 0.75;
+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;
 
 const clamp = (min: number, max: number) => (num: number) => {
 	return Math.max(min, Math.min(max, num));
@@ -43,33 +44,14 @@ export const applyScale =
 		};
 	};
 
-export const scaleBigger = applyScale(SCALE_INCREASE_FACTOR);
+export const scaleBigger = applyScale(SCALE_CHANGE_FACTOR);
 
-export const scaleSmaller = applyScale(SCALE_DECREASE_FACTOR);
+export const scaleSmaller = applyScale(1 / SCALE_CHANGE_FACTOR);
 
 export const scaleReset = (config: IZoomConfig): IZoomConfig => {
 	return applyScale(1 / config.scale)(config);
 };
 
-export 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 getNodeViewTab = (route: Route): string | null => {
 	if (route.meta?.nodeView) {
 		return MAIN_HEADER_TABS.WORKFLOW;
@@ -108,6 +90,8 @@ 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,
@@ -117,9 +101,12 @@ export const normalizeWheelEventDelta = (event: WheelEvent): { deltaX: number; d
 
 	const factor = factorByMode[event.deltaMode] ?? 1;
 
-	return { deltaX: event.deltaX * factor, deltaY: event.deltaY * factor };
+	return {
+		deltaX: clampWheelDelta(event.deltaX * factor),
+		deltaY: clampWheelDelta(event.deltaY * factor),
+	};
 };
 
 export const getScaleFromWheelEventDelta = (delta: number): number => {
-	return 1 - delta / 100;
+	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 0000000000..a765d496da
--- /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/externalHooks.ts b/packages/editor-ui/src/utils/externalHooks.ts
deleted file mode 100644
index 2cb48bc769..0000000000
--- 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 0000000000..30580f8bca
--- /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 0000000000..bc6619fe46
--- /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 7d5f4db345..48a6794e65 100644
--- a/packages/editor-ui/src/utils/htmlUtils.ts
+++ b/packages/editor-ui/src/utils/htmlUtils.ts
@@ -33,13 +33,6 @@ export function sanitizeHtml(dirtyHtml: string) {
 	return sanitizedHtml;
 }
 
-export function getStyleTokenValue(name: string, cssVariable = false): string {
-	if (cssVariable) return `var(${name})`;
-
-	const style = getComputedStyle(document.body);
-	return style.getPropertyValue(name);
-}
-
 export function setPageTitle(title: string) {
 	window.document.title = title;
 }
diff --git a/packages/editor-ui/src/utils/index.ts b/packages/editor-ui/src/utils/index.ts
deleted file mode 100644
index 168b54ee24..0000000000
--- a/packages/editor-ui/src/utils/index.ts
+++ /dev/null
@@ -1,12 +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';
-export * from './sourceControlUtils';
-export * from './expressions';
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 0000000000..c3a6dbbe4a
--- /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 cb68ee0d34..bad9b9c371 100644
--- a/packages/editor-ui/src/utils/nodeTypesUtils.ts
+++ b/packages/editor-ui/src/utils/nodeTypesUtils.ts
@@ -24,7 +24,8 @@ import type {
 	NodeAuthenticationOption,
 	INodeUpdatePropertiesInformation,
 } from '@/Interface';
-import { isResourceLocatorValue, isJsonKeyObject } from '@/utils';
+import { isResourceLocatorValue } from '@/utils/typeGuards';
+import { isJsonKeyObject } from '@/utils/typesUtils';
 import { useCredentialsStore } from '@/stores/credentials.store';
 import { i18n as locale } from '@/plugins/i18n';
 
diff --git a/packages/editor-ui/src/utils/nodeViewUtils.ts b/packages/editor-ui/src/utils/nodeViewUtils.ts
index 6b919aeeea..7d57444fd4 100644
--- a/packages/editor-ui/src/utils/nodeViewUtils.ts
+++ b/packages/editor-ui/src/utils/nodeViewUtils.ts
@@ -1,5 +1,4 @@
-import { getStyleTokenValue } from '@/utils/htmlUtils';
-import { isNumber, closestNumberDivisibleBy } from '@/utils';
+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';
@@ -8,7 +7,6 @@ import { N8nConnector } from '@/plugins/connectors/N8nCustomConnector';
 import type {
 	ConnectionTypes,
 	IConnection,
-	INode,
 	ITaskData,
 	INodeExecutionData,
 	NodeInputConnections,
@@ -16,7 +14,7 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 import { EVENT_CONNECTION_MOUSEOUT, EVENT_CONNECTION_MOUSEOVER } from '@jsplumb/browser-ui';
-import { useUIStore } from '@/stores';
+import { useUIStore } from '@/stores/ui.store';
 
 /*
 	Canvas constants and functions.
@@ -88,7 +86,7 @@ export const CONNECTOR_FLOWCHART_TYPE: ConnectorSpec = {
 };
 
 export const CONNECTOR_PAINT_STYLE_DEFAULT: PaintStyle = {
-	stroke: getStyleTokenValue('--color-foreground-dark', true),
+	stroke: 'var(--color-foreground-dark)',
 	strokeWidth: 2,
 	outlineWidth: 12,
 	outlineStroke: 'transparent',
@@ -96,12 +94,12 @@ export const CONNECTOR_PAINT_STYLE_DEFAULT: PaintStyle = {
 
 export const CONNECTOR_PAINT_STYLE_PULL: PaintStyle = {
 	...CONNECTOR_PAINT_STYLE_DEFAULT,
-	stroke: getStyleTokenValue('--color-foreground-xdark', true),
+	stroke: 'var(--color-foreground-xdark)',
 };
 
 export const CONNECTOR_PAINT_STYLE_PRIMARY = {
 	...CONNECTOR_PAINT_STYLE_DEFAULT,
-	stroke: getStyleTokenValue('--color-primary', true),
+	stroke: 'var(--color-primary)',
 };
 
 export const CONNECTOR_PAINT_STYLE_DATA: PaintStyle = {
@@ -109,10 +107,14 @@ export const CONNECTOR_PAINT_STYLE_DATA: PaintStyle = {
 	...{
 		dashstyle: '5 3',
 	},
-	stroke: getStyleTokenValue('--color-foreground-dark', true),
+	stroke: 'var(--color-foreground-dark)',
 };
 
-export const getConnectorColor = (type: ConnectionTypes): string => {
+export const getConnectorColor = (type: ConnectionTypes, category?: string): string => {
+	if (category === 'error') {
+		return '--node-error-output-color';
+	}
+
 	if (type === NodeConnectionType.Main) {
 		return '--node-type-main-color';
 	}
@@ -121,31 +123,40 @@ export const getConnectorColor = (type: ConnectionTypes): string => {
 };
 
 export const getConnectorPaintStylePull = (connection: Connection): PaintStyle => {
-	const connectorColor = getConnectorColor(connection.parameters.type as ConnectionTypes);
+	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: getStyleTokenValue(connectorColor, true) } : {}),
+		...(connectorColor ? { stroke: `var(${connectorColor})` } : {}),
 		...additionalStyles,
 	};
 };
 
 export const getConnectorPaintStyleDefault = (connection: Connection): PaintStyle => {
-	const connectorColor = getConnectorColor(connection.parameters.type as ConnectionTypes);
+	const connectorColor = getConnectorColor(
+		connection.parameters.type as ConnectionTypes,
+		connection.parameters.category,
+	);
 	return {
 		...CONNECTOR_PAINT_STYLE_DEFAULT,
-		...(connectorColor ? { stroke: getStyleTokenValue(connectorColor, true) } : {}),
+		...(connectorColor ? { stroke: `var(${connectorColor})` } : {}),
 	};
 };
 
-export const getConnectorPaintStyleData = (connection: Connection): PaintStyle => {
-	const connectorColor = getConnectorColor(connection.parameters.type as ConnectionTypes);
+export const getConnectorPaintStyleData = (
+	connection: Connection,
+	category?: string,
+): PaintStyle => {
+	const connectorColor = getConnectorColor(connection.parameters.type as ConnectionTypes, category);
 	return {
 		...CONNECTOR_PAINT_STYLE_DATA,
-		...(connectorColor ? { stroke: getStyleTokenValue(connectorColor, true) } : {}),
+		...(connectorColor ? { stroke: `var(${connectorColor})` } : {}),
 	};
 };
 
@@ -248,8 +259,8 @@ export const getInputEndpointStyle = (
 	return {
 		width,
 		height,
-		fill: getStyleTokenValue(color),
-		stroke: getStyleTokenValue(color),
+		fill: `var(${color})`,
+		stroke: `var(${color})`,
 		lineWidth: 0,
 	};
 };
@@ -271,9 +282,9 @@ export const getInputNameOverlay = (
 				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');
-				label.classList.add(`node-connection-type-${inputName}`);
 			}
 			return label;
 		},
@@ -285,13 +296,14 @@ export const getOutputEndpointStyle = (
 	color: string,
 ): PaintStyle => ({
 	strokeWidth: nodeTypeData && nodeTypeData.outputs.length > 2 ? 7 : 9,
-	fill: getStyleTokenValue(color, true),
+	fill: `var(${color})`,
 	outlineStroke: 'none',
 });
 
 export const getOutputNameOverlay = (
 	labelText: string,
 	outputName: ConnectionTypes,
+	category?: string,
 ): OverlaySpec => ({
 	type: 'Custom',
 	options: {
@@ -302,10 +314,15 @@ export const getOutputNameOverlay = (
 			label.innerHTML = labelText;
 			label.classList.add('node-output-endpoint-label');
 
-			label.setAttribute('data-endpoint-node-type', ep?.__meta?.nodeType);
+			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');
-				label.classList.add(`node-connection-type-${getScope(outputName)}`);
+			}
+			if (category) {
+				label.classList.add(`node-connection-category-${category}`);
 			}
 			return label;
 		},
@@ -318,14 +335,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 => {
@@ -495,6 +512,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,
@@ -566,7 +602,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`,
 		};
@@ -577,10 +613,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)`,
 		};
 	}
 
@@ -628,7 +663,7 @@ export const getOutputSummary = (
 	} = {};
 
 	data.forEach((run: ITaskData) => {
-		if (!run.data?.[connectionType]) {
+		if (!run?.data?.[connectionType]) {
 			return;
 		}
 
@@ -720,9 +755,15 @@ 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);
 	}
@@ -736,7 +777,7 @@ export const addConnectionOutputSuccess = (
 					const container = document.createElement('div');
 					const span = document.createElement('span');
 
-					container.classList.add('connection-run-items-label');
+					container.classList.add(...['connection-run-items-label', ...classNames]);
 					span.classList.add('floating');
 					span.innerHTML = getRunItemsLabel(output);
 					container.appendChild(span);
@@ -756,6 +797,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;
@@ -946,18 +1008,78 @@ export const getInputEndpointUUID = (
 	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;
+}
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 0000000000..664895ba8c
--- /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 0000000000..d29bd15866
--- /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 0f5c0fc95a..c1246d7040 100644
--- a/packages/editor-ui/src/utils/pairedItemUtils.ts
+++ b/packages/editor-ui/src/utils/pairedItemUtils.ts
@@ -1,6 +1,6 @@
 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';
 
 /*
 	Utility functions that provide shared functionalities used to add paired item support to nodes
@@ -23,15 +23,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 {
diff --git a/packages/editor-ui/src/utils/rbacUtils.ts b/packages/editor-ui/src/utils/rbacUtils.ts
new file mode 100644
index 0000000000..2608127992
--- /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 5fc1b5a1b8..7dbc780634 100644
--- a/packages/editor-ui/src/utils/sortUtils.ts
+++ b/packages/editor-ui/src/utils/sortUtils.ts
@@ -203,10 +203,11 @@ function getValue<T extends object>(obj: T, prop: string): unknown {
 
 	const segments = prop.split('.');
 
-	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/telemetryUtils.ts b/packages/editor-ui/src/utils/telemetryUtils.ts
index 9c0faaf4db..51063ab5b3 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';
 
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 0000000000..6c48ca8683
--- /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 0000000000..d91bb9b66f
--- /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 0000000000..96c8e7b247
--- /dev/null
+++ b/packages/editor-ui/src/utils/templates/templateActions.ts
@@ -0,0 +1,176 @@
+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';
+
+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: 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 0000000000..a1eba68c67
--- /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 0000000000..97484580db
--- /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 0000000000..b49301a856
--- /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 0000000000..bd0b4ae440
--- /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 0000000000..6a1e156063
--- /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/typesUtils.ts b/packages/editor-ui/src/utils/typesUtils.ts
index dbf3369d59..82b5e1d016 100644
--- a/packages/editor-ui/src/utils/typesUtils.ts
+++ b/packages/editor-ui/src/utils/typesUtils.ts
@@ -1,6 +1,7 @@
 import dateformat from 'dateformat';
 import type { IDataObject } from 'n8n-workflow';
 import { jsonParse } from 'n8n-workflow';
+import { isObject } from '@/utils/objectUtils';
 
 /*
 	Constants and utility functions than can be used to manipulate different data types and objects
@@ -10,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');
 }
diff --git a/packages/editor-ui/src/utils/userUtils.ts b/packages/editor-ui/src/utils/userUtils.ts
index a67d290353..237a8067d5 100644
--- a/packages/editor-ui/src/utils/userUtils.ts
+++ b/packages/editor-ui/src/utils/userUtils.ts
@@ -61,7 +61,6 @@ import {
 	CODE_NODE_TYPE,
 } from '@/constants';
 import type {
-	IPermissions,
 	IPersonalizationSurveyAnswersV1,
 	IPersonalizationSurveyAnswersV2,
 	IPersonalizationSurveyAnswersV3,
@@ -70,7 +69,6 @@ import type {
 	IUser,
 	ILogInStatus,
 	IRole,
-	IUserPermissions,
 } from '@/Interface';
 
 /*
@@ -86,9 +84,11 @@ function isPersonalizationSurveyV2OrLater(
 	return 'version' in data;
 }
 
-export const ROLE: { Owner: IRole; Member: IRole; Default: IRole } = {
+export type Roles = { [R in IRole as Capitalize<R>]: R };
+export const ROLE: Roles = {
 	Owner: 'owner',
 	Member: 'member',
+	Admin: 'admin',
 	Default: 'default', // default user with no email when setting up instance
 };
 
@@ -97,89 +97,6 @@ export const LOGIN_STATUS: { LoggedIn: ILogInStatus; LoggedOut: ILogInStatus } =
 	LoggedOut: 'LoggedOut', // Can only be logged out if UM has been setup
 };
 
-export const PERMISSIONS: IUserPermissions = {
-	TAGS: {
-		CAN_DELETE_TAGS: {
-			allow: {
-				role: [ROLE.Owner],
-			},
-		},
-	},
-	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],
-			},
-		},
-	},
-};
-
-/**
- * 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 function getPersonalizedNodeTypes(
 	answers:
 		| IPersonalizationSurveyAnswersV1
@@ -228,7 +145,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 +286,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 0000000000..d7891ff062
--- /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/views/AuthView.vue b/packages/editor-ui/src/views/AuthView.vue
index 4d3b7a473c..d159ba4486 100644
--- a/packages/editor-ui/src/views/AuthView.vue
+++ b/packages/editor-ui/src/views/AuthView.vue
@@ -10,7 +10,7 @@
 			<n8n-form-box
 				v-bind="form"
 				data-test-id="auth-form"
-				:buttonLoading="formLoading"
+				:button-loading="formLoading"
 				@secondaryClick="onSecondaryClick"
 				@submit="onSubmit"
 				@update="onUpdate"
diff --git a/packages/editor-ui/src/views/CanvasAddButton.vue b/packages/editor-ui/src/views/CanvasAddButton.vue
index 25174fdc5f..e3bc94a049 100644
--- a/packages/editor-ui/src/views/CanvasAddButton.vue
+++ b/packages/editor-ui/src/views/CanvasAddButton.vue
@@ -1,8 +1,8 @@
 <template>
 	<div
+		ref="container"
 		:class="$style.canvasAddButton"
 		:style="containerCssVars"
-		ref="container"
 		data-test-id="canvas-add-button"
 	>
 		<n8n-tooltip
@@ -12,7 +12,7 @@
 			:popper-class="$style.tooltip"
 			: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>
diff --git a/packages/editor-ui/src/views/ChangePasswordView.vue b/packages/editor-ui/src/views/ChangePasswordView.vue
index 8b22ba2f39..a7598a4697 100644
--- a/packages/editor-ui/src/views/ChangePasswordView.vue
+++ b/packages/editor-ui/src/views/ChangePasswordView.vue
@@ -2,7 +2,7 @@
 	<AuthView
 		v-if="config"
 		:form="config"
-		:formLoading="loading"
+		:form-loading="loading"
 		@submit="onSubmit"
 		@update="onInput"
 	/>
@@ -10,7 +10,7 @@
 
 <script lang="ts">
 import AuthView from '@/views/AuthView.vue';
-import { useToast } from '@/composables';
+import { useToast } from '@/composables/useToast';
 
 import { defineComponent } from 'vue';
 import type { IFormBoxConfig } from '@/Interface';
@@ -103,10 +103,8 @@ export default defineComponent({
 
 			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: {
diff --git a/packages/editor-ui/src/views/CredentialsView.vue b/packages/editor-ui/src/views/CredentialsView.vue
index 80d57af398..b1266a636d 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,11 +23,11 @@
 					class="mb-3xs"
 				/>
 				<n8n-select
-					:modelValue="filters.type"
+					ref="typeInput"
+					:model-value="filters.type"
 					size="medium"
 					multiple
 					filterable
-					ref="typeInput"
 					:class="$style['type-input']"
 					@update:modelValue="setKeyValue('type', $event)"
 				>
@@ -40,7 +40,7 @@
 				</n8n-select>
 			</div>
 		</template>
-	</resources-list-layout>
+	</ResourcesListLayout>
 </template>
 
 <script lang="ts">
@@ -56,7 +56,7 @@ 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';
+import { useExternalSecretsStore } from '@/stores/externalSecrets.ee.store';
 import { useSourceControlStore } from '@/stores/sourceControl.store';
 
 type IResourcesListLayoutInstance = InstanceType<typeof ResourcesListLayout>;
@@ -97,6 +97,23 @@ export default defineComponent({
 			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);
@@ -110,12 +127,9 @@ export default defineComponent({
 				this.credentialsStore.fetchAllCredentials(),
 				this.credentialsStore.fetchCredentialTypes(false),
 				this.externalSecretsStore.fetchAllSecrets(),
+				this.nodeTypesStore.loadNodeTypesIfNotLoaded(),
 			];
 
-			if (this.nodeTypesStore.allNodeTypes.length === 0) {
-				loadPromises.push(this.nodeTypesStore.getNodeTypes());
-			}
-
 			await Promise.all(loadPromises);
 
 			await this.usersStore.fetchUsers(); // Can be loaded in the background, used for filtering
@@ -146,23 +160,6 @@ export default defineComponent({
 			(this.$refs.layout as IResourcesListLayoutInstance).sendFiltersTelemetry(source);
 		},
 	},
-	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();
-	},
 });
 </script>
 
diff --git a/packages/editor-ui/src/views/ErrorView.vue b/packages/editor-ui/src/views/ErrorView.vue
index 26340fe264..8266d2bcc0 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>
diff --git a/packages/editor-ui/src/views/ForgotMyPasswordView.vue b/packages/editor-ui/src/views/ForgotMyPasswordView.vue
index 55ede7a05a..b04ef8e760 100644
--- a/packages/editor-ui/src/views/ForgotMyPasswordView.vue
+++ b/packages/editor-ui/src/views/ForgotMyPasswordView.vue
@@ -1,10 +1,10 @@
 <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 { useToast } from '@/composables';
+import { useToast } from '@/composables/useToast';
 
 import { defineComponent } from 'vue';
 import type { IFormBoxConfig } from '@/Interface';
@@ -88,14 +88,20 @@ export default defineComponent({
 				});
 			} 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
index 5aa8b29854..ccd2e23bd7 100644
--- a/packages/editor-ui/src/views/MfaView.vue
+++ b/packages/editor-ui/src/views/MfaView.vue
@@ -13,30 +13,30 @@
 			</div>
 			<div :class="[$style.formContainer, reportError ? $style.formError : '']">
 				<n8n-form-inputs
-					data-test-id="mfa-login-form"
 					v-if="formInputs"
+					data-test-id="mfa-login-form"
 					:inputs="formInputs"
-					:eventBus="formBus"
+					:event-bus="formBus"
 					@input="onInput"
 					@submit="onSubmit"
 				/>
 				<div :class="$style.infoBox">
 					<n8n-text
+						v-if="!showRecoveryCodeForm && !reportError"
 						size="small"
 						color="text-base"
 						:bold="false"
-						v-if="!showRecoveryCodeForm && !reportError"
 						>{{ $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 color="danger" v-if="reportError" size="small"
+					<n8n-text v-if="reportError" color="danger" size="small"
 						>{{ formError }}
 						<a
 							v-if="!showRecoveryCodeForm"
-							@click="onRecoveryCodeClick"
 							:class="$style.recoveryCodeLink"
+							@click="onRecoveryCodeClick"
 						>
 							{{ $locale.baseText('mfa.recovery.input.info.action') }}</a
 						>
@@ -69,7 +69,6 @@
 </template>
 
 <script lang="ts">
-import { genericHelpers } from '@/mixins/genericHelpers';
 import type { IFormInputs } from '@/Interface';
 import Logo from '../components/Logo.vue';
 import {
@@ -89,16 +88,12 @@ export const FORM = {
 
 export default defineComponent({
 	name: 'MfaView',
-	mixins: [genericHelpers],
 	components: {
 		Logo,
 	},
 	props: {
 		reportError: Boolean,
 	},
-	async mounted() {
-		this.formInputs = [this.mfaTokenFieldWithDefaults()];
-	},
 	setup() {
 		return {
 			...useToast(),
@@ -114,6 +109,9 @@ export default defineComponent({
 			formError: '',
 		};
 	},
+	async mounted() {
+		this.formInputs = [this.mfaTokenFieldWithDefaults()];
+	},
 	computed: {
 		...mapStores(useUsersStore),
 	},
@@ -179,7 +177,7 @@ export default defineComponent({
 				MFA_AUTHENTICATION_RECOVERY_CODE_INPUT_MAX_LENGTH,
 			);
 		},
-		formField(name: string, label: string, placeholder: string, maxlength: number) {
+		formField(name: string, label: string, placeholder: string, maxlength: number, focus = true) {
 			return {
 				name,
 				initialValue: '',
@@ -189,6 +187,7 @@ export default defineComponent({
 					maxlength,
 					capitalize: true,
 					validateOnBlur: false,
+					focusInitially: focus,
 				},
 			};
 		},
@@ -218,18 +217,10 @@ body {
 	justify-content: center;
 }
 
-.textContainer {
-	text-align: center;
-}
-
 .formContainer {
 	padding-bottom: var(--spacing-xl);
 }
 
-.qrContainer {
-	text-align: center;
-}
-
 .headerContainer {
 	text-align: center;
 	margin-bottom: var(--spacing-xl);
diff --git a/packages/editor-ui/src/views/NodeView.vue b/packages/editor-ui/src/views/NodeView.vue
index 76fac04a15..e611064c15 100644
--- a/packages/editor-ui/src/views/NodeView.vue
+++ b/packages/editor-ui/src/views/NodeView.vue
@@ -1,13 +1,14 @@
 <template>
 	<div :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"
@@ -15,8 +16,8 @@
 				@touchend="mouseUp"
 				@touchmove="mouseMoveNodeWorkflow"
 				@mousedown="mouseDown"
-				v-touch:tap="touchTap"
 				@mouseup="mouseUp"
+				@contextmenu="contextMenu.open"
 				@wheel="canvasStore.wheelScroll"
 			>
 				<div
@@ -27,71 +28,79 @@
 				/>
 				<div
 					id="node-view"
+					ref="nodeView"
 					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="showTriggerCreator(NODE_CREATOR_OPEN_SOURCES.TRIGGER_PLACEHOLDER_BUTTON)"
+						@hook:mounted="canvasStore.setRecenteredCanvasAddButtonPosition"
 					/>
-					<node
+					<Node
 						v-for="nodeData in nodesToRender"
-						@duplicateNode="duplicateNode"
+						: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"
 						@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="isReadOnlyRoute || readOnlyEnv"
-						: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
+					</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"
 						@deselectAllNodes="deselectAllNodes"
 						@deselectNode="nodeDeselectedByName"
 						@nodeSelected="nodeSelectedByName"
 						@removeNode="(name) => removeNode(name, true)"
-						:key="`${stickyData.id}_sticky`"
-						:name="stickyData.name"
-						:isReadOnly="isReadOnlyRoute || readOnlyEnv"
-						:instance="instance"
-						:isActive="!!activeNode && activeNode.name === stickyData.name"
-						:nodeViewScale="nodeViewScale"
-						:gridSize="GRID_SIZE"
-						:hideActions="pullConnActive"
 					/>
 				</div>
 			</div>
-			<node-details-view
-				:readOnly="isReadOnlyRoute || readOnlyEnv"
+			<NodeDetailsView
+				:read-only="isReadOnlyRoute || readOnlyEnv"
 				:renaming="renamingActive"
-				:isProductionExecutionPreview="isProductionExecutionPreview"
+				:is-production-execution-preview="isProductionExecutionPreview"
 				@redrawNode="redrawNode"
+				@switchSelectedNode="onSwitchSelectedNode"
 				@valueChanged="valueChanged"
 				@stopExecution="stopExecution"
 				@saveKeyboardShortcut="onSaveKeyboardShortcut"
 			/>
+			<Suspense>
+				<div :class="$style.setupCredentialsButtonWrapper">
+					<SetupWorkflowCredentialsButton />
+				</div>
+			</Suspense>
 			<Suspense>
 				<NodeCreation
 					v-if="!isReadOnlyRoute && !readOnlyEnv"
@@ -104,33 +113,41 @@
 			<Suspense>
 				<CanvasControls />
 			</Suspense>
-			<div class="workflow-execute-wrapper" v-if="!isReadOnlyRoute && !readOnlyEnv">
+			<Suspense>
+				<ContextMenu @action="onContextMenuAction" />
+			</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"
-					@click.stop="onOpenChat"
 					label="Chat"
 					size="large"
 					icon="comment"
 					type="primary"
 					data-test-id="workflow-chat-button"
+					@click.stop="onOpenChat"
 				/>
 
 				<n8n-icon-button
@@ -145,8 +162,8 @@
 							: $locale.baseText('nodeView.stopCurrentExecution')
 					"
 					:loading="stopExecutionInProgress"
-					@click.stop="stopExecution"
 					data-test-id="stop-execution-button"
+					@click.stop="stopExecution"
 				/>
 
 				<n8n-icon-button
@@ -156,8 +173,8 @@
 					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
@@ -171,8 +188,8 @@
 					:title="$locale.baseText('nodeView.deletesTheCurrentExecutionData')"
 					icon="trash"
 					size="large"
-					@click.stop="clearExecutionData"
 					data-test-id="clear-execution-data-button"
+					@click.stop="clearExecutionData"
 				/>
 			</div>
 		</div>
@@ -181,7 +198,7 @@
 
 <script lang="ts">
 import { defineAsyncComponent, defineComponent, nextTick } from 'vue';
-import { mapStores } from 'pinia';
+import { mapStores, storeToRefs } from 'pinia';
 
 import type {
 	Endpoint,
@@ -215,37 +232,41 @@ import {
 	STICKY_NODE_TYPE,
 	VIEWS,
 	WEBHOOK_NODE_TYPE,
+	FORM_TRIGGER_NODE_TYPE,
 	TRIGGER_NODE_CREATOR_VIEW,
 	EnterpriseEditionFeature,
 	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,
 } from '@/constants';
-import { copyPaste } from '@/mixins/copyPaste';
-import { externalHooks } from '@/mixins/externalHooks';
-import { genericHelpers } from '@/mixins/genericHelpers';
 import { moveNodeWorkflow } from '@/mixins/moveNodeWorkflow';
-import {
-	useGlobalLinkActions,
-	useCanvasMouseSelect,
-	useMessage,
-	useToast,
-	useTitleChange,
-	useExecutionDebugging,
-} from '@/composables';
+
+import useGlobalLinkActions from '@/composables/useGlobalLinkActions';
+import { useNodeHelpers } from '@/composables/useNodeHelpers';
+import useCanvasMouseSelect from '@/composables/useCanvasMouseSelect';
+import { useExecutionDebugging } from '@/composables/useExecutionDebugging';
+import { useTitleChange } from '@/composables/useTitleChange';
+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 { workflowHelpers } from '@/mixins/workflowHelpers';
 import { workflowRun } from '@/mixins/workflowRun';
 
 import NodeDetailsView from '@/components/NodeDetailsView.vue';
+import ContextMenu from '@/components/ContextMenu/ContextMenu.vue';
 import Node from '@/components/Node.vue';
 import Sticky from '@/components/Sticky.vue';
 import CanvasAddButton from './CanvasAddButton.vue';
+import KeyboardShortcutTooltip from '@/components/KeyboardShortcutTooltip.vue';
 import { v4 as uuid } from 'uuid';
 import type {
 	IConnection,
@@ -265,6 +286,7 @@ import type {
 	IWorkflowBase,
 	Workflow,
 	ConnectionTypes,
+	INodeOutputConfiguration,
 } from 'n8n-workflow';
 import {
 	deepCopy,
@@ -291,32 +313,33 @@ import type {
 	INodeUpdatePropertiesInformation,
 	NodeCreatorOpenSource,
 	AddedNodesAndConnections,
+	ToggleNodeCreatorOptions,
 } from '@/Interface';
 
-import { debounceHelper } from '@/mixins/debounce';
 import type { Route, RawLocation } from 'vue-router';
 import { dataPinningEventBus, nodeViewEventBus } from '@/event-bus';
-import {
-	useEnvironmentsStore,
-	useWorkflowsEEStore,
-	useCanvasStore,
-	useNodeCreatorStore,
-	useTagsStore,
-	useCredentialsStore,
-	useNodeTypesStore,
-	useTemplatesStore,
-	useSegment,
-	useNDVStore,
-	useRootStore,
-	useWorkflowsStore,
-	useUsersStore,
-	useSettingsStore,
-	useUIStore,
-	useHistoryStore,
-	useExternalSecretsStore,
-} 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 { getAccountAge } from '@/utils/userUtils';
+import { getConnectionInfo, getNodeViewTab } from '@/utils/canvasUtils';
 import {
 	AddConnectionCommand,
 	AddNodeCommand,
@@ -342,10 +365,20 @@ import {
 	N8nPlusEndpointType,
 	EVENT_PLUS_ENDPOINT_CLICK,
 } from '@/plugins/jsplumb/N8nPlusEndpointType';
-import { EVENT_ADD_INPUT_ENDPOINT_CLICK } from '@/plugins/jsplumb/N8nAddInputEndpointType';
+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';
 
 interface AddNodeOptions {
 	position?: XYPosition;
@@ -355,108 +388,31 @@ interface AddNodeOptions {
 
 const NodeCreation = defineAsyncComponent(async () => import('@/components/Node/NodeCreation.vue'));
 const CanvasControls = defineAsyncComponent(async () => import('@/components/CanvasControls.vue'));
+const SetupWorkflowCredentialsButton = defineAsyncComponent(
+	async () =>
+		import('@/components/SetupWorkflowCredentialsButton/SetupWorkflowCredentialsButton.vue'),
+);
 
 export default defineComponent({
 	name: 'NodeView',
-	mixins: [
-		copyPaste,
-		externalHooks,
-		genericHelpers,
-		moveNodeWorkflow,
-		workflowHelpers,
-		workflowRun,
-		debounceHelper,
-	],
 	components: {
 		NodeDetailsView,
 		Node,
 		Sticky,
 		CanvasAddButton,
+		KeyboardShortcutTooltip,
 		NodeCreation,
 		CanvasControls,
+		ContextMenu,
+		SetupWorkflowCredentialsButton,
 	},
-	setup(props) {
-		const locale = useI18n();
-
-		return {
-			locale,
-			...useCanvasMouseSelect(),
-			...useGlobalLinkActions(),
-			...useTitleChange(),
-			...useToast(),
-			...useMessage(),
-			...useUniqueNodeName(),
-			...useExecutionDebugging(),
-			// eslint-disable-next-line @typescript-eslint/no-misused-promises
-			...workflowRun.setup?.(props),
-		};
-	},
-	errorCaptured: (err, vm, info) => {
-		console.error('errorCaptured');
-		console.error(err);
-	},
-	watch: {
-		// Listen to route changes and load the workflow accordingly
-		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;
-
-			// When entering this tab:
-			if (currentTab === MAIN_HEADER_TABS.WORKFLOW || isOpeningTemplate) {
-				if (workflowChanged || nodeViewNotInitialized || isOpeningTemplate) {
-					this.startLoading();
-					if (nodeViewNotInitialized) {
-						const previousDirtyState = this.uiStore.stateIsDirty;
-						this.resetWorkspace();
-						this.uiStore.stateIsDirty = previousDirtyState;
-					}
-					await Promise.all([this.loadCredentials(), this.initView()]);
-					this.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) {
-				workflowChanged =
-					from.params.name !== to.params.name &&
-					!(to.params.name === 'new' && from.params.name === undefined);
-				if (workflowChanged) {
-					// This will trigger node view to update next time workflow tab is opened
-					this.uiStore.nodeViewInitialized = false;
-				}
-			}
-		},
-		activeNode() {
-			// When a node gets set as active deactivate the create-menu
-			this.createNodeActive = false;
-		},
-		containsTrigger(containsTrigger) {
-			// Re-center CanvasAddButton if there's no triggers
-			if (containsTrigger === false)
-				this.canvasStore.setRecenteredCanvasAddButtonPosition(this.getNodeViewOffsetPosition);
-		},
-		nodeViewScale(newScale) {
-			const elementRef = this.$refs.nodeView as HTMLDivElement | undefined;
-			if (elementRef) {
-				elementRef.style.transform = `scale(${newScale})`;
-			}
-		},
-	},
+	mixins: [moveNodeWorkflow, workflowHelpers, workflowRun],
 	async beforeRouteLeave(to, from, next) {
-		if (getNodeViewTab(to) === MAIN_HEADER_TABS.EXECUTIONS || from.name === VIEWS.TEMPLATE_IMPORT) {
+		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;
 		}
@@ -496,18 +452,119 @@ export default defineComponent({
 						},
 					);
 				} 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(props, ctx) {
+		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();
+
+		return {
+			locale,
+			contextMenu,
+			dataSchema,
+			nodeHelpers,
+			externalHooks,
+			clipboard,
+			pinnedData,
+			deviceSupport,
+			callDebounced,
+			...useCanvasMouseSelect(),
+			...useGlobalLinkActions(),
+			...useTitleChange(),
+			...useToast(),
+			...useMessage(),
+			...useUniqueNodeName(),
+			...useExecutionDebugging(),
+			// eslint-disable-next-line @typescript-eslint/no-misused-promises
+			...workflowRun.setup?.(props, ctx),
+		};
+	},
+	watch: {
+		// Listen to route changes and load the workflow accordingly
+		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;
+
+			// When entering this tab:
+			if (currentTab === MAIN_HEADER_TABS.WORKFLOW || isOpeningTemplate) {
+				if (workflowChanged || nodeViewNotInitialized || isOpeningTemplate) {
+					this.canvasStore.startLoading();
+					if (nodeViewNotInitialized) {
+						const previousDirtyState = this.uiStore.stateIsDirty;
+						this.resetWorkspace();
+						this.uiStore.stateIsDirty = previousDirtyState;
+					}
+					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) {
+				workflowChanged =
+					from.params.name !== to.params.name &&
+					!(to.params.name === 'new' && from.params.name === undefined);
+				if (workflowChanged) {
+					// This will trigger node view to update next time workflow tab is opened
+					this.uiStore.nodeViewInitialized = false;
+				}
+			}
+		},
+		activeNode() {
+			// When a node gets set as active deactivate the create-menu
+			this.createNodeActive = false;
+		},
+		containsTrigger(containsTrigger) {
+			// Re-center CanvasAddButton if there's no triggers
+			if (containsTrigger === false)
+				this.canvasStore.setRecenteredCanvasAddButtonPosition(this.getNodeViewOffsetPosition);
+		},
+		nodeViewScale(newScale) {
+			const elementRef = this.$refs.nodeView as HTMLDivElement | undefined;
+			if (elementRef) {
+				elementRef.style.transform = `scale(${newScale})`;
+			}
+		},
+	},
+	errorCaptured: (err, vm, info) => {
+		console.error('errorCaptured');
+		console.error(err);
+	},
 	computed: {
 		...mapStores(
 			useCanvasStore,
@@ -527,6 +584,9 @@ export default defineComponent({
 			useWorkflowsEEStore,
 			useHistoryStore,
 			useExternalSecretsStore,
+			useCollaborationStore,
+			usePushConnectionStore,
+			useSourceControlStore,
 		),
 		nativelyNumberSuffixedDefaults(): string[] {
 			return this.nodeTypesStore.nativelyNumberSuffixedDefaults;
@@ -544,9 +604,7 @@ export default defineComponent({
 			return this.$route.name === VIEWS.DEMO;
 		},
 		showCanvasAddButton(): boolean {
-			return (
-				this.loadingService === null && !this.containsTrigger && !this.isDemo && !this.readOnlyEnv
-			);
+			return !this.isLoading && !this.containsTrigger && !this.isDemo && !this.readOnlyEnv;
 		},
 		lastSelectedNode(): INodeUi | null {
 			return this.uiStore.getLastSelectedNode;
@@ -639,10 +697,18 @@ export default defineComponent({
 			return this.triggerNodes.length > 0;
 		},
 		containsChatNodes(): boolean {
-			return !!this.nodes.find(
-				(node) => node.type === MANUAL_CHAT_TRIGGER_NODE_TYPE && node.disabled !== true,
+			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 {
 			return !this.containsTrigger || this.allTriggersDisabled;
 		},
@@ -655,6 +721,18 @@ export default defineComponent({
 		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;
+		},
 	},
 	data() {
 		return {
@@ -680,6 +758,7 @@ export default defineComponent({
 			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>,
@@ -690,8 +769,236 @@ export default defineComponent({
 			suspendRecordingDetachedConnections: false,
 			NODE_CREATOR_OPEN_SOURCES,
 			eventsAttached: false,
+			unloadTimeout: undefined as undefined | ReturnType<typeof setTimeout>,
+			canOpenNDV: true,
+			hideNodeIssues: false,
 		};
 	},
+	async mounted() {
+		this.resetWorkspace();
+		this.canvasStore.initInstance(this.$refs.nodeView as HTMLElement);
+		this.titleReset();
+		window.addEventListener('message', this.onPostMessageReceived);
+
+		this.clipboard.onPaste.value = this.onClipboardPasteEvent;
+
+		this.canvasStore.startLoading();
+		const loadPromises = [
+			this.loadActiveWorkflows(),
+			this.loadCredentials(),
+			this.loadCredentialTypes(),
+			this.loadVariables(),
+			this.loadSecrets(),
+		];
+
+		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: async ({
+				connectiontype,
+				node,
+				creatorview,
+			}: {
+				connectiontype: NodeConnectionType;
+				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,
+						});
+					}
+				}, 0);
+			},
+		});
+
+		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();
+		}
+	},
+	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.resetWorkspace();
+		this.instance.unbind();
+		this.instance.destroy();
+		this.uiStore.stateIsDirty = false;
+		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: {
 		editAllowedCheck(): boolean {
 			if (this.readOnlyNotification?.visible) {
@@ -731,7 +1038,7 @@ export default defineComponent({
 				session_id: this.ndvStore.sessionId,
 			};
 			this.$telemetry.track('User clicked execute node button', telemetryPayload);
-			void this.$externalHooks().run('nodeView.onRunNode', telemetryPayload);
+			void this.externalHooks.run('nodeView.onRunNode', telemetryPayload);
 			void this.runWorkflow({ destinationNode: nodeName, source });
 		},
 		async onOpenChat() {
@@ -739,7 +1046,7 @@ export default defineComponent({
 				workflow_id: this.workflowsStore.workflowId,
 			};
 			this.$telemetry.track('User clicked chat open button', telemetryPayload);
-			void this.$externalHooks().run('nodeView.onOpenChat', telemetryPayload);
+			void this.externalHooks.run('nodeView.onOpenChat', telemetryPayload);
 			this.uiStore.openModal(WORKFLOW_LM_CHAT_MODAL_KEY);
 		},
 		async onRunWorkflow() {
@@ -752,10 +1059,46 @@ export default defineComponent({
 					),
 				};
 				this.$telemetry.track('User clicked execute workflow button', telemetryPayload);
-				void this.$externalHooks().run('nodeView.onRunWorkflow', telemetryPayload);
+				void this.externalHooks.run('nodeView.onRunWorkflow', telemetryPayload);
 			});
 
 			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;
@@ -786,11 +1129,20 @@ export default defineComponent({
 		},
 		clearExecutionData() {
 			this.workflowsStore.workflowExecutionData = null;
-			this.updateNodesExecutionIssues();
+			this.nodeHelpers.updateNodesExecutionIssues();
 		},
 		async onSaveKeyboardShortcut(e: KeyboardEvent) {
 			let saved = await this.saveCurrentWorkflow();
-			if (saved) await this.settingsStore.fetchPromptsData();
+			if (saved) {
+				await this.settingsStore.fetchPromptsData();
+
+				if (this.$route.name === VIEWS.EXECUTION_DEBUG) {
+					await this.$router.replace({
+						name: VIEWS.WORKFLOW,
+						params: { name: this.currentWorkflow },
+					});
+				}
+			}
 			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
@@ -814,7 +1166,7 @@ export default defineComponent({
 			this.onToggleNodeCreator({ source, createNodeActive: true });
 		},
 		async openExecution(executionId: string) {
-			this.startLoading();
+			this.canvasStore.startLoading();
 			this.resetWorkspace();
 			let data: IExecutionResponse | undefined;
 			try {
@@ -861,7 +1213,7 @@ export default defineComponent({
 			await this.$nextTick();
 			this.canvasStore.zoomToFit();
 			this.uiStore.stateIsDirty = false;
-			void this.$externalHooks().run('execution.open', {
+			void this.externalHooks.run('execution.open', {
 				workflowId: data.workflowData.id,
 				workflowName: data.workflowData.name,
 				executionId,
@@ -913,7 +1265,7 @@ export default defineComponent({
 					duration: 0,
 				});
 			}
-			this.stopLoading();
+			this.canvasStore.stopLoading();
 		},
 		async importWorkflowExact(data: { workflow: IWorkflowDataUpdate }) {
 			if (!data.workflow.nodes || !data.workflow.connections) {
@@ -927,13 +1279,12 @@ export default defineComponent({
 			if (data.workflow.pinData) {
 				this.workflowsStore.setWorkflowPinData(data.workflow.pinData);
 			}
-
 			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 = [];
@@ -941,7 +1292,7 @@ export default defineComponent({
 
 			let data: IWorkflowTemplate | undefined;
 			try {
-				void this.$externalHooks().run('template.requested', { templateId });
+				void this.externalHooks.run('template.requested', { templateId });
 				data = await this.templatesStore.getFixedWorkflowTemplate(templateId);
 
 				if (!data) {
@@ -957,24 +1308,37 @@ export default defineComponent({
 				return;
 			}
 
+			this.$telemetry.track(
+				'User inserted workflow template',
+				{
+					source: 'workflow',
+					template_id: templateId,
+					wf_template_repo_session_id: this.templatesStore.previousSessionId,
+				},
+				{
+					withPostHog: true,
+				},
+			);
+
 			this.blankRedirect = true;
 			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.workflowsStore.addToWorkflowMetadata({ templateId });
 			await this.$nextTick();
 			this.canvasStore.zoomToFit();
 			this.uiStore.stateIsDirty = true;
 
-			void 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;
 
@@ -987,6 +1351,7 @@ export default defineComponent({
 			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({
@@ -1017,7 +1382,7 @@ export default defineComponent({
 				this.uiStore.stateIsDirty = false;
 			}
 			this.canvasStore.zoomToFit();
-			void this.$externalHooks().run('workflow.open', {
+			void this.externalHooks.run('workflow.open', {
 				workflowId: workflow.id,
 				workflowName: workflow.name,
 			});
@@ -1027,10 +1392,11 @@ export default defineComponent({
 			} else {
 				this.workflowsStore.activeWorkflowExecution = 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);
 			}
 		},
@@ -1055,7 +1421,7 @@ export default defineComponent({
 			this.mouseUpMoveWorkflow(e);
 		},
 		keyUp(e: KeyboardEvent) {
-			if (e.key === this.controlKeyCode) {
+			if (e.key === this.deviceSupport.controlKeyCode) {
 				this.ctrlKeyPressed = false;
 			}
 			if (e.key === ' ') {
@@ -1063,7 +1429,15 @@ export default defineComponent({
 			}
 		},
 		async keyDown(e: KeyboardEvent) {
-			if (e.key === 's' && this.isCtrlKeyPressed(e)) {
+			this.contextMenu.close();
+
+			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();
 
@@ -1071,7 +1445,7 @@ export default defineComponent({
 					return;
 				}
 
-				void this.callDebounced('onSaveKeyboardShortcut', { debounceTime: 1000 }, e);
+				void this.callDebounced(this.onSaveKeyboardShortcut, { debounceTime: 1000 }, e);
 
 				return;
 			}
@@ -1096,10 +1470,10 @@ export default defineComponent({
 				return;
 			}
 
-			if (e.key === 'Escape') {
+			if (e.key === 'Escape' && noModifierKeys) {
 				this.createNodeActive = false;
 				if (this.activeNode) {
-					void this.$externalHooks().run('dataDisplay.nodeEditingFinished');
+					void this.externalHooks.run('dataDisplay.nodeEditingFinished');
 					this.ndvStore.activeNodeName = null;
 				}
 
@@ -1111,46 +1485,64 @@ export default defineComponent({
 				return;
 			}
 
-			if (e.key === 'd') {
-				void 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();
 
-				void 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.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.isReadOnlyRoute && !this.readOnlyEnv) {
+			} else if (e.key === 'F2' && noModifierKeys && !readOnly) {
 				const lastSelectedNode = this.lastSelectedNode;
 				if (lastSelectedNode !== null && lastSelectedNode.type !== STICKY_NODE_TYPE) {
 					void this.callDebounced(
-						'renameNodePrompt',
+						this.renameNodePrompt,
 						{ debounceTime: 1500 },
 						lastSelectedNode.name,
 					);
 				}
-			} else if (e.key === 'a' && this.isCtrlKeyPressed(e)) {
+			} else if (e.key === 'a' && ctrlModifier) {
 				// Select all nodes
 				e.stopPropagation();
 				e.preventDefault();
 
-				void this.callDebounced('selectAllNodes', { debounceTime: 1000 });
-			} else if (e.key === 'c' && this.isCtrlKeyPressed(e)) {
-				void 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();
 
-				void 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();
@@ -1168,7 +1560,7 @@ export default defineComponent({
 					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;
 
@@ -1181,13 +1573,15 @@ export default defineComponent({
 					}
 					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();
 
-				void 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) {
@@ -1203,19 +1597,21 @@ export default defineComponent({
 				}
 
 				void this.callDebounced(
-					'nodeSelectedByName',
+					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();
 
-				void 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) {
@@ -1235,13 +1631,13 @@ export default defineComponent({
 				}
 
 				void this.callDebounced(
-					'nodeSelectedByName',
+					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
@@ -1307,7 +1703,7 @@ export default defineComponent({
 
 				if (nextSelectNode !== null) {
 					void this.callDebounced(
-						'nodeSelectedByName',
+						this.nodeSelectedByName,
 						{ debounceTime: 100 },
 						nextSelectNode,
 						false,
@@ -1317,23 +1713,47 @@ export default defineComponent({
 			}
 		},
 
-		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();
@@ -1421,18 +1841,19 @@ export default defineComponent({
 			}
 		},
 
-		cutSelectedNodes() {
+		cutNodes(nodes: INode[]) {
 			const deleteCopiedNodes = !this.isReadOnlyRoute && !this.readOnlyEnv;
-			this.copySelectedNodes(deleteCopiedNodes);
+			this.copyNodes(nodes, deleteCopiedNodes);
 			if (deleteCopiedNodes) {
-				this.deleteSelectedNodes();
+				this.deleteNodes(nodes);
 			}
 		},
 
-		copySelectedNodes(isCut: boolean) {
-			void 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,
@@ -1445,7 +1866,7 @@ export default defineComponent({
 
 				const nodeData = JSON.stringify(workflowToCopy, null, 2);
 
-				this.copyToClipboard(nodeData);
+				this.clipboard.copy(nodeData);
 				if (data.nodes.length > 0) {
 					if (!isCut) {
 						this.showMessage({
@@ -1470,10 +1891,6 @@ export default defineComponent({
 			try {
 				this.stopExecutionInProgress = true;
 				await this.workflowsStore.stopCurrentExecution(executionId);
-				this.showMessage({
-					title: this.$locale.baseText('nodeView.showMessage.stopExecutionTry.title'),
-					type: 'success',
-				});
 			} catch (error) {
 				// Execution stop might fail when the execution has already finished. Let's treat this here.
 				const execution = await this.workflowsStore.getExecution(executionId);
@@ -1554,7 +1971,7 @@ export default defineComponent({
 		/**
 		 * 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;
 			}
@@ -1574,17 +1991,17 @@ export default defineComponent({
 					}
 
 					const importConfirm = await this.confirm(
-						this.$locale.baseText('nodeView.confirmMessage.receivedCopyPasteData.message', {
+						this.$locale.baseText('nodeView.confirmMessage.onClipboardPasteEvent.message', {
 							interpolate: { plainTextData },
 						}),
-						this.$locale.baseText('nodeView.confirmMessage.receivedCopyPasteData.headline'),
+						this.$locale.baseText('nodeView.confirmMessage.onClipboardPasteEvent.headline'),
 						{
 							type: 'warning',
 							confirmButtonText: this.$locale.baseText(
-								'nodeView.confirmMessage.receivedCopyPasteData.confirmButtonText',
+								'nodeView.confirmMessage.onClipboardPasteEvent.confirmButtonText',
 							),
 							cancelButtonText: this.$locale.baseText(
-								'nodeView.confirmMessage.receivedCopyPasteData.cancelButtonText',
+								'nodeView.confirmMessage.onClipboardPasteEvent.cancelButtonText',
 							),
 							dangerouslyUseHTMLString: true,
 						},
@@ -1622,18 +2039,18 @@ export default defineComponent({
 		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.canvasStore.stopLoading();
 				this.showError(
 					error,
 					this.$locale.baseText('nodeView.showError.getWorkflowDataFromUrl.title'),
 				);
 				return;
 			}
-			this.stopLoading();
+			this.canvasStore.stopLoading();
 
 			return workflowData;
 		},
@@ -1674,6 +2091,8 @@ export default defineComponent({
 					});
 				}
 
+				this.removeUnknownCredentials(workflowData);
+
 				const currInstanceId = this.rootStore.instanceId;
 
 				const nodeGraph = JSON.stringify(
@@ -1690,6 +2109,11 @@ export default defineComponent({
 						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,
@@ -1718,10 +2142,6 @@ export default defineComponent({
 					});
 				});
 
-				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();
@@ -1752,11 +2172,31 @@ export default defineComponent({
 					}, []);
 
 					this.workflowsStore.addWorkflowTagIds(tagIds);
+					setTimeout(() => {
+						this.addPinDataConnections(this.workflowsStore.pinnedWorkflowData || ({} as IPinData));
+					});
 				}
 			} catch (error) {
 				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();
 		},
@@ -1970,29 +2410,51 @@ export default defineComponent({
 					this.canvasStore.newNodeInsertPosition = null;
 				} else {
 					let yOffset = 0;
+					const workflow = this.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];
+							}
 						}
 					}
 
-					const workflow = this.getCurrentWorkflow();
-					const workflowNode = workflow.getNode(newNodeData.name);
-					const outputs = NodeHelpers.getNodeOutputs(workflow, workflowNode!, nodeTypeData);
+					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,
@@ -2000,7 +2462,10 @@ export default defineComponent({
 					);
 
 					// If node has only scoped outputs, position it below the last selected node
-					if (outputTypes.every((outputName) => outputName !== NodeConnectionType.Main)) {
+					if (
+						outputTypes.length > 0 &&
+						outputTypes.every((outputName) => outputName !== NodeConnectionType.Main)
+					) {
 						const lastSelectedNodeWorkflow = workflow.getNode(lastSelectedNode.name);
 						const lastSelectedInputs = NodeHelpers.getNodeInputs(
 							workflow,
@@ -2025,6 +2490,7 @@ export default defineComponent({
 							[100, 0],
 						);
 					} else {
+						// Has only main outputs or no outputs at all
 						const inputs = NodeHelpers.getNodeInputs(
 							workflow,
 							lastSelectedNode,
@@ -2076,10 +2542,11 @@ export default defineComponent({
 					workflow_id: this.workflowsStore.workflowId,
 				});
 			} else {
-				void 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,
@@ -2265,36 +2732,21 @@ export default defineComponent({
 			}
 			this.historyStore.stopRecordingUndo();
 		},
-		insertNodeAfterSelected(info: {
-			sourceId: string;
-			index: number;
-			eventSource: NodeCreatorOpenSource;
-			connection?: Connection;
-			nodeCreatorView?: string;
-			outputType?: NodeConnectionType;
-			endpointUuid?: string;
-		}) {
-			const type = info.outputType || NodeConnectionType.Main;
-
+		getNodeCreatorFilter(nodeName: string, outputType?: NodeConnectionType) {
 			let filter;
-			// Get the node and set it as active that new nodes
-			// which get created get automatically connected
-			// to it.
-			const sourceNode = this.workflowsStore.getNodeById(info.sourceId);
-			if (!sourceNode) {
-				return;
-			}
-
 			const workflow = this.getCurrentWorkflow();
+			const workflowNode = workflow.getNode(nodeName);
+			if (!workflowNode) return { nodes: [] };
 
-			const nodeType = this.nodeTypesStore.getNodeType(sourceNode.type, sourceNode.typeVersion);
-
+			const nodeType = this.nodeTypesStore.getNodeType(
+				workflowNode?.type,
+				workflowNode.typeVersion,
+			);
 			if (nodeType) {
-				const workflowNode = workflow.getNode(sourceNode.name);
-				const inputs = NodeHelpers.getNodeInputs(workflow, workflowNode!, nodeType);
+				const inputs = NodeHelpers.getNodeInputs(workflow, workflowNode, nodeType);
 
 				const filterFound = inputs.filter((input) => {
-					if (typeof input === 'string' || input.type !== info.outputType || !input.filter) {
+					if (typeof input === 'string' || input.type !== outputType || !input.filter) {
 						// No filters defined or wrong connection type
 						return false;
 					}
@@ -2307,6 +2759,26 @@ export default defineComponent({
 				}
 			}
 
+			return filter;
+		},
+		insertNodeAfterSelected(info: {
+			sourceId: string;
+			index: number;
+			eventSource: NodeCreatorOpenSource;
+			connection?: Connection;
+			nodeCreatorView?: string;
+			outputType?: NodeConnectionType;
+			endpointUuid?: string;
+		}) {
+			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.
+			const sourceNode = this.workflowsStore.getNodeById(info.sourceId);
+			if (!sourceNode) {
+				return;
+			}
+
 			this.uiStore.lastSelectedNode = sourceNode.name;
 			this.uiStore.lastSelectedNodeEndpointUuid =
 				info.endpointUuid ?? info.connection?.target.jtk?.endpoint.uuid;
@@ -2331,32 +2803,43 @@ export default defineComponent({
 
 			if (isScopedConnection) {
 				useViewStacks()
-					.gotoCompatibleConnectionView(type, isOutput, filter)
+					.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;
+						NodeViewUtils.resetConnectionAfterPull(connection);
+						await this.$nextTick();
 
 						this.connectTwoNodes(
 							sourceNodeName,
 							outputIndex,
-							this.pullConnActiveNodeName,
-							0,
-							NodeConnectionType.Main,
+							targetNodeName,
+							overrideTargetEndpoint?.parameters?.index ?? 0,
+							connectionType,
 						);
 						this.pullConnActiveNodeName = null;
-						this.dropPrevented = true;
+						this.dropPrevented = false;
 					}
 					return;
 				}
@@ -2510,10 +2993,6 @@ export default defineComponent({
 
 				this.dropPrevented = true;
 				this.workflowsStore.addConnection({ connection: connectionData });
-				this.uiStore.stateIsDirty = true;
-				if (!this.suspendRecordingDetachedConnections) {
-					this.historyStore.pushCommandToUndo(new AddConnectionCommand(connectionData));
-				}
 
 				if (!this.isReadOnlyRoute && !this.readOnlyEnv) {
 					NodeViewUtils.hideOutputNameLabel(info.sourceEndpoint);
@@ -2532,15 +3011,6 @@ export default defineComponent({
 							});
 						},
 					);
-					setTimeout(() => {
-						NodeViewUtils.addConnectionTestData(
-							info.source,
-							info.target,
-							'canvas' in info.connection.connector
-								? (info.connection.connector.canvas as HTMLElement)
-								: undefined,
-						);
-					}, 0);
 
 					const endpointArrow = NodeViewUtils.getOverlay(
 						info.connection,
@@ -2548,17 +3018,56 @@ export default defineComponent({
 					);
 					if (sourceInfo.type !== NodeConnectionType.Main) {
 						// Not "main" connections get a different connection style
-						info.connection.setPaintStyle(getConnectorPaintStyleData(info.connection));
+						info.connection.setPaintStyle(
+							getConnectorPaintStyleData(info.connection, info.sourceEndpoint.parameters.category),
+						);
 						endpointArrow?.setVisible(false);
 					}
 				}
 				this.dropPrevented = false;
-				void this.updateNodesInputIssues();
+				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);
 			}
 		},
+		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);
@@ -2582,6 +3091,7 @@ export default defineComponent({
 				}
 
 				if (
+					// eslint-disable-next-line no-constant-binary-expression
 					this.isReadOnlyRoute ??
 					this.readOnlyEnv ??
 					this.enterTimer ??
@@ -2615,6 +3125,7 @@ export default defineComponent({
 				}
 
 				if (
+					// eslint-disable-next-line no-constant-binary-expression
 					this.isReadOnlyRoute ??
 					this.readOnlyEnv ??
 					!connection ??
@@ -2696,6 +3207,8 @@ export default defineComponent({
 					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));
@@ -2704,7 +3217,7 @@ export default defineComponent({
 						sourceNodeName,
 						outputIndex,
 						this.pullConnActiveNodeName,
-						0,
+						overrideTargetEndpoint?.parameters?.index ?? 0,
 						NodeConnectionType.Main,
 					);
 					this.pullConnActiveNodeName = null;
@@ -2721,7 +3234,7 @@ export default defineComponent({
 					this.historyStore.pushCommandToUndo(removeCommand);
 				}
 
-				void this.updateNodesInputIssues();
+				void this.nodeHelpers.updateNodesInputIssues();
 			} catch (e) {
 				console.error(e);
 			}
@@ -2734,58 +3247,86 @@ export default defineComponent({
 				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;
 
-					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);
-							if (node) {
-								const nodeType = this.nodeTypesStore.getNodeType(node.type, node.typeVersion);
+							if (element.classList.contains('jtk-floating-endpoint')) {
+								return false;
+							}
+							const isEndpointIntersect = NodeViewUtils.isElementIntersection(element, e, 50);
+							const isNodeElementIntersect = NodeViewUtils.isElementIntersection(
+								endpoint.element,
+								e,
+								30,
+							);
 
-								const workflow = this.getCurrentWorkflow();
-								const workflowNode = workflow.getNode(nodeName);
-								const inputs = NodeHelpers.getNodeInputs(workflow, workflowNode!, nodeType);
+							if (isEndpointIntersect || isNodeElementIntersect) {
+								const node = this.workflowsStore.getNodeById(endpoint.parameters.nodeId);
 
-								if (nodeType && inputs.length === 1) {
-									this.pullConnActiveNodeName = node.name;
-									const endpointUUID = this.getInputEndpointUUID(
-										nodeName,
-										connection.parameters.type,
-										0,
-									);
-									if (endpointUUID) {
-										const endpoint = this.instance?.getEndpoint(endpointUUID);
+								if (node) {
+									const nodeType = this.nodeTypesStore.getNodeType(node.type, node.typeVersion);
 
-										NodeViewUtils.showDropConnectionState(connection, endpoint);
+									if (!nodeType) return false;
 
-										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 (!intersecting) {
+							// 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 (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;
 					}
@@ -2913,22 +3454,32 @@ export default defineComponent({
 
 			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 = [];
@@ -2940,7 +3491,7 @@ export default defineComponent({
 			this.uiStore.nodeViewInitialized = true;
 			this.historyStore.reset();
 			this.workflowsStore.activeWorkflowExecution = null;
-			this.stopLoading();
+			this.canvasStore.stopLoading();
 		},
 		async tryToAddWelcomeSticky(): Promise<void> {
 			this.canvasStore.zoomToFit();
@@ -3010,6 +3561,7 @@ export default defineComponent({
 								},
 								{
 									withPostHog: true,
+									withAppCues: true,
 								},
 							);
 						}
@@ -3025,6 +3577,10 @@ export default defineComponent({
 			document.addEventListener('keyup', this.keyUp);
 
 			window.addEventListener('beforeunload', this.onBeforeUnload);
+			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,
@@ -3150,83 +3706,13 @@ export default defineComponent({
 				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?.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();
-
-				const localizedName = this.locale.localizeNodeName(newNodeData.name, newNodeData.type);
-
-				newNodeData.name = this.uniqueNodeName(localizedName);
-
-				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,
-				});
-			}
+			const workflowData = deepCopy(await this.getNodesToSave(nodes));
+			await this.importWorkflowData(workflowData, 'duplicate', false);
 		},
 		getJSPlumbConnection(
 			sourceNodeName: string,
@@ -3333,9 +3819,24 @@ export default defineComponent({
 			data: ITaskData[] | null;
 			waiting: boolean;
 		}) {
-			const pinData = this.workflowsStore.getPinData;
+			const pinData = this.workflowsStore.pinnedWorkflowData;
 
-			if (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);
@@ -3457,7 +3958,7 @@ export default defineComponent({
 					is_welcome_note: node.name === QUICKSTART_NOTE_NAME,
 				});
 			} else {
-				void 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,
@@ -3538,6 +4039,9 @@ export default defineComponent({
 				}, recordingTimeout);
 			}
 		},
+		async onSwitchSelectedNode(nodeName: string) {
+			this.nodeSelectedByName(nodeName, true, true);
+		},
 		async redrawNode(nodeName: string) {
 			// TODO: Improve later
 			// For now we redraw the node by simply renaming it. Can for sure be
@@ -3710,7 +4214,7 @@ export default defineComponent({
 			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.
@@ -3758,67 +4262,74 @@ export default defineComponent({
 					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);
-
 				this.workflowsStore.addNode(node);
 				if (trackHistory) {
 					this.historyStore.pushCommandToUndo(new AddNodeCommand(node));
 				}
 			});
 
-			// Wait for the node to be rendered
+			// 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;
-							}
-							outwardConnections.forEach((targetData) => {
-								connectionData = [
-									{
-										node: sourceNode,
-										type,
-										index: sourceIndex,
-									},
-									{
-										node: targetData.node,
-										type: targetData.type,
-										index: targetData.index,
-									},
-								] as [IConnection, IConnection];
-
-								this.__addConnection(connectionData);
-							});
-						}
-					}
-				}
+			if (connections) {
+				await this.addConnections(connections);
 			}
-
 			// Add the node issues at the end as the node-connections are required
-			void this.refreshNodeIssues();
+			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) => {
+								batchedConnectionData.push([
+									{ node: sourceNode, type, index: sourceIndex },
+									{ node: targetData.node, type: targetData.type, index: targetData.index },
+								]);
+							});
+						}
+					});
+				}
+			}
+
+			// 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
@@ -3934,6 +4445,30 @@ export default defineComponent({
 				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(
@@ -3951,21 +4486,43 @@ export default defineComponent({
 				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) {
+			for (const node of nodes) {
 				nodeData = this.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
@@ -4020,6 +4577,7 @@ export default defineComponent({
 
 			this.onToggleNodeCreator({ createNodeActive: false });
 			this.nodeCreatorStore.setShowScrim(false);
+			this.canvasStore.resetZoom();
 
 			// Reset nodes
 			this.unbindEndpointEventListeners();
@@ -4076,17 +4634,22 @@ export default defineComponent({
 
 			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) {
@@ -4111,6 +4674,8 @@ export default defineComponent({
 						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) {
@@ -4158,6 +4723,7 @@ export default defineComponent({
 					NodeViewUtils.addConnectionOutputSuccess(connection, {
 						total: pinData[nodeName].length,
 						iterations: 0,
+						classNames: ['pinned'],
 					});
 				});
 			});
@@ -4206,7 +4772,7 @@ export default defineComponent({
 			}
 
 			if (createNodeActive) this.nodeCreatorStore.setOpenSource(source);
-			void this.$externalHooks().run('nodeView.createNodeActiveChanged', {
+			void this.externalHooks.run('nodeView.createNodeActiveChanged', {
 				source,
 				mode,
 				createNodeActive,
@@ -4253,6 +4819,23 @@ export default defineComponent({
 					NodeConnectionType.Main,
 				);
 			}
+
+			const lastAddedNode = this.nodes[this.nodes.length - 1];
+			const workflow = this.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)],
+					});
+				});
+			}
 		},
 
 		async saveCurrentWorkflowExternal(callback: () => void) {
@@ -4301,13 +4884,13 @@ export default defineComponent({
 		onRevertEnableToggle({ nodeName, isDisabled }: { nodeName: string; isDisabled: boolean }) {
 			const node = this.workflowsStore.getNodeByName(nodeName);
 			if (node) {
-				this.disableNodes([node]);
+				this.nodeHelpers.disableNodes([node]);
 			}
 		},
 		onPageShow(e: PageTransitionEvent) {
 			// Page was restored from the bfcache (back-forward cache)
 			if (e.persisted) {
-				this.stopLoading();
+				this.canvasStore.stopLoading();
 			}
 		},
 		readOnlyEnvRouteCheck() {
@@ -4332,6 +4915,49 @@ export default defineComponent({
 				}
 			}
 		},
+		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,
+					});
+					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;
+			}
+		},
 	},
 	async onSourceControlPull() {
 		let workflowId = null as string | null;
@@ -4354,176 +4980,6 @@ export default defineComponent({
 			console.error(error);
 		}
 	},
-	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(),
-			this.loadSecrets(),
-		];
-
-		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.stopLoading();
-
-			setTimeout(() => {
-				void 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
-		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.readOnlyEnvRouteCheck();
-	},
-	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);
-	},
-	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.resetWorkspace();
-		this.instance.unbind();
-		this.instance.destroy();
-		this.uiStore.stateIsDirty = false;
-		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);
-	},
 });
 </script>
 
@@ -4579,7 +5035,7 @@ export default defineComponent({
 	align-items: center;
 	left: 50%;
 	transform: translateX(-50%);
-	bottom: var(--spacing-2xl);
+	bottom: var(--spacing-l);
 	width: auto;
 
 	@media (max-width: $breakpoint-2xs) {
@@ -4635,14 +5091,14 @@ export default defineComponent({
 				&.connection-drag-scope-active-connection-target {
 					// Apply style to compatible output endpoints
 					.diamond-output-endpoint[data-jtk-scope-#{$node-type}='true'] {
-						transform: scale(1.375) rotate(45deg);
+						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(-4px, -4px) scale(1.375);
+								transform: translate(-5px, -5px) scale(1.5);
 							}
 						}
 
@@ -4664,7 +5120,7 @@ export default defineComponent({
 					// Apply style to dragged compatible output endpoint
 					.diamond-output-endpoint[data-jtk-scope-#{$node-type}='true'] {
 						&.jtk-dragging {
-							transform: scale(1.375) rotate(45deg);
+							transform: scale(1.5) rotate(45deg);
 						}
 
 						// Apply style to non-dragged compatible input endpoints
@@ -4676,7 +5132,7 @@ export default defineComponent({
 					// Apply style to compatible output endpoints
 					.add-input-endpoint[data-jtk-scope-#{$node-type}='true'] {
 						.add-input-endpoint-default {
-							transform: translate(-4px, -4px) scale(1.375);
+							transform: translate(-5px, -5px) scale(1.5);
 						}
 					}
 
@@ -4780,4 +5236,43 @@ export default defineComponent({
 		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>
diff --git a/packages/editor-ui/src/views/SamlOnboarding.vue b/packages/editor-ui/src/views/SamlOnboarding.vue
index af6b11ac64..e003d5e457 100644
--- a/packages/editor-ui/src/views/SamlOnboarding.vue
+++ b/packages/editor-ui/src/views/SamlOnboarding.vue
@@ -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 5e71ab630b..a039562013 100644
--- a/packages/editor-ui/src/views/SettingsApiView.vue
+++ b/packages/editor-ui/src/views/SettingsApiView.vue
@@ -32,7 +32,7 @@
 			</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>
@@ -42,7 +42,7 @@
 						:value="apiKey"
 						:copy-button-text="$locale.baseText('generic.clickToCopy')"
 						:toast-title="$locale.baseText('settings.api.view.copy.toast')"
-						:redactValue="true"
+						:redact-value="true"
 						@copy="onCopy"
 					/>
 				</div>
@@ -54,7 +54,7 @@
 					}}
 				</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'}`,
@@ -64,15 +64,16 @@
 			</div>
 		</div>
 		<n8n-action-box
-			v-else-if="isTrialing"
+			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')"
-			:buttonText="$locale.baseText('settings.api.trial.upgradePlan.cta')"
+			:button-text="$locale.baseText('settings.api.trial.upgradePlan.cta')"
 			@click:button="onUpgrade"
 		/>
 		<n8n-action-box
 			v-else-if="mounted && !isLoadingCloudPlans"
-			:buttonText="
+			:button-text="
 				$locale.baseText(
 					loading ? 'settings.api.create.button.loading' : 'settings.api.create.button',
 				)
@@ -86,7 +87,8 @@
 <script lang="ts">
 import { defineComponent } from 'vue';
 import type { IUser } from '@/Interface';
-import { useToast, useMessage } from '@/composables';
+import { useToast } from '@/composables/useToast';
+import { useMessage } from '@/composables/useMessage';
 
 import CopyInput from '@/components/CopyInput.vue';
 import { mapStores } from 'pinia';
@@ -119,6 +121,8 @@ export default defineComponent({
 		};
 	},
 	mounted() {
+		if (!this.isPublicApiEnabled) return;
+
 		void this.getApiKey();
 		const baseUrl = this.rootStore.baseUrl;
 		const apiPath = this.settingsStore.publicApiPath;
@@ -139,6 +143,9 @@ export default defineComponent({
 		isLoadingCloudPlans(): boolean {
 			return this.cloudPlanStore.state.loadingPlan;
 		},
+		isPublicApiEnabled(): boolean {
+			return this.settingsStore.isPublicApiEnabled;
+		},
 	},
 	methods: {
 		onUpgrade() {
diff --git a/packages/editor-ui/src/views/SettingsAuditLogs.vue b/packages/editor-ui/src/views/SettingsAuditLogs.vue
index 926fc481ff..35664c0286 100644
--- a/packages/editor-ui/src/views/SettingsAuditLogs.vue
+++ b/packages/editor-ui/src/views/SettingsAuditLogs.vue
@@ -1,6 +1,7 @@
 <script lang="ts" setup>
-import { useI18n } from '@/composables';
-import { useUIStore, useAuditLogsStore } from '@/stores';
+import { useI18n } from '@/composables/useI18n';
+import { useAuditLogsStore } from '@/stores/auditLogs.store';
+import { useUIStore } from '@/stores/ui.store';
 
 const locale = useI18n();
 const uiStore = useUIStore();
@@ -25,7 +26,7 @@ const goToUpgrade = () => {
 			data-test-id="audit-logs-content-unlicensed"
 			:class="$style.actionBox"
 			:description="locale.baseText('settings.auditLogs.actionBox.description')"
-			:buttonText="locale.baseText('settings.auditLogs.actionBox.buttonText')"
+			:button-text="locale.baseText('settings.auditLogs.actionBox.buttonText')"
 			@click:button="goToUpgrade"
 		>
 			<template #heading>
diff --git a/packages/editor-ui/src/views/SettingsCommunityNodesView.vue b/packages/editor-ui/src/views/SettingsCommunityNodesView.vue
index f90f30eba6..5ced100732 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"
+				: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>
@@ -59,7 +59,7 @@ import {
 	COMMUNITY_NODES_NPM_INSTALLATION_URL,
 } from '@/constants';
 import CommunityPackageCard from '@/components/CommunityPackageCard.vue';
-import { useToast } from '@/composables';
+import { useToast } from '@/composables/useToast';
 import { pushConnection } from '@/mixins/pushConnection';
 import type { PublicInstalledPackage } from 'n8n-workflow';
 
@@ -68,20 +68,24 @@ import { useUIStore } from '@/stores/ui.store';
 import { mapStores } from 'pinia';
 import { useSettingsStore } from '@/stores/settings.store';
 import { defineComponent } from 'vue';
+import { useExternalHooks } from '@/composables/useExternalHooks';
 
 const PACKAGE_COUNT_THRESHOLD = 31;
 
 export default defineComponent({
 	name: 'SettingsCommunityNodesView',
-	mixins: [pushConnection],
 	components: {
 		CommunityPackageCard,
 	},
-	setup(props) {
+	mixins: [pushConnection],
+	setup(props, ctx) {
+		const externalHooks = useExternalHooks();
+
 		return {
+			externalHooks,
 			...useToast(),
 			// eslint-disable-next-line @typescript-eslint/no-misused-promises
-			...pushConnection.setup?.(props),
+			...pushConnection.setup?.(props, ctx),
 		};
 	},
 	data() {
@@ -91,7 +95,7 @@ export default defineComponent({
 	},
 	async mounted() {
 		// 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();
 
 		try {
 			this.loading = true;
@@ -137,7 +141,7 @@ export default defineComponent({
 		}
 	},
 	beforeUnmount() {
-		this.pushDisconnect();
+		this.pushStore.pushDisconnect();
 	},
 	computed: {
 		...mapStores(useCommunityNodesStore, useSettingsStore, useUIStore),
@@ -222,10 +226,7 @@ export default defineComponent({
 			};
 			this.$telemetry.track('user clicked cnr install button', telemetryPayload);
 
-			void 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
index c0237273d7..886d70250c 100644
--- a/packages/editor-ui/src/views/SettingsExternalSecrets.vue
+++ b/packages/editor-ui/src/views/SettingsExternalSecrets.vue
@@ -1,7 +1,8 @@
 <script lang="ts" setup>
 import { useUIStore } from '@/stores/ui.store';
-import { useI18n, useMessage, useToast } from '@/composables';
-import { useExternalSecretsStore } from '@/stores';
+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';
@@ -9,7 +10,6 @@ import type { ExternalSecretsProvider } from '@/Interface';
 const i18n = useI18n();
 const uiStore = useUIStore();
 const externalSecretsStore = useExternalSecretsStore();
-const message = useMessage();
 const toast = useToast();
 
 const sortedProviders = computed(() => {
@@ -55,7 +55,7 @@ function goToUpgrade() {
 			v-else
 			class="mt-2xl mb-l"
 			data-test-id="external-secrets-content-unlicensed"
-			:buttonText="i18n.baseText('settings.externalSecrets.actionBox.buttonText')"
+			:button-text="i18n.baseText('settings.externalSecrets.actionBox.buttonText')"
 			@click="goToUpgrade"
 		>
 			<template #heading>
diff --git a/packages/editor-ui/src/views/SettingsFakeDoorView.vue b/packages/editor-ui/src/views/SettingsFakeDoorView.vue
index 5973c1d4a3..b1b089b01b 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">
diff --git a/packages/editor-ui/src/views/SettingsLdapView.vue b/packages/editor-ui/src/views/SettingsLdapView.vue
index 814ad93a13..f0feb38239 100644
--- a/packages/editor-ui/src/views/SettingsLdapView.vue
+++ b/packages/editor-ui/src/views/SettingsLdapView.vue
@@ -6,12 +6,12 @@
 			</n8n-heading>
 		</div>
 
-		<n8n-info-tip type="note" theme="info" 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')"
+			:button-text="$locale.baseText('settings.ldap.disabled.buttonText')"
 			@click:button="goToUpgrade"
 		>
 			<template #heading>
@@ -36,9 +36,9 @@
 					v-if="formInputs"
 					ref="ldapConfigForm"
 					:inputs="formInputs"
-					:eventBus="formBus"
-					:columnView="true"
-					verticalSpacing="l"
+					:event-bus="formBus"
+					:column-view="true"
+					vertical-spacing="l"
 					@update="onInput"
 					@ready="onReadyToSubmit"
 					@submit="onSubmit"
@@ -71,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
@@ -142,8 +139,10 @@
 
 <script lang="ts">
 import { defineComponent } from 'vue';
-import { convertToDisplayDate } from '@/utils';
-import { useToast, useMessage } from '@/composables';
+import { capitalizeFirstLetter } from '@/utils/htmlUtils';
+import { convertToDisplayDate } from '@/utils/typesUtils';
+import { useToast } from '@/composables/useToast';
+import { useMessage } from '@/composables/useMessage';
 import type {
 	ILdapConfig,
 	ILdapSyncData,
@@ -156,12 +155,11 @@ import { MODAL_CONFIRM } from '@/constants';
 
 import humanizeDuration from 'humanize-duration';
 import { ElTable, ElTableColumn } from 'element-plus';
-import { capitalizeFirstLetter } from '@/utils';
 import InfiniteLoading from 'v3-infinite-loading';
 import { mapStores } from 'pinia';
 import { useUsersStore } from '@/stores/users.store';
 import { useSettingsStore } from '@/stores/settings.store';
-import { useUIStore } from '@/stores';
+import { useUIStore } from '@/stores/ui.store';
 import { createEventBus } from 'n8n-design-system/utils';
 import type { N8nFormInputs } from 'n8n-design-system';
 import type { CellStyle } from 'element-plus';
@@ -217,7 +215,7 @@ export default defineComponent({
 			return this.usersStore.currentUser;
 		},
 		isLDAPFeatureEnabled(): boolean {
-			return this.settingsStore.settings.enterprise.ldap === true;
+			return this.settingsStore.settings.enterprise.ldap;
 		},
 	},
 	methods: {
@@ -304,7 +302,7 @@ export default defineComponent({
 			let saveForm = true;
 
 			try {
-				if (this.adConfig.loginEnabled === true && newConfiguration.loginEnabled === false) {
+				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'),
@@ -399,11 +397,11 @@ export default defineComponent({
 				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',
@@ -484,7 +482,7 @@ export default defineComponent({
 							required: false,
 						},
 						shouldDisplay(values): boolean {
-							return values['connectionSecurity'] !== 'none' && values['loginEnabled'] === true;
+							return values.connectionSecurity !== 'none' && values.loginEnabled === true;
 						},
 					},
 					{
@@ -683,7 +681,7 @@ export default defineComponent({
 				this.showError(error, this.$locale.baseText('settings.ldap.configurationError'));
 			}
 		},
-		async getLdapSynchronizations(state: any) {
+		async getLdapSynchronizations(state: { loaded: () => void; complete: () => void }) {
 			try {
 				this.loadingTable = true;
 				const data = await this.settingsStore.getLdapSynchronizations({
diff --git a/packages/editor-ui/src/views/SettingsLogStreamingView.vue b/packages/editor-ui/src/views/SettingsLogStreamingView.vue
index 18058742ff..94f622ba82 100644
--- a/packages/editor-ui/src/views/SettingsLogStreamingView.vue
+++ b/packages/editor-ui/src/views/SettingsLogStreamingView.vue
@@ -19,30 +19,30 @@
 			</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>
 			<div v-else data-test-id="action-box-licensed">
 				<n8n-action-box
-					:buttonText="$locale.baseText(`settings.log-streaming.add`)"
+					:button-text="$locale.baseText(`settings.log-streaming.add`)"
 					@click:button="addDestination"
 				>
 					<template #heading>
@@ -60,7 +60,7 @@
 			<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')"
+					:button-text="$locale.baseText('settings.log-streaming.actionBox.button')"
 					@click:button="goToUpgrade"
 				>
 					<template #heading>
@@ -76,13 +76,13 @@
 import { defineComponent, nextTick } from 'vue';
 import { mapStores } from 'pinia';
 import { v4 as uuid } from 'uuid';
-import { useWorkflowsStore } from '../stores/workflows.store';
-import { useUsersStore } from '../stores/users.store';
-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 { 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 EventDestinationCard from '@/components/SettingsLogStreaming/EventDestinationCard.ee.vue';
@@ -90,23 +90,21 @@ import { createEventBus } from 'n8n-design-system/utils';
 
 export default defineComponent({
 	name: 'SettingsLogStreamingView',
-	props: {},
 	components: {
 		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();
@@ -141,7 +139,6 @@ export default defineComponent({
 			useLogStreamingStore,
 			useWorkflowsStore,
 			useUIStore,
-			useUsersStore,
 			useCredentialsStore,
 		),
 		sortedItemKeysByLabel() {
@@ -155,9 +152,12 @@ export default defineComponent({
 			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() {
diff --git a/packages/editor-ui/src/views/SettingsPersonalView.vue b/packages/editor-ui/src/views/SettingsPersonalView.vue
index 90bf36a1aa..3627c390af 100644
--- a/packages/editor-ui/src/views/SettingsPersonalView.vue
+++ b/packages/editor-ui/src/views/SettingsPersonalView.vue
@@ -9,14 +9,14 @@
 					<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">{{
 					i18n.baseText('settings.personal.basicInformation')
 				}}</n8n-heading>
@@ -25,7 +25,7 @@
 				<n8n-form-inputs
 					v-if="formInputs"
 					:inputs="formInputs"
-					:eventBus="formBus"
+					:event-bus="formBus"
 					@update="onInput"
 					@ready="onReadyToSubmit"
 					@submit="onSubmit"
@@ -33,20 +33,19 @@
 			</div>
 		</div>
 		<div v-if="!signInWithLdap && !signInWithSaml">
-			<div :class="$style.sectionHeader">
+			<div class="mb-s">
 				<n8n-heading size="large">{{ i18n.baseText('settings.personal.security') }}</n8n-heading>
 			</div>
-			<div>
+			<div class="mb-s">
 				<n8n-input-label :label="i18n.baseText('auth.password')">
-					<n8n-link @click="openPasswordModal" data-test-id="change-password-link">{{
+					<n8n-link data-test-id="change-password-link" @click="openPasswordModal">{{
 						i18n.baseText('auth.changePassword')
 					}}</n8n-link>
 				</n8n-input-label>
 			</div>
 			<div v-if="isMfaFeatureEnabled">
-				<div :class="$style.mfaSection">
-					<n8n-input-label :label="$locale.baseText('settings.personal.mfa.section.title')">
-					</n8n-input-label>
+				<div class="mb-xs">
+					<n8n-input-label :label="$locale.baseText('settings.personal.mfa.section.title')" />
 					<n8n-text :bold="false" :class="$style.infoText">
 						{{
 							mfaDisabled
@@ -58,26 +57,49 @@
 						</n8n-link>
 					</n8n-text>
 				</div>
-				<div :class="$style.mfaButtonContainer" v-if="mfaDisabled">
-					<n8n-button
-						:class="$style.button"
-						float="left"
-						type="tertiary"
-						:label="$locale.baseText('settings.personal.mfa.button.enabled')"
-						data-test-id="enable-mfa-button"
-						@click="onMfaEnableClick"
-					/>
-				</div>
-				<div v-else>
-					<n8n-button
-						:class="$style.disableMfaButton"
-						float="left"
-						type="tertiary"
-						:label="$locale.baseText('settings.personal.mfa.button.disabled')"
-						data-test-id="disable-mfa-button"
-						@click="onMfaDisableClick"
-					/>
-				</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:modelValue="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>
@@ -94,8 +116,9 @@
 </template>
 
 <script lang="ts">
-import { useI18n, useToast } from '@/composables';
-import type { IFormInputs, IUser } from '@/Interface';
+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';
@@ -121,6 +144,20 @@ export default defineComponent({
 			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() {
@@ -173,7 +210,7 @@ export default defineComponent({
 			return this.currentUser?.signInType === 'ldap';
 		},
 		isLDAPFeatureEnabled(): boolean {
-			return this.settingsStore.settings.enterprise.ldap === true;
+			return this.settingsStore.settings.enterprise.ldap;
 		},
 		signInWithSaml(): boolean {
 			return (
@@ -186,8 +223,14 @@ export default defineComponent({
 		isMfaFeatureEnabled(): boolean {
 			return this.settingsStore.isMfaFeatureEnabled;
 		},
+		currentTheme(): ThemeOption {
+			return this.uiStore.theme;
+		},
 	},
 	methods: {
+		selectTheme(theme: ThemeOption) {
+			this.uiStore.setTheme(theme);
+		},
 		onInput() {
 			this.hasAnyChanges = true;
 		},
@@ -283,7 +326,6 @@ export default defineComponent({
 
 .disableMfaButton {
 	--button-color: var(--color-danger);
-	margin-top: var(--spacing-2xs);
 	> span {
 		font-weight: var(--font-weight-bold);
 	}
@@ -296,21 +338,12 @@ export default defineComponent({
 	}
 }
 
-.mfaSection {
-	margin-top: var(--spacing-l);
-}
-
 .infoText {
 	font-size: var(--font-size-2xs);
 	color: var(--color-text-light);
 }
 
-.sectionHeader {
-	margin-top: var(--spacing-2xl);
-	margin-bottom: var(--spacing-s);
-}
-
-.mfaButtonContainer {
-	margin-top: var(--spacing-2xs);
+.themeSelect {
+	max-width: 50%;
 }
 </style>
diff --git a/packages/editor-ui/src/views/SettingsSourceControl.vue b/packages/editor-ui/src/views/SettingsSourceControl.vue
index b4c73644be..2326b7a619 100644
--- a/packages/editor-ui/src/views/SettingsSourceControl.vue
+++ b/packages/editor-ui/src/views/SettingsSourceControl.vue
@@ -2,8 +2,12 @@
 import { computed, reactive, ref, onMounted } from 'vue';
 import type { Rule, RuleGroup } from 'n8n-design-system/types';
 import { MODAL_CONFIRM } from '@/constants';
-import { useUIStore, useSourceControlStore } from '@/stores';
-import { useToast, useMessage, useLoadingService, useI18n } from '@/composables';
+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';
@@ -126,7 +130,7 @@ const repoUrlValidationRules: Array<Rule | RuleGroup> = [
 		name: 'MATCH_REGEX',
 		config: {
 			regex:
-				/^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_.\-\/]+)*$/,
+				/^(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'),
 		},
 	},
@@ -205,25 +209,25 @@ const onSelectSshKeyType = async (sshKeyType: TupleToUnion<SshKeyTypes>) => {
 				<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"
-						id="repoUrl"
 						name="repoUrl"
-						validateOnBlur
-						:validationRules="repoUrlValidationRules"
+						validate-on-blur
+						:validation-rules="repoUrlValidationRules"
 						:disabled="isConnected"
 						:placeholder="locale.baseText('settings.sourceControl.repoUrlPlaceholder')"
-						v-model="sourceControlStore.preferences.repositoryUrl"
 						@validate="(value) => onValidate('repoUrl', value)"
 					/>
 					<n8n-button
+						v-if="isConnected"
 						:class="$style.disconnectButton"
 						type="tertiary"
-						v-if="isConnected"
-						@click="onDisconnect"
 						size="large"
 						icon="trash"
 						data-test-id="source-control-disconnect-button"
+						@click="onDisconnect"
 						>{{ locale.baseText('settings.sourceControl.button.disconnect') }}</n8n-button
 					>
 				</div>
@@ -233,16 +237,16 @@ const onSelectSshKeyType = async (sshKeyType: TupleToUnion<SshKeyTypes>) => {
 				<div :class="{ [$style.sshInput]: !isConnected }">
 					<n8n-form-input
 						v-if="!isConnected"
+						id="keyGeneratorType"
 						:class="$style.sshKeyTypeSelect"
 						label
 						type="select"
-						id="keyGeneratorType"
 						name="keyGeneratorType"
 						data-test-id="source-control-ssh-key-type-select"
-						validateOnBlur
-						:validationRules="keyGeneratorTypeValidationRules"
+						validate-on-blur
+						:validation-rules="keyGeneratorTypeValidationRules"
 						:options="sourceControlStore.sshKeyTypesWithLabel"
-						:modelValue="sourceControlStore.preferences.keyGeneratorType"
+						:model-value="sourceControlStore.preferences.keyGeneratorType"
 						@validate="(value) => onValidate('keyGeneratorType', value)"
 						@update:modelValue="onSelectSshKeyType"
 					/>
@@ -258,8 +262,8 @@ const onSelectSshKeyType = async (sshKeyType: TupleToUnion<SshKeyTypes>) => {
 						size="large"
 						type="tertiary"
 						icon="sync"
-						@click="refreshSshKey"
 						data-test-id="source-control-refresh-ssh-key-button"
+						@click="refreshSshKey"
 					>
 						{{ locale.baseText('settings.sourceControl.refreshSshKey') }}
 					</n8n-button>
@@ -278,11 +282,11 @@ const onSelectSshKeyType = async (sshKeyType: TupleToUnion<SshKeyTypes>) => {
 			</div>
 			<n8n-button
 				v-if="!isConnected"
-				@click="onConnect"
 				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">
@@ -294,16 +298,16 @@ const onSelectSshKeyType = async (sshKeyType: TupleToUnion<SshKeyTypes>) => {
 					<label>{{ locale.baseText('settings.sourceControl.branches') }}</label>
 					<div :class="$style.branchSelection">
 						<n8n-form-input
+							id="branchName"
 							label
 							type="select"
-							id="branchName"
 							name="branchName"
 							class="mb-s"
 							data-test-id="source-control-branch-select"
-							validateOnBlur
-							:validationRules="branchNameValidationRules"
+							validate-on-blur
+							:validation-rules="branchNameValidationRules"
 							:options="branchNameOptions"
-							:modelValue="sourceControlStore.preferences.branchName"
+							:model-value="sourceControlStore.preferences.branchName"
 							@validate="(value) => onValidate('branchName', value)"
 							@update:modelValue="onSelect"
 						/>
@@ -319,8 +323,8 @@ const onSelectSshKeyType = async (sshKeyType: TupleToUnion<SshKeyTypes>) => {
 								icon="sync"
 								square
 								:class="$style.refreshBranches"
-								@click="refreshBranches"
 								data-test-id="source-control-refresh-branches-button"
+								@click="refreshBranches"
 							/>
 						</n8n-tooltip>
 					</div>
@@ -338,15 +342,15 @@ const onSelectSshKeyType = async (sshKeyType: TupleToUnion<SshKeyTypes>) => {
 				<div :class="$style.group">
 					<label>{{ locale.baseText('settings.sourceControl.color') }}</label>
 					<div>
-						<n8n-color-picker size="small" v-model="sourceControlStore.preferences.branchColor" />
+						<n8n-color-picker v-model="sourceControlStore.preferences.branchColor" size="small" />
 					</div>
 				</div>
 				<div :class="[$style.group, 'pt-s']">
 					<n8n-button
-						@click="onSave"
 						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>
@@ -357,7 +361,7 @@ const onSelectSshKeyType = async (sshKeyType: TupleToUnion<SshKeyTypes>) => {
 			data-test-id="source-control-content-unlicensed"
 			:class="$style.actionBox"
 			:description="locale.baseText('settings.sourceControl.actionBox.description')"
-			:buttonText="locale.baseText('settings.sourceControl.actionBox.buttonText')"
+			:button-text="locale.baseText('settings.sourceControl.actionBox.buttonText')"
 			@click:button="goToUpgrade"
 		>
 			<template #heading>
diff --git a/packages/editor-ui/src/views/SettingsSso.vue b/packages/editor-ui/src/views/SettingsSso.vue
index f4374968f5..674499944f 100644
--- a/packages/editor-ui/src/views/SettingsSso.vue
+++ b/packages/editor-ui/src/views/SettingsSso.vue
@@ -3,7 +3,11 @@ 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, useMessage, useToast } from '@/composables';
+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',
@@ -11,6 +15,8 @@ const IdentityProviderSettingsType = {
 };
 
 const i18n = useI18n();
+const telemetry = useTelemetry();
+const rootStore = useRootStore();
 const ssoStore = useSSOStore();
 const uiStore = useUIStore();
 const message = useMessage();
@@ -98,6 +104,12 @@ const onSave = async () => {
 				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;
@@ -184,7 +196,7 @@ onMounted(async () => {
 			<div :class="$style.group">
 				<label>{{ i18n.baseText('settings.sso.settings.ips.label') }}</label>
 				<div class="mt-2xs mb-s">
-					<n8n-radio-buttons :options="ipsOptions" v-model="ipsType" />
+					<n8n-radio-buttons v-model="ipsType" :options="ipsOptions" />
 				</div>
 				<div v-show="ipsType === IdentityProviderSettingsType.URL">
 					<n8n-input
@@ -202,15 +214,15 @@ onMounted(async () => {
 				</div>
 			</div>
 			<div :class="$style.buttons">
-				<n8n-button :disabled="!isSaveEnabled" @click="onSave" size="large" data-test-id="sso-save">
+				<n8n-button :disabled="!isSaveEnabled" size="large" data-test-id="sso-save" @click="onSave">
 					{{ i18n.baseText('settings.sso.settings.save') }}
 				</n8n-button>
 				<n8n-button
 					:disabled="!isTestEnabled"
 					size="large"
 					type="tertiary"
-					@click="onTest"
 					data-test-id="sso-test"
+					@click="onTest"
 				>
 					{{ i18n.baseText('settings.sso.settings.test') }}
 				</n8n-button>
@@ -224,7 +236,7 @@ onMounted(async () => {
 			data-test-id="sso-content-unlicensed"
 			:class="$style.actionBox"
 			:description="i18n.baseText('settings.sso.actionBox.description')"
-			:buttonText="i18n.baseText('settings.sso.actionBox.buttonText')"
+			:button-text="i18n.baseText('settings.sso.actionBox.buttonText')"
 			@click:button="goToUpgrade"
 		>
 			<template #heading>
diff --git a/packages/editor-ui/src/views/SettingsUsageAndPlan.vue b/packages/editor-ui/src/views/SettingsUsageAndPlan.vue
index 5c755a62b2..8f69d39a9d 100644
--- a/packages/editor-ui/src/views/SettingsUsageAndPlan.vue
+++ b/packages/editor-ui/src/views/SettingsUsageAndPlan.vue
@@ -5,9 +5,11 @@ 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';
+import { useUIStore } from '@/stores/ui.store';
 import { N8N_PRICING_PAGE_URL } from '@/constants';
-import { useToast } from '@/composables';
+import { useToast } from '@/composables/useToast';
+import { ROLE } from '@/utils/userUtils';
+import { hasPermission } from '@/rbac/permissions';
 
 const usageStore = useUsageStore();
 const route = useRoute();
@@ -26,6 +28,12 @@ const activationKeyModal = ref(false);
 const activationKey = ref('');
 const activationKeyInput = ref<HTMLInputElement | null>(null);
 
+const canUserActivateLicense = computed(() =>
+	hasPermission(['role'], {
+		role: [ROLE.Owner],
+	}),
+);
+
 const showActivationSuccess = () => {
 	toast.showMessage({
 		type: 'success',
@@ -77,7 +85,7 @@ onMounted(async () => {
 		}
 	}
 	try {
-		if (!route.query.key && usageStore.canUserActivateLicense) {
+		if (!route.query.key && canUserActivateLicense.value) {
 			await usageStore.refreshLicenseManagementToken();
 		} else {
 			await usageStore.getLicenseInfo();
@@ -133,7 +141,7 @@ const openPricingPage = () => {
 			:class="$style.actionBox"
 			:heading="locale.baseText('settings.usageAndPlan.desktop.title')"
 			:description="locale.baseText('settings.usageAndPlan.desktop.description')"
-			:buttonText="locale.baseText('settings.usageAndPlan.button.plans')"
+			:button-text="locale.baseText('settings.usageAndPlan.button.plans')"
 			@click:button="openPricingPage"
 		/>
 		<div v-if="!usageStore.isDesktop && !usageStore.isLoading">
@@ -182,20 +190,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.prevent="onViewPlans" size="large">
+				<n8n-button v-else size="large" @click.prevent="onViewPlans">
 					<a :href="viewPlansUrl" target="_blank">{{
 						locale.baseText('settings.usageAndPlan.button.plans')
 					}}</a>
@@ -203,13 +211,13 @@ const openPricingPage = () => {
 			</div>
 
 			<el-dialog
+				v-model="activationKeyModal"
 				width="480px"
 				top="0"
-				@closed="onDialogClosed"
-				@opened="onDialogOpened"
-				v-model="activationKeyModal"
 				:title="locale.baseText('settings.usageAndPlan.dialog.activation.title')"
 				:modal-class="$style.center"
+				@closed="onDialogClosed"
+				@opened="onDialogOpened"
 			>
 				<template #default>
 					<n8n-input
@@ -219,7 +227,7 @@ const openPricingPage = () => {
 					/>
 				</template>
 				<template #footer>
-					<n8n-button @click="activationKeyModal = false" type="secondary">
+					<n8n-button type="secondary" @click="activationKeyModal = false">
 						{{ locale.baseText('settings.usageAndPlan.dialog.activation.cancel') }}
 					</n8n-button>
 					<n8n-button @click="onLicenseActivation">
@@ -232,7 +240,7 @@ const openPricingPage = () => {
 </template>
 
 <style lang="scss" module>
-@import '@/styles/css-animation-helpers.scss';
+@import '@/styles/variables';
 
 .center > div {
 	justify-content: center;
@@ -262,7 +270,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 {
@@ -319,13 +327,6 @@ 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>
diff --git a/packages/editor-ui/src/views/SettingsUsersView.vue b/packages/editor-ui/src/views/SettingsUsersView.vue
index 7cbfcb7be4..53095882e4 100644
--- a/packages/editor-ui/src/views/SettingsUsersView.vue
+++ b/packages/editor-ui/src/views/SettingsUsersView.vue
@@ -2,7 +2,7 @@
 	<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>
@@ -11,9 +11,9 @@
 						<n8n-button
 							: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>
@@ -29,30 +29,57 @@
 						uiStore.contextBasedTranslationKeys.users.settings.unavailable.description,
 					)
 				"
-				:buttonText="
+				:button-text="
 					$locale.baseText(uiStore.contextBasedTranslationKeys.users.settings.unavailable.button)
 				"
 				@click:button="goToUpgrade"
 			/>
 		</div>
+		<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
-			:class="$style.usersContainer"
 			v-if="settingsStore.isBelowUserQuota || usersStore.allUsers.length > 1"
+			:class="$style.usersContainer"
 		>
 			<n8n-users-list
 				:actions="usersListActions"
 				:users="usersStore.allUsers"
-				:currentUserId="usersStore.currentUserId"
-				:isSamlLoginEnabled="ssoStore.isSamlLoginEnabled"
+				:current-user-id="usersStore.currentUserId"
+				:is-saml-login-enabled="ssoStore.isSamlLoginEnabled"
 				@delete="onDelete"
 				@reinvite="onReinvite"
 				@copyInviteLink="onCopyInviteLink"
 				@copyPasswordResetLink="onCopyPasswordResetLink"
 				@allowSSOManualLogin="onAllowSSOManualLogin"
 				@disallowSSOManualLogin="onDisallowSSOManualLogin"
-			/>
+			>
+				<template #actions="{ user }">
+					<n8n-select
+						v-if="user.id !== usersStore.currentUserId"
+						:model-value="user?.globalRole?.name || 'member'"
+						:disabled="!canUpdateRole"
+						data-test-id="user-role-select"
+						@update:modelValue="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>
@@ -62,25 +89,30 @@ import { defineComponent } from 'vue';
 import { mapStores } from 'pinia';
 import { EnterpriseEditionFeature, INVITE_USER_MODAL_KEY, VIEWS } from '@/constants';
 
-import type { IUser, IUserListAction } from '@/Interface';
-import { useToast } from '@/composables';
-import { copyPaste } from '@/mixins/copyPaste';
+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 { ROLE } from '@/utils/userUtils';
+import { useClipboard } from '@/composables/useClipboard';
+import type { UpdateGlobalRolePayload } from '@/api/users';
 
 export default defineComponent({
 	name: 'SettingsUsersView',
-	mixins: [copyPaste],
 	setup() {
+		const clipboard = useClipboard();
+
 		return {
+			clipboard,
 			...useToast(),
 		};
 	},
 	async mounted() {
-		if (!this.usersStore.showUMSetupWarning) {
+		if (!this.showUMSetupWarning) {
 			await this.usersStore.fetchUsers();
 		}
 	},
@@ -89,6 +121,9 @@ export default defineComponent({
 		isSharingEnabled() {
 			return this.settingsStore.isEnterpriseFeatureEnabled(EnterpriseEditionFeature.Sharing);
 		},
+		showUMSetupWarning() {
+			return hasPermission(['defaultUser']);
+		},
 		usersListActions(): IUserListAction[] {
 			return [
 				{
@@ -108,11 +143,18 @@ export default defineComponent({
 				{
 					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: () => this.settingsStore.isBelowUserQuota,
+					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'),
@@ -128,6 +170,27 @@ export default defineComponent({
 				},
 			];
 		},
+		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() {
@@ -137,22 +200,27 @@ export default defineComponent({
 			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?.globalRole) {
+				if (!['admin', 'member'].includes(user.globalRole.name)) {
+					throw new Error('Invalid role name on reinvite');
+				}
 				try {
-					await this.usersStore.reinviteUser({ id: user.id });
-
+					await this.usersStore.reinviteUser({
+						email: user.email,
+						role: user.globalRole.name 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) {
@@ -161,9 +229,9 @@ export default defineComponent({
 			}
 		},
 		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({
 					type: 'success',
@@ -173,10 +241,10 @@ export default defineComponent({
 			}
 		},
 		async onCopyPasswordResetLink(userId: string) {
-			const user = this.usersStore.getUserById(userId) as IUser | null;
+			const user = this.usersStore.getUserById(userId);
 			if (user) {
 				const url = await this.usersStore.getUserPasswordResetLink(user);
-				this.copyToClipboard(url.link);
+				void this.clipboard.copy(url.link);
 
 				this.showToast({
 					type: 'success',
@@ -186,7 +254,7 @@ export default defineComponent({
 			}
 		},
 		async onAllowSSOManualLogin(userId: string) {
-			const user = this.usersStore.getUserById(userId) as IUser | null;
+			const user = this.usersStore.getUserById(userId);
 			if (user) {
 				if (!user.settings) {
 					user.settings = {};
@@ -202,7 +270,7 @@ export default defineComponent({
 			}
 		},
 		async onDisallowSSOManualLogin(userId: string) {
-			const user = this.usersStore.getUserById(userId) as IUser | null;
+			const user = this.usersStore.getUserById(userId);
 			if (user?.settings) {
 				user.settings.allowSSOManualLogin = false;
 				await this.usersStore.updateOtherUserSettings(userId, user.settings);
@@ -216,6 +284,12 @@ export default defineComponent({
 		goToUpgrade() {
 			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 });
+		},
 	},
 });
 </script>
diff --git a/packages/editor-ui/src/views/SetupView.vue b/packages/editor-ui/src/views/SetupView.vue
index 536451b850..fb50f2cb0c 100644
--- a/packages/editor-ui/src/views/SetupView.vue
+++ b/packages/editor-ui/src/views/SetupView.vue
@@ -1,7 +1,7 @@
 <template>
 	<AuthView
 		:form="FORM_CONFIG"
-		:formLoading="loading"
+		:form-loading="loading"
 		data-test-id="setup-form"
 		@submit="onSubmit"
 	/>
@@ -11,7 +11,7 @@
 import AuthView from './AuthView.vue';
 import { defineComponent } from 'vue';
 
-import { useToast } from '@/composables';
+import { useToast } from '@/composables/useToast';
 import type { IFormBoxConfig } from '@/Interface';
 import { VIEWS } from '@/constants';
 import { mapStores } from 'pinia';
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 0000000000..a640b49f9d
--- /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 0000000000..59e5c01481
--- /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 0000000000..bac25e13ba
--- /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 0000000000..1869070eb4
--- /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 0000000000..dd6f18d4d3
--- /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 0000000000..aafff75971
--- /dev/null
+++ b/packages/editor-ui/src/views/SetupWorkflowFromTemplateView/__tests__/setupTemplate.store.testData.ts
@@ -0,0 +1,125 @@
+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(),
+	nodesAccess: [],
+	...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',
+	nodesAccess: [
+		{
+			nodeType: 'n8n-nodes-base.telegram',
+			date: new Date('2023-11-23T14:26:07.962Z'),
+		},
+		{
+			nodeType: 'n8n-nodes-base.telegramTrigger',
+			date: new Date('2023-11-23T14:26:07.962Z'),
+		},
+	],
+	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',
+	nodesAccess: [
+		{
+			nodeType: 'n8n-nodes-base.telegram',
+			date: new Date('2023-11-23T14:26:07.962Z'),
+		},
+		{
+			nodeType: 'n8n-nodes-base.telegramTrigger',
+			date: new Date('2023-11-23T14:26:07.962Z'),
+		},
+	],
+	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 0000000000..96c9162b9b
--- /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 0000000000..b0b1715792
--- /dev/null
+++ b/packages/editor-ui/src/views/SetupWorkflowFromTemplateView/setupTemplate.store.ts
@@ -0,0 +1,247 @@
+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';
+
+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: templateId.value,
+					wf_template_repo_session_id: templatesStore.currentSessionId,
+				},
+				{ withPostHog: true },
+			);
+
+			telemetry.track('User saved new workflow from template', {
+				template_id: 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 0000000000..2bf9de517f
--- /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 b8f10e5b13..3176784253 100644
--- a/packages/editor-ui/src/views/SigninView.vue
+++ b/packages/editor-ui/src/views/SigninView.vue
@@ -3,17 +3,17 @@
 		<AuthView
 			v-if="!showMfaView"
 			:form="FORM_CONFIG"
-			:formLoading="loading"
+			:form-loading="loading"
 			:with-sso="true"
 			data-test-id="signin-form"
 			@submit="onEmailPasswordSubmitted"
 		/>
 		<MfaView
 			v-if="showMfaView"
+			:report-error="reportError"
 			@submit="onMFASubmitted"
 			@onBackClick="onBackClick"
 			@onFormChanged="onFormChanged"
-			:reportError="reportError"
 		/>
 	</div>
 </template>
@@ -21,20 +21,18 @@
 <script lang="ts">
 import { defineComponent } from 'vue';
 import AuthView from './AuthView.vue';
-import MfaView from './MfaView.vue';
-import { useToast } from '@/composables';
+import MfaView, { FORM } from './MfaView.vue';
+import { useToast } from '@/composables/useToast';
 import type { IFormBoxConfig } from '@/Interface';
 import { MFA_AUTHENTICATION_REQUIRED_ERROR_CODE, VIEWS } from '@/constants';
 import { mapStores } from 'pinia';
 import { useUsersStore } from '@/stores/users.store';
 import { useSettingsStore } from '@/stores/settings.store';
-import { useCloudPlanStore, useUIStore } from '@/stores';
-import { genericHelpers } from '@/mixins/genericHelpers';
-import { FORM } from './MfaView.vue';
+import { useCloudPlanStore } from '@/stores/cloudPlan.store';
+import { useUIStore } from '@/stores/ui.store';
 
 export default defineComponent({
 	name: 'SigninView',
-	mixins: [genericHelpers],
 	components: {
 		AuthView,
 		MfaView,
@@ -116,6 +114,17 @@ export default defineComponent({
 		async onEmailPasswordSubmitted(form: { email: string; password: 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 }) {
 			try {
 				this.loading = true;
@@ -126,7 +135,13 @@ export default defineComponent({
 					mfaRecoveryCode: form.recoveryCode,
 				});
 				this.loading = false;
-				await this.cloudPlanStore.checkForCloudPlanData();
+				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();
@@ -137,6 +152,11 @@ export default defineComponent({
 
 				if (this.isRedirectSafe()) {
 					const redirect = this.getRedirectQueryParameter();
+					if (redirect.startsWith('http')) {
+						window.location.href = redirect;
+						return;
+					}
+
 					void this.$router.push(redirect);
 					return;
 				}
diff --git a/packages/editor-ui/src/views/SignoutView.vue b/packages/editor-ui/src/views/SignoutView.vue
index 4a34341207..02dcc6aa34 100644
--- a/packages/editor-ui/src/views/SignoutView.vue
+++ b/packages/editor-ui/src/views/SignoutView.vue
@@ -3,7 +3,7 @@ import { VIEWS } from '@/constants';
 import { mapStores } from 'pinia';
 import { useUsersStore } from '@/stores/users.store';
 import { defineComponent } from 'vue';
-import { useToast } from '@/composables';
+import { useToast } from '@/composables/useToast';
 
 export default defineComponent({
 	name: 'SignoutView',
@@ -15,6 +15,9 @@ export default defineComponent({
 	computed: {
 		...mapStores(useUsersStore),
 	},
+	mounted() {
+		void this.logout();
+	},
 	methods: {
 		async logout() {
 			try {
@@ -25,9 +28,6 @@ export default defineComponent({
 			}
 		},
 	},
-	mounted() {
-		void this.logout();
-	},
 });
 </script>
 
diff --git a/packages/editor-ui/src/views/SignupView.vue b/packages/editor-ui/src/views/SignupView.vue
index 75a4f567aa..57db14bf48 100644
--- a/packages/editor-ui/src/views/SignupView.vue
+++ b/packages/editor-ui/src/views/SignupView.vue
@@ -1,7 +1,7 @@
 <template>
 	<AuthView
 		:form="FORM_CONFIG"
-		:formLoading="loading"
+		:form-loading="loading"
 		:subtitle="inviteMessage"
 		@submit="onSubmit"
 	/>
@@ -9,7 +9,7 @@
 
 <script lang="ts">
 import AuthView from '@/views/AuthView.vue';
-import { useToast } from '@/composables';
+import { useToast } from '@/composables/useToast';
 
 import { defineComponent } from 'vue';
 import type { IFormBoxConfig } from '@/Interface';
@@ -83,14 +83,8 @@ export default defineComponent({
 		};
 	},
 	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) {
 				throw new Error(this.$locale.baseText('auth.signup.missingTokenError'));
@@ -121,7 +115,7 @@ export default defineComponent({
 		async onSubmit(values: { [key: string]: string | boolean }) {
 			if (!this.inviterId || !this.inviteeId) {
 				this.showError(
-					new Error(this.$locale.baseText('auth.changePassword.tokenValidationError')),
+					new Error(this.$locale.baseText('auth.signup.tokenValidationError')),
 					this.$locale.baseText('auth.signup.setupYourAccountError'),
 				);
 				return;
@@ -129,7 +123,7 @@ export default defineComponent({
 
 			try {
 				this.loading = true;
-				await this.usersStore.signup({
+				await this.usersStore.acceptInvitation({
 					...values,
 					inviterId: this.inviterId,
 					inviteeId: this.inviteeId,
@@ -153,6 +147,11 @@ export default defineComponent({
 			}
 			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 ab2b617cfe..bd94e82117 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"
@@ -65,26 +65,38 @@ import type {
 	ITemplatesWorkflowFull,
 } from '@/Interface';
 
-import { setPageTitle } from '@/utils';
+import { setPageTitle } from '@/utils/htmlUtils';
 import { VIEWS } from '@/constants';
 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 defineComponent({
 	name: 'TemplatesCollectionView',
-	mixins: [workflowHelpers],
 	components: {
 		TemplateDetails,
 		TemplateList,
 		TemplatesView,
 	},
+	mixins: [workflowHelpers],
+	setup() {
+		const externalHooks = useExternalHooks();
+
+		return {
+			externalHooks,
+		};
+	},
 	computed: {
 		...mapStores(useTemplatesStore, usePostHog),
-		collection(): null | ITemplatesCollectionFull {
+		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) {
@@ -101,6 +113,30 @@ export default defineComponent({
 			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(() => {
@@ -116,17 +152,18 @@ export default defineComponent({
 		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',
-			};
-			void this.$externalHooks().run('templatesCollectionView.onUseWorkflow', telemetryPayload);
-			this.$telemetry.track('User inserted workflow template', telemetryPayload, {
-				withPostHog: true,
+		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',
 			});
-			this.navigateTo(event, VIEWS.TEMPLATE_IMPORT, id);
 		},
 		navigateTo(e: MouseEvent, page: string, id: string) {
 			if (e.metaKey || e.ctrlKey) {
@@ -138,30 +175,6 @@ export default defineComponent({
 			}
 		},
 	},
-	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 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 a30085d944..8e0a5b77f8 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,46 +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
-						:modelValue="search"
+						:model-value="search"
 						:placeholder="$locale.baseText('templates.searchPlaceholder')"
-						@update:modelValue="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">
@@ -76,12 +84,11 @@
 <script lang="ts">
 import { defineComponent } from 'vue';
 import { mapStores } from 'pinia';
-import CollectionsCarousel from '@/components/CollectionsCarousel.vue';
+import TemplatesInfoCarousel from '@/components/TemplatesInfoCarousel.vue';
 import TemplateFilters from '@/components/TemplateFilters.vue';
 import TemplateList from '@/components/TemplateList.vue';
 import TemplatesView from '@/views/TemplatesView.vue';
 
-import { genericHelpers } from '@/mixins/genericHelpers';
 import type {
 	ITemplatesCollection,
 	ITemplatesWorkflow,
@@ -89,15 +96,15 @@ import type {
 	ITemplatesCategory,
 } from '@/Interface';
 import type { IDataObject } from 'n8n-workflow';
-import { setPageTitle } from '@/utils';
-import { VIEWS } from '@/constants';
-import { debounceHelper } from '@/mixins/debounce';
+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';
+import { useToast } from '@/composables/useToast';
 import { usePostHog } from '@/stores/posthog.store';
+import { useDebounce } from '@/composables/useDebounce';
 
 interface ISearchEvent {
 	search_string: string;
@@ -109,22 +116,24 @@ interface ISearchEvent {
 
 export default defineComponent({
 	name: 'TemplatesSearchView',
-	mixins: [genericHelpers, debounceHelper],
 	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,
@@ -132,18 +141,19 @@ export default defineComponent({
 			search: '',
 			searchEventToTrack: null as null | ISearchEvent,
 			errorLoadingWorkflows: false,
+			creatorHubUrl: CREATOR_HUB_URL as string,
 		};
 	},
 	computed: {
 		...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) {
@@ -162,12 +172,6 @@ export default defineComponent({
 
 			return null;
 		},
-		query(): ITemplatesQuery {
-			return {
-				categories: this.categories,
-				search: this.search,
-			};
-		},
 		nothingFound(): boolean {
 			return (
 				!this.loadingWorkflows &&
@@ -177,7 +181,57 @@ export default defineComponent({
 			);
 		},
 	},
+	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);
 		},
@@ -194,7 +248,7 @@ export default defineComponent({
 			}
 		},
 		updateSearch() {
-			this.updateQueryParam(this.search, this.categories.join(','));
+			this.updateQueryParam(this.search, this.categories.map((category) => category.id).join(','));
 			void this.loadWorkflowsAndCollections(false);
 		},
 		updateSearchTracking(search: string, categories: number[]) {
@@ -224,27 +278,26 @@ export default defineComponent({
 				this.searchEventToTrack = null;
 			}
 		},
-		openNewWorkflow() {
-			this.uiStore.nodeViewInitialized = false;
-			void this.$router.push({ name: VIEWS.NEW_WORKFLOW });
-		},
 		onSearchInput(search: string) {
 			this.loadingWorkflows = true;
 			this.loadingCollections = true;
 			this.search = search;
-			void 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();
 		},
@@ -256,9 +309,7 @@ export default defineComponent({
 			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,
 				});
 			}
@@ -287,7 +338,7 @@ export default defineComponent({
 			try {
 				this.loadingWorkflows = true;
 				await this.templatesStore.getMoreWorkflows({
-					categories: this.categories,
+					categories: this.categories.map((category) => category.name),
 					search: this.search,
 				});
 			} catch (e) {
@@ -310,7 +361,7 @@ export default defineComponent({
 			try {
 				this.loadingCollections = true;
 				await this.templatesStore.getCollections({
-					categories: this.categories,
+					categories: this.categories.map((category) => String(category.id)),
 					search: this.search,
 				});
 			} catch (e) {}
@@ -322,7 +373,7 @@ export default defineComponent({
 				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) {
@@ -336,7 +387,10 @@ export default defineComponent({
 			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') {
@@ -351,20 +405,12 @@ export default defineComponent({
 			}, 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);
@@ -374,31 +420,6 @@ export default defineComponent({
 		this.trackSearch();
 		next();
 	},
-	async mounted() {
-		setPageTitle('n8n - Templates');
-		void this.loadCategories();
-		void this.loadWorkflowsAndCollections(true);
-		void 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>
 
diff --git a/packages/editor-ui/src/views/TemplatesView.vue b/packages/editor-ui/src/views/TemplatesView.vue
index 2b5d8a48b1..d1efe2c900 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 d2761f36e8..c760f7d77e 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"
@@ -62,28 +63,39 @@ import TemplateDetails from '@/components/TemplateDetails.vue';
 import TemplatesView from './TemplatesView.vue';
 import WorkflowPreview from '@/components/WorkflowPreview.vue';
 
-import type { ITemplatesWorkflow, ITemplatesWorkflowFull } from '@/Interface';
+import type { ITemplatesWorkflowFull } from '@/Interface';
 import { workflowHelpers } from '@/mixins/workflowHelpers';
-import { setPageTitle } from '@/utils';
-import { VIEWS } from '@/constants';
+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 defineComponent({
 	name: 'TemplatesWorkflowView',
-	mixins: [workflowHelpers],
 	components: {
 		TemplateDetails,
 		TemplatesView,
 		WorkflowPreview,
 	},
+	mixins: [workflowHelpers],
+	setup() {
+		const externalHooks = useExternalHooks();
+
+		return {
+			externalHooks,
+		};
+	},
 	computed: {
 		...mapStores(useTemplatesStore, usePostHog),
-		template(): ITemplatesWorkflow | ITemplatesWorkflowFull {
-			return this.templatesStore.getTemplateById(this.templateId);
+		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() {
@@ -93,39 +105,6 @@ export default defineComponent({
 			notFoundError: false,
 		};
 	},
-	methods: {
-		openWorkflow(id: string, e: PointerEvent) {
-			const telemetryPayload = {
-				source: 'workflow',
-				template_id: id,
-				wf_template_repo_session_id: this.templatesStore.currentSessionId,
-			};
-
-			void this.$externalHooks().run('templatesWorkflowView.openWorkflow', telemetryPayload);
-			this.$telemetry.track('User inserted workflow template', telemetryPayload, {
-				withPostHog: true,
-			});
-			if (e.metaKey || e.ctrlKey) {
-				const route = this.$router.resolve({ name: VIEWS.TEMPLATE_IMPORT, params: { id } });
-				window.open(route.href, '_blank');
-				return;
-			} else {
-				void 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) {
@@ -138,7 +117,7 @@ export default defineComponent({
 	async mounted() {
 		this.scrollToTop();
 
-		if (this.template && (this.template as ITemplatesWorkflowFull).full) {
+		if (this.template && this.template.full) {
 			this.loading = false;
 			return;
 		}
@@ -151,6 +130,33 @@ export default defineComponent({
 
 		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/VariablesView.vue b/packages/editor-ui/src/views/VariablesView.vue
index 6439c95f22..0c45a8e49d 100644
--- a/packages/editor-ui/src/views/VariablesView.vue
+++ b/packages/editor-ui/src/views/VariablesView.vue
@@ -1,13 +1,14 @@
 <script lang="ts" setup>
 import { computed, ref, onBeforeMount, onBeforeUnmount } from 'vue';
-import {
-	useEnvironmentsStore,
-	useUIStore,
-	useSettingsStore,
-	useUsersStore,
-	useSourceControlStore,
-} from '@/stores';
-import { useI18n, useTelemetry, useToast, useMessage } from '@/composables';
+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';
@@ -228,17 +229,17 @@ onBeforeUnmount(() => {
 
 <template>
 	<ResourcesListLayout
-		class="variables-view"
 		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"
@@ -251,8 +252,8 @@ onBeforeUnmount(() => {
 						size="large"
 						block
 						:disabled="!canCreateVariables"
-						@click="addTemporaryVariable"
 						data-test-id="resources-list-add"
+						@click="addTemporaryVariable"
 					>
 						{{ $locale.baseText(`variables.add`) }}
 					</n8n-button>
@@ -274,8 +275,8 @@ onBeforeUnmount(() => {
 				: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"
 			/>
 		</template>
@@ -288,8 +289,8 @@ onBeforeUnmount(() => {
 				: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
diff --git a/packages/editor-ui/src/views/WorkerView.vue b/packages/editor-ui/src/views/WorkerView.vue
new file mode 100644
index 0000000000..966f1e50a8
--- /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/WorkflowHistory.vue b/packages/editor-ui/src/views/WorkflowHistory.vue
index 0a493fb2b8..fbb2d0b870 100644
--- a/packages/editor-ui/src/views/WorkflowHistory.vue
+++ b/packages/editor-ui/src/views/WorkflowHistory.vue
@@ -3,7 +3,8 @@ 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, useToast } from '@/composables';
+import { useI18n } from '@/composables/useI18n';
+import { useToast } from '@/composables/useToast';
 import type {
 	WorkflowHistoryActionTypes,
 	WorkflowVersionId,
@@ -16,6 +17,8 @@ import WorkflowHistoryContent from '@/components/WorkflowHistory/WorkflowHistory
 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>;
@@ -67,6 +70,18 @@ const actions = computed<UserAction[]>(() =>
 	})),
 );
 
+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,
@@ -77,6 +92,7 @@ const loadMore = async (queryParams: WorkflowHistoryRequestParams) => {
 };
 
 onBeforeMount(async () => {
+	sendTelemetry('User opened workflow history');
 	try {
 		const [workflow] = await Promise.all([
 			workflowsStore.fetchWorkflow(route.params.workflowId),
@@ -227,15 +243,19 @@ const onAction = async ({
 		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) {
@@ -253,6 +273,7 @@ const onAction = async ({
 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,
@@ -277,6 +298,7 @@ watchEffect(async () => {
 			route.params.workflowId,
 			route.params.versionId,
 		);
+		sendTelemetry('User selected version');
 	} catch (error) {
 		toast.showError(
 			new Error(`${error.message} "${route.params.versionId}"&nbsp;`),
@@ -294,28 +316,28 @@ watchEffect(async () => {
 </script>
 <template>
 	<div :class="$style.view">
-		<n8n-heading :class="$style.header" tag="h2" size="medium" bold>
+		<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">
+			<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">
-			<workflow-history-list
+			<WorkflowHistoryList
 				v-if="canRender"
 				:items="workflowHistory"
-				:lastReceivedItemsLength="lastReceivedItemsLength"
-				:activeItem="activeWorkflowVersion"
+				:last-received-items-length="lastReceivedItemsLength"
+				:active-item="activeWorkflowVersion"
 				:actions="actions"
-				:requestNumberOfItems="requestNumberOfItems"
-				:shouldUpgrade="workflowHistoryStore.shouldUpgrade"
-				:evaluatedPruneTime="workflowHistoryStore.evaluatedPruneTime"
-				:isListLoading="isListLoading"
+				:request-number-of-items="requestNumberOfItems"
+				:should-upgrade="workflowHistoryStore.shouldUpgrade"
+				:evaluated-prune-time="evaluatedPruneTime"
+				:is-list-loading="isListLoading"
 				@action="onAction"
 				@preview="onPreview"
 				@load-more="loadMore"
@@ -323,12 +345,13 @@ watchEffect(async () => {
 			/>
 		</div>
 		<div :class="$style.contentComponentWrapper">
-			<workflow-history-content
+			<WorkflowHistoryContent
 				v-if="canRender"
 				:workflow="activeWorkflow"
 				:workflow-version="activeWorkflowVersion"
 				:actions="actions"
-				:isListLoading="isListLoading"
+				:is-list-loading="isListLoading"
+				:is-first-item-shown="isFirstItemShown"
 				@action="onAction"
 			/>
 		</div>
diff --git a/packages/editor-ui/src/views/WorkflowOnboardingView.vue b/packages/editor-ui/src/views/WorkflowOnboardingView.vue
index 19d4d01e3f..813123e757 100644
--- a/packages/editor-ui/src/views/WorkflowOnboardingView.vue
+++ b/packages/editor-ui/src/views/WorkflowOnboardingView.vue
@@ -1,7 +1,9 @@
 <script setup lang="ts">
-import { useLoadingService, useI18n } from '@/composables';
+import { useLoadingService } from '@/composables/useLoadingService';
+import { useI18n } from '@/composables/useI18n';
 import { VIEWS } from '@/constants';
-import { useTemplatesStore, useWorkflowsStore } from '@/stores';
+import { useTemplatesStore } from '@/stores/templates.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
 import { onMounted } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 
diff --git a/packages/editor-ui/src/views/WorkflowsView.vue b/packages/editor-ui/src/views/WorkflowsView.vue
index a88cb66ba6..40e6f8182a 100644
--- a/packages/editor-ui/src/views/WorkflowsView.vue
+++ b/packages/editor-ui/src/views/WorkflowsView.vue
@@ -1,5 +1,5 @@
 <template>
-	<resources-list-layout
+	<ResourcesListLayout
 		ref="layout"
 		resource-key="workflows"
 		:resources="allWorkflows"
@@ -20,8 +20,8 @@
 						size="large"
 						block
 						:disabled="disabled"
-						@click="addWorkflow"
 						data-test-id="resources-list-add"
+						@click="addWorkflow"
 					>
 						{{ $locale.baseText(`workflows.add`) }}
 					</n8n-button>
@@ -32,53 +32,68 @@
 			</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"
-				:readOnly="readOnlyEnv"
+			/>
+		</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(
-							readOnlyEnv
-								? 'workflows.empty.description.readOnlyEnv'
-								: 'workflows.empty.description',
-						)
-					}}
-				</n8n-text>
-			</div>
-			<div v-if="!readOnlyEnv" :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]">
+					<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"
@@ -88,8 +103,8 @@
 				/>
 				<TagsDropdown
 					:placeholder="$locale.baseText('workflowOpen.filterWorkflows')"
-					:modelValue="filters.tags"
-					:createEnabled="false"
+					:model-value="filters.tags"
+					:create-enabled="false"
 					@update:modelValue="setKeyValue('tags', $event)"
 				/>
 			</div>
@@ -101,18 +116,23 @@
 					color="text-base"
 					class="mb-3xs"
 				/>
-				<n8n-select :modelValue="filters.status" @update:modelValue="setKeyValue('status', $event)">
+				<n8n-select
+					data-test-id="status-dropdown"
+					:model-value="filters.status"
+					@update:modelValue="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">
@@ -122,6 +142,8 @@ import WorkflowCard from '@/components/WorkflowCard.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.store';
 import { useSettingsStore } from '@/stores/settings.store';
@@ -129,7 +151,7 @@ import { useUsersStore } from '@/stores/users.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { useCredentialsStore } from '@/stores/credentials.store';
 import { useSourceControlStore } from '@/stores/sourceControl.store';
-import { genericHelpers } from '@/mixins/genericHelpers';
+import { useTagsStore } from '@/stores/tags.store';
 
 type IResourcesListLayoutInstance = InstanceType<typeof ResourcesListLayout>;
 
@@ -141,11 +163,12 @@ const StatusFilter = {
 
 const WorkflowsView = defineComponent({
 	name: 'WorkflowsView',
-	mixins: [genericHelpers],
 	components: {
 		ResourcesListLayout,
 		WorkflowCard,
 		TagsDropdown,
+		SuggestedTemplatesPage,
+		SuggestedTemplatesSection,
 	},
 	data() {
 		return {
@@ -153,7 +176,7 @@ const WorkflowsView = defineComponent({
 				search: '',
 				ownedBy: '',
 				sharedWith: '',
-				status: StatusFilter.ALL,
+				status: StatusFilter.ALL as string | boolean,
 				tags: [] as string[],
 			},
 			sourceControlStoreUnsubscribe: () => {},
@@ -167,7 +190,11 @@ const WorkflowsView = defineComponent({
 			useWorkflowsStore,
 			useCredentialsStore,
 			useSourceControlStore,
+			useTagsStore,
 		),
+		readOnlyEnv(): boolean {
+			return this.sourceControlStore.preferences.branchReadOnly;
+		},
 		currentUser(): IUser {
 			return this.usersStore.currentUser || ({} as IUser);
 		},
@@ -193,6 +220,30 @@ const WorkflowsView = defineComponent({
 				},
 			];
 		},
+		suggestedTemplates() {
+			return this.uiStore.suggestedTemplates;
+		},
+	},
+	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: {
 		addWorkflow() {
@@ -221,6 +272,8 @@ const WorkflowsView = defineComponent({
 			filters: { tags: string[]; search: string; status: string | boolean },
 			matches: boolean,
 		): boolean {
+			this.saveFiltersOnQueryString();
+
 			if (this.settingsStore.areTagsEnabled && filters.tags.length > 0) {
 				matches =
 					matches &&
@@ -243,25 +296,77 @@ const WorkflowsView = defineComponent({
 		sendFiltersTelemetry(source: string) {
 			(this.$refs.layout as IResourcesListLayoutInstance).sendFiltersTelemetry(source);
 		},
-	},
-	watch: {
-		'filters.tags'() {
-			this.sendFiltersTelemetry('tags');
-		},
-	},
-	mounted() {
-		void this.usersStore.showPersonalizationSurvey();
+		saveFiltersOnQueryString() {
+			const query: { [key: string]: string } = {};
 
-		this.sourceControlStoreUnsubscribe = this.sourceControlStore.$onAction(({ name, after }) => {
-			if (name === 'pullWorkfolder' && after) {
-				after(() => {
-					void this.initialize();
-				});
+			if (this.filters.search) {
+				query.search = this.filters.search;
 			}
-		});
-	},
-	beforeUnmount() {
-		this.sourceControlStoreUnsubscribe();
+
+			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({
+				name: VIEWS.WORKFLOWS,
+				query,
+			});
+		},
+		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,
+				};
+			}
+		},
 	},
 });
 
diff --git a/packages/editor-ui/src/views/__tests__/SettingsAuditLogs.test.ts b/packages/editor-ui/src/views/__tests__/SettingsAuditLogs.test.ts
index c5006e8dde..2199fa79c5 100644
--- a/packages/editor-ui/src/views/__tests__/SettingsAuditLogs.test.ts
+++ b/packages/editor-ui/src/views/__tests__/SettingsAuditLogs.test.ts
@@ -1,6 +1,7 @@
 import { vi } from 'vitest';
 import { createPinia, setActivePinia } from 'pinia';
-import { useAuditLogsStore, useSettingsStore } from '@/stores';
+import { useAuditLogsStore } from '@/stores/auditLogs.store';
+import { useSettingsStore } from '@/stores/settings.store';
 import SettingsAuditLogs from '@/views/SettingsAuditLogs.vue';
 import { createComponentRenderer } from '@/__tests__/render';
 import { EnterpriseEditionFeature } from '@/constants';
diff --git a/packages/editor-ui/src/views/__tests__/SettingsExternalSecrets.test.ts b/packages/editor-ui/src/views/__tests__/SettingsExternalSecrets.test.ts
index d6969d5261..d7359a0b5d 100644
--- a/packages/editor-ui/src/views/__tests__/SettingsExternalSecrets.test.ts
+++ b/packages/editor-ui/src/views/__tests__/SettingsExternalSecrets.test.ts
@@ -5,7 +5,7 @@ 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';
+import { useSettingsStore } from '@/stores/settings.store';
 import { setupServer } from '@/__tests__/server';
 
 let pinia: ReturnType<typeof createTestingPinia>;
diff --git a/packages/editor-ui/src/views/__tests__/SettingsPersonalView.test.ts b/packages/editor-ui/src/views/__tests__/SettingsPersonalView.test.ts
index f975d2e24f..78759755e4 100644
--- a/packages/editor-ui/src/views/__tests__/SettingsPersonalView.test.ts
+++ b/packages/editor-ui/src/views/__tests__/SettingsPersonalView.test.ts
@@ -1,8 +1,7 @@
 import { createPinia } from 'pinia';
-import type { IN8nUISettings } from 'n8n-workflow';
-import { SETTINGS_STORE_DEFAULT_STATE, waitAllPromises } from '@/__tests__/utils';
+import { waitAllPromises } from '@/__tests__/utils';
 import SettingsPersonalView from '@/views/SettingsPersonalView.vue';
-import { useSettingsStore } from '@/stores';
+import { useSettingsStore } from '@/stores/settings.store';
 import { useUsersStore } from '@/stores/users.store';
 import { createComponentRenderer } from '@/__tests__/render';
 import { setupServer } from '@/__tests__/server';
@@ -12,8 +11,6 @@ let settingsStore: ReturnType<typeof useSettingsStore>;
 let usersStore: ReturnType<typeof useUsersStore>;
 let server: ReturnType<typeof setupServer>;
 
-const DEFAULT_SETTINGS: IN8nUISettings = SETTINGS_STORE_DEFAULT_STATE.settings;
-
 const renderComponent = createComponentRenderer(SettingsPersonalView);
 
 const currentUser = {
@@ -26,6 +23,8 @@ const currentUser = {
 	isDefaultUser: false,
 	isPendingUser: false,
 	isPending: false,
+	hasRecoveryCodesLeft: false,
+	mfaEnabled: false,
 };
 
 describe('SettingsPersonalView', () => {
diff --git a/packages/editor-ui/src/views/__tests__/SettingsSourceControl.test.ts b/packages/editor-ui/src/views/__tests__/SettingsSourceControl.test.ts
index 322f44c666..163e81c284 100644
--- a/packages/editor-ui/src/views/__tests__/SettingsSourceControl.test.ts
+++ b/packages/editor-ui/src/views/__tests__/SettingsSourceControl.test.ts
@@ -3,7 +3,8 @@ 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, useSourceControlStore } from '@/stores';
+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';
@@ -168,6 +169,7 @@ describe('SettingsSourceControl', () => {
 			['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) => {
diff --git a/packages/editor-ui/src/views/__tests__/VariablesView.spec.ts b/packages/editor-ui/src/views/__tests__/VariablesView.spec.ts
index 0ca5fe691f..f9088cf68c 100644
--- a/packages/editor-ui/src/views/__tests__/VariablesView.spec.ts
+++ b/packages/editor-ui/src/views/__tests__/VariablesView.spec.ts
@@ -1,9 +1,11 @@
-import { afterAll, beforeAll, vi } from 'vitest';
+import { afterAll, beforeAll } from 'vitest';
 import { setActivePinia, createPinia } from 'pinia';
 import { waitFor } from '@testing-library/vue';
 import { setupServer } from '@/__tests__/server';
 import VariablesView from '@/views/VariablesView.vue';
-import { useSettingsStore, useUsersStore } from '@/stores';
+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';
 
@@ -12,6 +14,7 @@ describe('VariablesView', () => {
 	let pinia: ReturnType<typeof createPinia>;
 	let settingsStore: ReturnType<typeof useSettingsStore>;
 	let usersStore: ReturnType<typeof useUsersStore>;
+	let rbacStore: ReturnType<typeof useRBACStore>;
 
 	const renderComponent = createComponentRenderer(VariablesView);
 
@@ -25,6 +28,7 @@ describe('VariablesView', () => {
 
 		settingsStore = useSettingsStore();
 		usersStore = useUsersStore();
+		rbacStore = useRBACStore();
 		await settingsStore.getSettings();
 		await usersStore.fetchUsers();
 		await usersStore.loginWithCookie();
@@ -41,29 +45,12 @@ describe('VariablesView', () => {
 	});
 
 	describe('should render empty state', () => {
-		it('when feature is enabled and logged in user is owner', async () => {
-			settingsStore.settings.enterprise[EnterpriseEditionFeature.Variables] = true;
-			vi.spyOn(usersStore, 'currentUser', 'get').mockReturnValue({
-				isOwner: true,
-			});
+		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')).toBeVisible();
-				expect(queryByTestId('unavailable-resources-list')).not.toBeInTheDocument();
-				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;
-			vi.spyOn(usersStore, 'currentUser', 'get').mockReturnValue({
-				isOwner: true,
-			});
-
-			const { queryByTestId } = renderComponent(VariablesView, { pinia });
-
 			await waitFor(() => {
 				expect(queryByTestId('empty-resources-list')).not.toBeInTheDocument();
 				expect(queryByTestId('unavailable-resources-list')).toBeVisible();
@@ -71,13 +58,49 @@ describe('VariablesView', () => {
 			});
 		});
 
-		it('when feature is eanbled and logged in user is not owner', async () => {
-			settingsStore.settings.enterprise[EnterpriseEditionFeature.Variables] = true;
-			vi.spyOn(usersStore, 'currentUser', 'get').mockReturnValue({
-				isDefaultUser: true,
-			});
+		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(VariablesView, { pinia });
+			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 waitFor(() => {
 				expect(queryByTestId('empty-resources-list')).not.toBeInTheDocument();
diff --git a/packages/editor-ui/src/views/__tests__/WorkflowHistory.test.ts b/packages/editor-ui/src/views/__tests__/WorkflowHistory.test.ts
index 2710274b18..ad39e22bcc 100644
--- a/packages/editor-ui/src/views/__tests__/WorkflowHistory.test.ts
+++ b/packages/editor-ui/src/views/__tests__/WorkflowHistory.test.ts
@@ -17,6 +17,7 @@ import {
 } 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 = {};
@@ -56,7 +57,9 @@ const renderComponent = createComponentRenderer(WorkflowHistoryPage, {
 				},
 				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>`,
 			}),
 		},
@@ -85,6 +88,7 @@ describe('WorkflowHistory', () => {
 		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);
 	});
 
@@ -97,12 +101,16 @@ describe('WorkflowHistory', () => {
 
 		renderComponent({ pinia });
 
-		await waitFor(() =>
+		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 () => {
@@ -113,8 +121,14 @@ describe('WorkflowHistory', () => {
 
 		renderComponent({ pinia });
 
-		await waitFor(() => expect(router.replace).not.toHaveBeenCalled());
 		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 () => {
@@ -124,12 +138,35 @@ describe('WorkflowHistory', () => {
 
 		await userEvent.click(getByTestId('stub-preview-button'));
 
-		await waitFor(() =>
+		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 () => {
@@ -141,12 +178,16 @@ describe('WorkflowHistory', () => {
 		await user.keyboard('[ControlLeft>]');
 		await user.click(getByTestId('stub-preview-button'));
 
-		await waitFor(() =>
+		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();
 	});
 
@@ -160,13 +201,31 @@ describe('WorkflowHistory', () => {
 		const { getByTestId, getByRole } = renderComponent({ pinia });
 		await userEvent.click(getByTestId('stub-clone-button'));
 
-		await waitFor(() =>
+		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/tsconfig.json b/packages/editor-ui/tsconfig.json
index 8161cdc907..39cf47b586 100644
--- a/packages/editor-ui/tsconfig.json
+++ b/packages/editor-ui/tsconfig.json
@@ -14,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.ts b/packages/editor-ui/vite.config.mts
similarity index 83%
rename from packages/editor-ui/vite.config.ts
rename to packages/editor-ui/vite.config.mts
index 34ce3cd51d..744805d407 100644
--- a/packages/editor-ui/vite.config.ts
+++ b/packages/editor-ui/vite.config.mts
@@ -1,20 +1,20 @@
 import vue from '@vitejs/plugin-vue';
 import { resolve } from 'path';
 import { defineConfig, mergeConfig } from 'vite';
-import { defineConfig as defineVitestConfig } from 'vitest/config';
 import { sentryVitePlugin } from '@sentry/vite-plugin';
 
 import packageJSON from './package.json';
-
-const { coverageReporters } = require('../../jest.config.js');
+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'];
+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);
@@ -51,9 +51,17 @@ const alias = [
 		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: require.resolve(`lodash-es/${name}`),
+		replacement: `lodash-es/${name}`,
 	})),
 	{
 		find: /^lodash\.(.+)$/,
@@ -61,7 +69,12 @@ const alias = [
 	},
 ];
 
-const plugins = [vue()];
+const plugins = [
+	icons({
+		compiler: 'vue3',
+	}),
+	vue()
+];
 
 const { SENTRY_AUTH_TOKEN: authToken, RELEASE: release } = process.env;
 if (release && authToken) {
@@ -115,21 +128,5 @@ export default mergeConfig(
 			},
 		},
 	}),
-	defineVitestConfig({
-		test: {
-			globals: true,
-			environment: 'jsdom',
-			setupFiles: ['./src/__tests__/setup.ts'],
-			coverage: {
-				provider: 'v8',
-				reporter: coverageReporters,
-				all: true,
-			},
-			css: {
-				modules: {
-					classNameStrategy: 'non-scoped',
-				},
-			},
-		},
-	}),
+	vitestConfig,
 );
diff --git a/packages/node-dev/.eslintrc.js b/packages/node-dev/.eslintrc.js
index 0964f88b03..cb14470366 100644
--- a/packages/node-dev/.eslintrc.js
+++ b/packages/node-dev/.eslintrc.js
@@ -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/README.md b/packages/node-dev/README.md
index 3ad2321a7d..d650716a0a 100644
--- a/packages/node-dev/README.md
+++ b/packages/node-dev/README.md
@@ -215,7 +215,7 @@ All properties are optional. However, most only work when the node-property is o
 
 ## 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/package.json b/packages/node-dev/package.json
index 3970c78a2c..bf2a302b43 100644
--- a/packages/node-dev/package.json
+++ b/packages/node-dev/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-node-dev",
-  "version": "1.14.0",
+  "version": "1.24.0",
   "description": "CLI to simplify n8n credentials/node development",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",
diff --git a/packages/nodes-base/.eslintrc.js b/packages/nodes-base/.eslintrc.js
index 5229bbe964..5193ea70b7 100644
--- a/packages/nodes-base/.eslintrc.js
+++ b/packages/nodes-base/.eslintrc.js
@@ -151,5 +151,11 @@ module.exports = {
 				'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/README.md b/packages/nodes-base/README.md
index 34d84751b0..3dc7413037 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/AlienVaultApi.credentials.ts b/packages/nodes-base/credentials/AlienVaultApi.credentials.ts
index a223000802..aa5aeb238f 100644
--- a/packages/nodes-base/credentials/AlienVaultApi.credentials.ts
+++ b/packages/nodes-base/credentials/AlienVaultApi.credentials.ts
@@ -14,6 +14,12 @@ export class AlienVaultApi implements ICredentialType {
 
 	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',
diff --git a/packages/nodes-base/credentials/Auth0ManagementApi.credentials.ts b/packages/nodes-base/credentials/Auth0ManagementApi.credentials.ts
index bcd6da8329..c824b7188e 100644
--- a/packages/nodes-base/credentials/Auth0ManagementApi.credentials.ts
+++ b/packages/nodes-base/credentials/Auth0ManagementApi.credentials.ts
@@ -16,6 +16,12 @@ export class Auth0ManagementApi implements ICredentialType {
 
 	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',
diff --git a/packages/nodes-base/credentials/CarbonBlackApi.credentials.ts b/packages/nodes-base/credentials/CarbonBlackApi.credentials.ts
index 8994375e8a..48c5f5650a 100644
--- a/packages/nodes-base/credentials/CarbonBlackApi.credentials.ts
+++ b/packages/nodes-base/credentials/CarbonBlackApi.credentials.ts
@@ -9,6 +9,12 @@ export class CarbonBlackApi implements ICredentialType {
 
 	documentationUrl = 'carbonblack';
 
+	httpRequestNode = {
+		name: 'Carbon Black',
+		docsUrl: 'https://developer.carbonblack.com/reference',
+		apiBaseUrl: '',
+	};
+
 	properties: INodeProperties[] = [
 		{
 			displayName: 'URL',
diff --git a/packages/nodes-base/credentials/CiscoMerakiApi.credentials.ts b/packages/nodes-base/credentials/CiscoMerakiApi.credentials.ts
index 1cbd46ef71..e02519b64d 100644
--- a/packages/nodes-base/credentials/CiscoMerakiApi.credentials.ts
+++ b/packages/nodes-base/credentials/CiscoMerakiApi.credentials.ts
@@ -9,6 +9,12 @@ export class CiscoMerakiApi implements ICredentialType {
 
 	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',
diff --git a/packages/nodes-base/credentials/CiscoSecureEndpointApi.credentials.ts b/packages/nodes-base/credentials/CiscoSecureEndpointApi.credentials.ts
index a93cf2726b..81a3a6fb70 100644
--- a/packages/nodes-base/credentials/CiscoSecureEndpointApi.credentials.ts
+++ b/packages/nodes-base/credentials/CiscoSecureEndpointApi.credentials.ts
@@ -17,6 +17,12 @@ export class CiscoSecureEndpointApi implements ICredentialType {
 
 	icon = 'file:icons/Cisco.svg';
 
+	httpRequestNode = {
+		name: 'Cisco Secure Endpoint',
+		docsUrl: 'https://developer.cisco.com/docs/secure-endpoint/',
+		apiBaseUrl: '',
+	};
+
 	properties: INodeProperties[] = [
 		{
 			displayName: 'Region',
diff --git a/packages/nodes-base/credentials/CiscoUmbrellaApi.credentials.ts b/packages/nodes-base/credentials/CiscoUmbrellaApi.credentials.ts
index d88d7721ec..2a3120ab40 100644
--- a/packages/nodes-base/credentials/CiscoUmbrellaApi.credentials.ts
+++ b/packages/nodes-base/credentials/CiscoUmbrellaApi.credentials.ts
@@ -16,6 +16,12 @@ export class CiscoUmbrellaApi implements ICredentialType {
 
 	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',
diff --git a/packages/nodes-base/credentials/CrowdStrikeOAuth2Api.credentials.ts b/packages/nodes-base/credentials/CrowdStrikeOAuth2Api.credentials.ts
index 328ac28c9a..ca2aec474d 100644
--- a/packages/nodes-base/credentials/CrowdStrikeOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/CrowdStrikeOAuth2Api.credentials.ts
@@ -16,6 +16,12 @@ export class CrowdStrikeOAuth2Api implements ICredentialType {
 
 	icon = 'file:icons/CrowdStrike.svg';
 
+	httpRequestNode = {
+		name: 'CrowdStrike',
+		docsUrl: 'https://developer.crowdstrike.com/',
+		apiBaseUrl: '',
+	};
+
 	properties: INodeProperties[] = [
 		{
 			displayName: 'Session Token',
diff --git a/packages/nodes-base/credentials/CustomerIoApi.credentials.ts b/packages/nodes-base/credentials/CustomerIoApi.credentials.ts
index 7ac91eefbb..fe805e4af8 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,
@@ -76,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/DiscordBotApi.credentials.ts b/packages/nodes-base/credentials/DiscordBotApi.credentials.ts
new file mode 100644
index 0000000000..464ae963ed
--- /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 0000000000..d0a026507e
--- /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 0000000000..b0fcc51f23
--- /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/F5BigIpApi.credentials.ts b/packages/nodes-base/credentials/F5BigIpApi.credentials.ts
index b27bffbb8f..a3204ae8b2 100644
--- a/packages/nodes-base/credentials/F5BigIpApi.credentials.ts
+++ b/packages/nodes-base/credentials/F5BigIpApi.credentials.ts
@@ -9,6 +9,12 @@ export class F5BigIpApi implements ICredentialType {
 
 	icon = 'file:icons/F5.svg';
 
+	httpRequestNode = {
+		name: 'F5 Big-IP',
+		docsUrl: 'https://clouddocs.f5.com/api/',
+		apiBaseUrl: '',
+	};
+
 	properties: INodeProperties[] = [
 		{
 			displayName: 'Username',
diff --git a/packages/nodes-base/credentials/FacebookLeadAdsOAuth2Api.credentials.ts b/packages/nodes-base/credentials/FacebookLeadAdsOAuth2Api.credentials.ts
index 328af580dc..a21dece406 100644
--- a/packages/nodes-base/credentials/FacebookLeadAdsOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/FacebookLeadAdsOAuth2Api.credentials.ts
@@ -34,7 +34,8 @@ export class FacebookLeadAdsOAuth2Api implements ICredentialType {
 			displayName: 'Scope',
 			name: 'scope',
 			type: 'hidden',
-			default: 'leads_retrieval pages_show_list pages_manage_metadata pages_manage_ads',
+			default:
+				'leads_retrieval pages_show_list pages_manage_metadata pages_manage_ads business_management',
 		},
 		{
 			displayName: 'Auth URI Query Parameters',
diff --git a/packages/nodes-base/credentials/FortiGateApi.credentials.ts b/packages/nodes-base/credentials/FortiGateApi.credentials.ts
index 39ecb52880..30655d651f 100644
--- a/packages/nodes-base/credentials/FortiGateApi.credentials.ts
+++ b/packages/nodes-base/credentials/FortiGateApi.credentials.ts
@@ -9,6 +9,13 @@ export class FortiGateApi implements ICredentialType {
 
 	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',
diff --git a/packages/nodes-base/credentials/HybridAnalysisApi.credentials.ts b/packages/nodes-base/credentials/HybridAnalysisApi.credentials.ts
index e01f2ce1e9..a7c06463da 100644
--- a/packages/nodes-base/credentials/HybridAnalysisApi.credentials.ts
+++ b/packages/nodes-base/credentials/HybridAnalysisApi.credentials.ts
@@ -9,6 +9,12 @@ export class HybridAnalysisApi implements ICredentialType {
 
 	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',
diff --git a/packages/nodes-base/credentials/ImpervaWafApi.credentials.ts b/packages/nodes-base/credentials/ImpervaWafApi.credentials.ts
index c2e35a5bd2..2046f428a4 100644
--- a/packages/nodes-base/credentials/ImpervaWafApi.credentials.ts
+++ b/packages/nodes-base/credentials/ImpervaWafApi.credentials.ts
@@ -9,6 +9,12 @@ export class ImpervaWafApi implements ICredentialType {
 
 	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',
diff --git a/packages/nodes-base/credentials/KibanaApi.credentials.ts b/packages/nodes-base/credentials/KibanaApi.credentials.ts
index 417bc683f2..432b53cb4e 100644
--- a/packages/nodes-base/credentials/KibanaApi.credentials.ts
+++ b/packages/nodes-base/credentials/KibanaApi.credentials.ts
@@ -14,6 +14,12 @@ export class KibanaApi implements ICredentialType {
 
 	icon = 'file:icons/Kibana.svg';
 
+	httpRequestNode = {
+		name: 'Kibana',
+		docsUrl: 'https://www.elastic.co/guide/en/kibana/current/api.html',
+		apiBaseUrl: '',
+	};
+
 	properties: INodeProperties[] = [
 		{
 			displayName: 'URL',
diff --git a/packages/nodes-base/credentials/MistApi.credentials.ts b/packages/nodes-base/credentials/MistApi.credentials.ts
index af3db226d0..d74fe8a64b 100644
--- a/packages/nodes-base/credentials/MistApi.credentials.ts
+++ b/packages/nodes-base/credentials/MistApi.credentials.ts
@@ -14,6 +14,12 @@ export class MistApi implements ICredentialType {
 
 	documentationUrl = 'mist';
 
+	httpRequestNode = {
+		name: 'Mist',
+		docsUrl: 'https://www.mist.com/documentation/mist-api-introduction/',
+		apiBaseUrl: '',
+	};
+
 	properties: INodeProperties[] = [
 		{
 			displayName: 'API Token',
diff --git a/packages/nodes-base/credentials/MondayComApi.credentials.ts b/packages/nodes-base/credentials/MondayComApi.credentials.ts
index abd31133fd..d82677b090 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';
@@ -16,4 +21,27 @@ export class MondayComApi implements ICredentialType {
 			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 f018e67b59..495e9ed5b8 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/OktaApi.credentials.ts b/packages/nodes-base/credentials/OktaApi.credentials.ts
index e9ac1d6c8d..fdbeb2defc 100644
--- a/packages/nodes-base/credentials/OktaApi.credentials.ts
+++ b/packages/nodes-base/credentials/OktaApi.credentials.ts
@@ -14,6 +14,12 @@ export class OktaApi implements ICredentialType {
 
 	icon = 'file:icons/Okta.svg';
 
+	httpRequestNode = {
+		name: 'Okta',
+		docsUrl: 'https://developer.okta.com/docs/reference/',
+		apiBaseUrl: '',
+	};
+
 	properties: INodeProperties[] = [
 		{
 			displayName: 'URL',
diff --git a/packages/nodes-base/credentials/OpenAiApi.credentials.ts b/packages/nodes-base/credentials/OpenAiApi.credentials.ts
index f460458755..b97ae856f9 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
index 3bdf55187d..dde51838ed 100644
--- a/packages/nodes-base/credentials/OpenCTIApi.credentials.ts
+++ b/packages/nodes-base/credentials/OpenCTIApi.credentials.ts
@@ -9,6 +9,12 @@ export class OpenCTIApi implements ICredentialType {
 
 	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',
diff --git a/packages/nodes-base/credentials/QRadarApi.credentials.ts b/packages/nodes-base/credentials/QRadarApi.credentials.ts
index 5301f8116c..5da8eaab37 100644
--- a/packages/nodes-base/credentials/QRadarApi.credentials.ts
+++ b/packages/nodes-base/credentials/QRadarApi.credentials.ts
@@ -9,6 +9,12 @@ export class QRadarApi implements ICredentialType {
 
 	documentationUrl = 'qradar';
 
+	httpRequestNode = {
+		name: 'QRadar',
+		docsUrl: 'https://www.ibm.com/docs/en/qradar-common',
+		apiBaseUrl: '',
+	};
+
 	properties: INodeProperties[] = [
 		{
 			displayName: 'API Key',
diff --git a/packages/nodes-base/credentials/QualysApi.credentials.ts b/packages/nodes-base/credentials/QualysApi.credentials.ts
index 001a1d4dd5..5f54b9dc53 100644
--- a/packages/nodes-base/credentials/QualysApi.credentials.ts
+++ b/packages/nodes-base/credentials/QualysApi.credentials.ts
@@ -9,6 +9,12 @@ export class QualysApi implements ICredentialType {
 
 	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',
diff --git a/packages/nodes-base/credentials/RecordedFutureApi.credentials.ts b/packages/nodes-base/credentials/RecordedFutureApi.credentials.ts
index bca6c952ac..2a19b4a8eb 100644
--- a/packages/nodes-base/credentials/RecordedFutureApi.credentials.ts
+++ b/packages/nodes-base/credentials/RecordedFutureApi.credentials.ts
@@ -9,6 +9,12 @@ export class RecordedFutureApi implements ICredentialType {
 
 	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',
diff --git a/packages/nodes-base/credentials/SekoiaApi.credentials.ts b/packages/nodes-base/credentials/SekoiaApi.credentials.ts
index 33b8fb3bea..e9bee6dbcd 100644
--- a/packages/nodes-base/credentials/SekoiaApi.credentials.ts
+++ b/packages/nodes-base/credentials/SekoiaApi.credentials.ts
@@ -9,6 +9,12 @@ export class SekoiaApi implements ICredentialType {
 
 	documentationUrl = 'sekoia';
 
+	httpRequestNode = {
+		name: 'Sekoia',
+		docsUrl: 'https://docs.sekoia.io/cti/features/integrations/api/',
+		apiBaseUrl: 'https://api.sekoia.io/',
+	};
+
 	properties: INodeProperties[] = [
 		{
 			displayName: 'API Key',
diff --git a/packages/nodes-base/credentials/ShufflerApi.credentials.ts b/packages/nodes-base/credentials/ShufflerApi.credentials.ts
index 0c4014ee52..ce5995df6b 100644
--- a/packages/nodes-base/credentials/ShufflerApi.credentials.ts
+++ b/packages/nodes-base/credentials/ShufflerApi.credentials.ts
@@ -14,6 +14,12 @@ export class ShufflerApi implements ICredentialType {
 
 	documentationUrl = 'shuffler';
 
+	httpRequestNode = {
+		name: 'Shuffler',
+		docsUrl: 'https://shuffler.io/docs/API',
+		apiBaseUrl: 'https://shuffler.io/api/v1/',
+	};
+
 	properties: INodeProperties[] = [
 		{
 			displayName: 'API Key',
diff --git a/packages/nodes-base/credentials/SupabaseApi.credentials.ts b/packages/nodes-base/credentials/SupabaseApi.credentials.ts
index e75bcd0211..e565261b63 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/TrellixEpoApi.credentials.ts b/packages/nodes-base/credentials/TrellixEpoApi.credentials.ts
index c3d699b4d1..c4fbab9bdf 100644
--- a/packages/nodes-base/credentials/TrellixEpoApi.credentials.ts
+++ b/packages/nodes-base/credentials/TrellixEpoApi.credentials.ts
@@ -9,6 +9,12 @@ export class TrellixEpoApi implements ICredentialType {
 
 	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',
diff --git a/packages/nodes-base/credentials/TwakeServerApi.credentials.ts b/packages/nodes-base/credentials/TwakeServerApi.credentials.ts
index f8f8132da7..2738465069 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',
diff --git a/packages/nodes-base/credentials/VenafiTlsProtectCloudApi.credentials.ts b/packages/nodes-base/credentials/VenafiTlsProtectCloudApi.credentials.ts
index 0fea551ee4..c200acd8f7 100644
--- a/packages/nodes-base/credentials/VenafiTlsProtectCloudApi.credentials.ts
+++ b/packages/nodes-base/credentials/VenafiTlsProtectCloudApi.credentials.ts
@@ -13,6 +13,22 @@ export class VenafiTlsProtectCloudApi implements ICredentialType {
 	documentationUrl = 'venafitlsprotectcloud';
 
 	properties: INodeProperties[] = [
+		{
+			displayName: 'Region',
+			name: 'region',
+			type: 'options',
+			options: [
+				{
+					name: 'US',
+					value: 'cloud',
+				},
+				{
+					name: 'EU',
+					value: 'eu',
+				},
+			],
+			default: 'cloud',
+		},
 		{
 			displayName: 'API Key',
 			name: 'apiKey',
@@ -33,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/VirusTotalApi.credentials.ts b/packages/nodes-base/credentials/VirusTotalApi.credentials.ts
index fa4b7c6089..3a69d520f9 100644
--- a/packages/nodes-base/credentials/VirusTotalApi.credentials.ts
+++ b/packages/nodes-base/credentials/VirusTotalApi.credentials.ts
@@ -8,12 +8,18 @@ import type {
 export class VirusTotalApi implements ICredentialType {
 	name = 'virusTotalApi';
 
-	displayName = 'Virus Total API';
+	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',
diff --git a/packages/nodes-base/credentials/WordpressApi.credentials.ts b/packages/nodes-base/credentials/WordpressApi.credentials.ts
index 39fa85504e..01f4761884 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/ZscalerZiaApi.credentials.ts b/packages/nodes-base/credentials/ZscalerZiaApi.credentials.ts
index 64ac0618a1..bd3260442b 100644
--- a/packages/nodes-base/credentials/ZscalerZiaApi.credentials.ts
+++ b/packages/nodes-base/credentials/ZscalerZiaApi.credentials.ts
@@ -1,3 +1,4 @@
+import { ApplicationError } from 'n8n-workflow';
 import type {
 	IAuthenticateGeneric,
 	ICredentialDataDecryptedObject,
@@ -16,6 +17,12 @@ export class ZscalerZiaApi implements ICredentialType {
 
 	icon = 'file:icons/Zscaler.svg';
 
+	httpRequestNode = {
+		name: 'Zscaler ZIA',
+		docsUrl: 'https://help.zscaler.com/zia/getting-started-zia-api',
+		apiBaseUrl: '',
+	};
+
 	properties: INodeProperties[] = [
 		{
 			displayName: 'Cookie',
@@ -114,7 +121,9 @@ export class ZscalerZiaApi implements ICredentialType {
 			?.find((entry) => entry.includes('JSESSIONID'));
 
 		if (!cookie) {
-			throw new Error('No cookie returned. Please check your credentials.');
+			throw new ApplicationError('No cookie returned. Please check your credentials.', {
+				level: 'warning',
+			});
 		}
 
 		return { cookie };
diff --git a/packages/nodes-base/credentials/icons/AWS.svg b/packages/nodes-base/credentials/icons/AWS.svg
index 61722af9d1..760c2530f4 100644
--- a/packages/nodes-base/credentials/icons/AWS.svg
+++ b/packages/nodes-base/credentials/icons/AWS.svg
@@ -1 +1 @@
-<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
+<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/Auth0.svg b/packages/nodes-base/credentials/icons/Auth0.svg
index cf8aa7062e..75ee017e1a 100644
--- a/packages/nodes-base/credentials/icons/Auth0.svg
+++ b/packages/nodes-base/credentials/icons/Auth0.svg
@@ -1,3 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
-  <path d="M29.307 9.932l-3.146-9.932h-20.365l-3.104 9.932c-1.802 5.75 0.042 12.271 5.089 16.021l8.229 6.047 8.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-0.063 3.146-9.891 3.141 9.87z"/>
-</svg>
+<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
index e24e2189ce..bbbc6c33b3 100644
--- a/packages/nodes-base/credentials/icons/Azure.svg
+++ b/packages/nodes-base/credentials/icons/Azure.svg
@@ -1,27 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="256px" height="242px" viewBox="0 0 256 242" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" preserveAspectRatio="xMidYMid">
-    <title>Azure</title>
-    <defs>
-        <linearGradient x1="58.9717389%" y1="7.4114724%" x2="37.1905196%" y2="103.76182%" id="Azure-linearGradient-1">
-            <stop stop-color="#114A8B" offset="0%"></stop>
-            <stop stop-color="#0669BC" offset="100%"></stop>
-        </linearGradient>
-        <linearGradient x1="59.7188447%" y1="52.3127289%" x2="52.6914332%" y2="54.8636556%" id="Azure-linearGradient-2">
-            <stop stop-color="#000000" stop-opacity="0.3" offset="0%"></stop>
-            <stop stop-color="#000000" stop-opacity="0.2" offset="7.1%"></stop>
-            <stop stop-color="#000000" stop-opacity="0.1" offset="32.1%"></stop>
-            <stop stop-color="#000000" stop-opacity="0.05" offset="62.3%"></stop>
-            <stop stop-color="#000000" stop-opacity="0" offset="100%"></stop>
-        </linearGradient>
-        <linearGradient x1="37.2789399%" y1="4.60005789%" x2="62.4733904%" y2="99.9794963%" id="Azure-linearGradient-3">
-            <stop stop-color="#3CCBF4" offset="0%"></stop>
-            <stop stop-color="#2892DF" offset="100%"></stop>
-        </linearGradient>
-    </defs>
-    <g>
-				<path d="M85.3432536,0.00290931225 L161.095926,0.00290931225 L82.4572158,233.000999 C80.7999506,237.910266 76.1963409,241.216897 71.0148908,241.216897 L12.0605874,241.216897 C8.17631708,241.216897 4.52963465,239.346777 2.26398956,236.191716 C-0.00165554136,233.036655 -0.608845705,228.983428 0.632808896,225.302959 L73.8980192,8.2188071 C75.5546242,3.30737742 80.1599649,0 85.3432536,0 L85.3432536,0.00290931225 Z" fill="url(#Azure-linearGradient-1)"></path>
-				<path d="M195.422901,156.282432 L75.2973984,156.282432 C73.0119231,156.279908 70.9577304,157.676287 70.1192383,159.802395 C69.2807461,161.928503 69.8287946,164.351151 71.5007459,165.909349 L148.690618,237.955558 C150.937998,240.051977 153.897138,241.216897 156.970521,241.216897 L224.990241,241.216897 L195.422901,156.282432 Z" fill="#0078D4"></path>
-				<path d="M85.3432536,0.00282026831 C80.0982223,-0.017218565 75.4499031,3.37677358 73.8718354,8.37881927 L0.722997576,225.105126 C-0.602635687,228.800183 -0.0443562611,232.909431 2.21904685,236.116884 C4.48244996,239.324337 8.16695154,241.227505 12.0925898,241.216941 L72.5684635,241.216941 C77.154039,240.397586 80.9441027,237.174364 82.4892183,232.779891 L97.0765099,189.788984 L149.182292,238.389046 C151.365814,240.195147 154.104928,241.193803 156.938519,241.216941 L224.705129,241.216941 L194.983595,156.282435 L108.341367,156.3028 L161.369401,0.00282026831 L85.3432536,0.00282026831 Z" fill="url(#Azure-linearGradient-2)"></path>
-				<path d="M182.098251,8.20716985 C180.443985,3.30365177 175.845517,0.00290931225 170.670472,0.00290931225 L86.2451404,0.00290931225 C91.4198966,0.00290931225 96.0178956,3.30421162 97.6729189,8.20716985 L170.941039,225.30005 C172.18363,228.981191 171.576996,233.035501 169.311351,236.191716 C167.045705,239.34793 163.398467,241.219806 159.51326,241.219806 L243.941501,241.219806 C247.826196,241.219806 251.472566,239.346605 253.737531,236.190534 C256.002496,233.034464 256.608798,228.980705 255.366371,225.30005 L182.098251,8.20716985 Z" fill="url(#Azure-linearGradient-3)"></path>
-		</g>
-</svg>
+<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
index b1f6ae27b1..66a600af2c 100644
--- a/packages/nodes-base/credentials/icons/Cisco.svg
+++ b/packages/nodes-base/credentials/icons/Cisco.svg
@@ -1,35 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   version="1.1"
-   width="216"
-   height="114"
-   fill="#049fd9"
-   id="svg24">
-  <path
-     d="m 106.48,76.238 c -0.282,-0.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 0.585,0.193 1.447,0.463 2.021,0.653 2.349,0.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.395 v 8.637 c 0.466,0.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.737 L 97.559,89.755 C 96,89.263 93.217,88.466 93.217,86.181 c 0,-1.805 2.062,-3.076 5.859,-3.076 3.276,0 7.263,1.101 7.404,1.145 z m 80.041,18.243 c 0,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.87 m -9.796,-19.427 c -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.427 M 70.561,113.251 H 61.089 V 75.719 h 9.472"
-     id="path10" />
-  <path
-     d="m 48.07,76.399 c -0.89,-0.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.336 v -10.075 c -0.407,0.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"
-     id="path12" />
-  <use
-     xlink:href="#path12"
-     transform="translate(98.86)"
-     id="use14" />
-  <g
-     id="g22">
-    <path
-       d="m 61.061,4.759 c 0,-2.587 -2.113,-4.685 -4.703,-4.685 -2.589,0 -4.702,2.098 -4.702,4.685 v 49.84 c 0,2.602 2.113,4.699 4.702,4.699 2.59,0 4.703,-2.097 4.703,-4.699 z M 35.232,22.451 c 0,-2.586 -2.112,-4.687 -4.702,-4.687 -2.59,0 -4.702,2.101 -4.702,4.687 v 22.785 c 0,2.601 2.112,4.699 4.702,4.699 2.59,0 4.702,-2.098 4.702,-4.699 z M 9.404,35.383 C 9.404,32.796 7.292,30.699 4.702,30.699 2.115,30.699 0,32.796 0,35.383 v 9.853 c 0,2.601 2.115,4.699 4.702,4.699 2.59,0 4.702,-2.098 4.702,-4.699"
-       id="path16" />
-    <use
-       xlink:href="#path16"
-       transform="matrix(-1,0,0,1,112.717,0)"
-       id="use18" />
-  </g>
-  <use
-     xlink:href="#g22"
-     transform="matrix(-1,0,0,1,216,0)"
-     id="use20" />
-</svg>
+<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
index 1b2195a224..8db5558b7b 100644
--- a/packages/nodes-base/credentials/icons/CrowdStrike.svg
+++ b/packages/nodes-base/credentials/icons/CrowdStrike.svg
@@ -1 +1 @@
-<svg height="1675" viewBox="-.3 3.8 900.3 599.8" width="2500" xmlns="http://www.w3.org/2000/svg"><g fill="#da1b1b"><path d="m59 5.5c0 1.7 12.6 27.2 14.1 28.5.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.6c-12.9-10.1-56.9-52.3-61.3-58.8-1.9-2.8-4.7-4.5-4.7-2.8z"/><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.4zm447.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 .2zm-519-240c0 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-8zm113.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-.8z"/><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 7zm-336.1 206.6c-5.8 1.5-12.9 5.5-17.6 9.9-4.5 4.2-9.8 13.2-9.8 16.6 0 .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.6zm177.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.2zm16.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 1zm277.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 2zm-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-1zm34.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-.2zm81.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-.7zm35.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.9zm118.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.1h-16.2zm34-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.7zm49.9-9c-.4.3-.7 17.7-.7 38.5v37.8h10v-77h-4.3c-2.4 0-4.7.3-5 .7zm44.3-.2v75.5c0 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.1v-15.9h-4c-2.2 0-4 .2-4 .5zm81 38v38.5h48v-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.7h-44.1z"/></g></svg>
\ No newline at end of file
+<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
index 46c1a095da..f693eb822c 100644
--- a/packages/nodes-base/credentials/icons/F5.svg
+++ b/packages/nodes-base/credentials/icons/F5.svg
@@ -1,11 +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>
-  <title>F5 Logo</title>
-  <g id="F5Logo">
-    <path class="svg-red" 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.6Zm3.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"/>
-    <path class="svg-white" 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.1 1995.1 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.4a9594.8 9594.8 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.2Z"/>
-    <path class="svg-white" 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.4a5198.9 5198.9 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.7Z"/>
-    <path class="svg-red" 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.4Z"/>
-    <path class="svg-red" d="M127.5 833.4Z" />
-  </g>
-</svg>
\ No newline at end of file
+<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
index 6224b4c6bb..9b0e4aadc2 100644
--- a/packages/nodes-base/credentials/icons/Fortinet.svg
+++ b/packages/nodes-base/credentials/icons/Fortinet.svg
@@ -1,7 +1 @@
-<svg version="1.2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1537 1101" width="1537" height="1101">
-	<title>fortinet-logo-svg</title>
-	<style>
-		.s0 { fill: #ee3124 } 
-	</style>
-	<path id="Layer" fill-rule="evenodd" class="s0" d="m0.2 408.6h434.5v285.8h-434.5zm554.7-406.3h426.8v285.8h-426.8zm0 811h426.8v285.8h-426.8zm545.4-404.7h436v285.8h-436zm-665.6-406.3v287.3h-434.5v-32.4c17-129.8 87.8-231.8 178.7-254.9zm1.6 811v285.8h-268.1c-86.3-27.8-152.5-126.7-167.9-250.3v-35.5zm1100-526.8h-436v-285.8h257.3c90.9 24.7 161.8 126.7 178.7 254.9zm-436 814.1v-285.7h436v35.5c-16.9 123.6-83.2 220.9-167.9 250.2z"/>
-</svg>
\ No newline at end of file
+<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
index b518c52704..38f3c22592 100644
--- a/packages/nodes-base/credentials/icons/Google.svg
+++ b/packages/nodes-base/credentials/icons/Google.svg
@@ -1 +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-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
+<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/IBM.svg b/packages/nodes-base/credentials/icons/IBM.svg
index f8574f6286..0e5ac9ec25 100644
--- a/packages/nodes-base/credentials/icons/IBM.svg
+++ b/packages/nodes-base/credentials/icons/IBM.svg
@@ -1,54 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 23.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Livello_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="1000px" height="401.149px" viewBox="0 0 1000 401.149" enable-background="new 0 0 1000 401.149" xml:space="preserve">
-<g>
-	<g>
-		<polygon id="Rectangle-path" fill="#1F70C1" points="0,373.217 194.433,373.217 194.433,401.05 0,401.05 		"/>
-		<polygon id="Rectangle-path_1_" fill="#1F70C1" points="0,319.83 194.433,319.83 194.433,347.761 0,347.761 		"/>
-		<polygon id="Rectangle-path_2_" fill="#1F70C1" points="55.468,266.541 138.867,266.541 138.867,294.473 55.468,294.473 		"/>
-		<polygon id="Rectangle-path_3_" fill="#1F70C1" points="55.468,213.253 138.867,213.253 138.867,241.185 55.468,241.185 		"/>
-		<polygon id="Rectangle-path_4_" fill="#1F70C1" points="55.468,159.964 138.867,159.964 138.867,187.896 55.468,187.896 		"/>
-		<polygon id="Rectangle-path_5_" fill="#1F70C1" points="55.468,106.577 138.867,106.577 138.867,134.509 55.468,134.509 		"/>
-		<rect id="Rectangle-path_6_" y="53.288" fill="#1F70C1" width="194.433" height="27.932"/>
-		<rect id="Rectangle-path_7_" fill="#1F70C1" width="194.433" height="27.932"/>
-	</g>
-	<g>
-		<path id="Shape_16_" fill="#1F70C1" d="M222.167,347.761h299.029c5.051-8.617,8.815-18.027,11.094-27.932H222.167V347.761z"/>
-		<path id="Shape_17_" fill="#1F70C1" d="M497.92,213.253H277.734v27.932h243.463C514.857,230.487,507.032,221.078,497.92,213.253z"
-			/>
-		<path id="Shape_18_" fill="#1F70C1" d="M277.734,159.964v27.932H497.92c9.311-7.825,17.135-17.235,23.277-27.932H277.734z"/>
-		<path id="Shape_19_" fill="#1F70C1" d="M521.197,53.288H222.167V81.22H532.29C529.715,71.315,525.951,61.906,521.197,53.288z"/>
-		<path id="Shape_20_" fill="#1F70C1" d="M429.279,0H222.167v27.932h278.526C482.072,10.697,456.815,0,429.279,0z"/>
-		<rect id="Rectangle-path_8_" x="277.734" y="106.577" fill="#1F70C1" width="83.3" height="27.932"/>
-		<path id="Shape_21_" fill="#1F70C1" d="M444.433,134.509h87.163c2.476-8.914,3.764-18.324,3.764-27.932h-90.927L444.433,134.509
-			L444.433,134.509z"/>
-		<polygon id="Rectangle-path_9_" fill="#1F70C1" points="277.734,266.541 361.034,266.541 361.034,294.473 277.734,294.473 		"/>
-		<path id="Shape_22_" fill="#1F70C1" d="M444.433,266.541v27.932h90.927c0-9.608-1.288-19.017-3.764-27.932H444.433z"/>
-		<path id="Shape_23_" fill="#1F70C1" d="M222.167,400.852l207.112,0.297c27.734,0,52.793-10.697,71.513-27.932H222.167V400.852z"/>
-	</g>
-	<g>
-		<polygon id="Rectangle-path_10_" fill="#1F70C1" points="555.567,373.217 694.433,373.217 694.433,401.05 555.567,401.05 		"/>
-		<polygon id="Rectangle-path_11_" fill="#1F70C1" points="555.567,319.83 694.433,319.83 694.433,347.761 555.567,347.761 		"/>
-		<polygon id="Rectangle-path_12_" fill="#1F70C1" points="611.034,266.541 694.433,266.541 694.433,294.473 611.034,294.473 		"/>
-		<polygon id="Rectangle-path_13_" fill="#1F70C1" points="611.034,213.253 694.433,213.253 694.433,241.185 611.034,241.185 		"/>
-		<polygon id="Shape_24_" fill="#1F70C1" points="733.063,53.288 555.567,53.288 555.567,81.22 742.67,81.22 		"/>
-		<polygon id="Shape_25_" fill="#1F70C1" points="714.639,0 555.567,0 555.567,27.932 724.247,27.932 		"/>
-		<polygon id="Rectangle-path_14_" fill="#1F70C1" points="861.034,373.217 1000,373.217 1000,401.05 861.034,401.05 		"/>
-		<polygon id="Rectangle-path_15_" fill="#1F70C1" points="861.034,319.83 1000,319.83 1000,347.761 861.034,347.761 		"/>
-		<polygon id="Rectangle-path_16_" fill="#1F70C1" points="861.034,266.541 944.433,266.541 944.433,294.473 861.034,294.473 		"/>
-		<polygon id="Rectangle-path_17_" fill="#1F70C1" points="861.034,213.253 944.433,213.253 944.433,241.185 861.034,241.185 		"/>
-		<polygon id="Shape_26_" fill="#1F70C1" points="861.034,187.896 944.433,187.896 944.433,159.964 861.034,159.964 
-			861.034,159.964 785.559,159.964 777.734,182.548 769.909,159.964 694.433,159.964 694.433,159.964 611.034,159.964 
-			611.034,187.896 694.433,187.896 694.433,162.242 703.249,187.896 852.219,187.896 861.034,162.242 		"/>
-		<polygon id="Shape_27_" fill="#1F70C1" points="944.433,106.577 803.982,106.577 794.374,134.509 944.433,134.509 		"/>
-		<polygon id="Shape_28_" fill="#1F70C1" points="840.927,0 831.319,27.932 1000,27.932 1000,0 		"/>
-		<polygon id="Shape_29_" fill="#1F70C1" points="777.734,400.852 787.341,373.217 768.126,373.217 		"/>
-		<polygon id="Shape_30_" fill="#1F70C1" points="759.311,347.761 796.157,347.761 806.062,319.83 749.505,319.83 		"/>
-		<polygon id="Shape_31_" fill="#1F70C1" points="740.59,294.473 814.877,294.473 824.683,266.541 730.784,266.541 		"/>
-		<polygon id="Shape_32_" fill="#1F70C1" points="721.969,241.185 833.597,241.185 843.106,213.253 712.361,213.253 		"/>
-		<polygon id="Shape_33_" fill="#1F70C1" points="611.034,134.509 761.093,134.509 751.486,106.577 611.034,106.577 		"/>
-		<polygon id="Shape_34_" fill="#1F70C1" points="812.896,81.22 1000,81.22 1000,53.288 822.405,53.288 		"/>
-	</g>
-</g>
-</svg>
+<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
index 73f19ccaf6..f8521cb9be 100644
--- a/packages/nodes-base/credentials/icons/Imperva.svg
+++ b/packages/nodes-base/credentials/icons/Imperva.svg
@@ -1,51 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   version="1.1"
-   id="Layer_1"
-   x="0"
-   y="0"
-   viewBox="0 0 499.99999 500.00001"
-   xml:space="preserve"
-   sodipodi:docname="Imperva.svg"
-   width="500"
-   height="500"
-   inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
-   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="defs7" /><sodipodi:namedview
-     id="namedview5"
-     pagecolor="#ffffff"
-     bordercolor="#000000"
-     borderopacity="0.25"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     showgrid="false"
-     inkscape:zoom="1.4340829"
-     inkscape:cx="240.22322"
-     inkscape:cy="231.15819"
-     inkscape:window-width="1920"
-     inkscape:window-height="1014"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g972" /><g
-     id="g972"
-     transform="matrix(12.458909,0,0,12.458909,53.149238,131.60215)"><g
-       id="g2429"
-       transform="matrix(1.1703821,0,0,1.1703821,-3.1165512,2.2431085)"><path
-         style="fill:#235ae6;fill-opacity:1"
-         d="m 26.462714,0.80306724 c 3.4,0 5.5,2.39999996 5.5,6.19999996 V 17.903067 h -4.6 V 8.0030672 c 0,-1.8 -0.8,-3 -2.4,-3 -1.2,0 -2.3,0.8 -2.6,2.2 V 18.003067 h -4.7 V 8.1030672 c 0,-1.8 -0.8,-3 -2.4,-3 -1.2,0 -2.3,0.8 -2.6,2.2 V 18.103067 H 8.0627141 V 1.1030672 h 4.5999999 v 1.4 c 0.8,-1 2.4,-1.79999996 4.2,-1.79999996 2,0 3.6,0.89999996 4.5,2.09999996 1.1,-1.1 2.7,-1.99999996 5.1,-1.99999996 z"
-         id="path944"
-         sodipodi:nodetypes="ssccsscccssccccccscs" /><path
-         style="fill:#235ae6;fill-opacity:1"
-         d="M 4.9627141,17.903067 H 0.36271409 V 1.1030672 H 4.9627141 Z"
-         id="path942"
-         sodipodi:nodetypes="ccccc" /><path
-         style="fill:#000000;fill-opacity:1"
-         d="M 4.9627141,-5.6969328 H 0.36271409 v 4.6 H 4.9627141 Z"
-         id="path2"
-         sodipodi:nodetypes="ccccc" /></g></g></svg>
+<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
index a81cff70d0..6f80f7e66d 100644
--- a/packages/nodes-base/credentials/icons/Kibana.svg
+++ b/packages/nodes-base/credentials/icons/Kibana.svg
@@ -1,9 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="256px" height="328px" viewBox="0 0 256 328" version="1.1" xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMidYMid">
-    <title>Kibana</title>
-    <g>
-        <polygon fill="#F04E98" points="256 0 -4.7684239e-17 0 2.20275616e-13 294.78912"></polygon>
-        <path d="M2.27373675e-13,122.88 L2.27373675e-13,294.78912 L122.19392,154.08128 C85.8624,134.27712 44.288,122.88 2.27373675e-13,122.88" fill="#343741"></path>
-        <path d="M148.589568,170.540032 L23.200768,314.944512 L12.131328,327.683072 L250.866688,327.683072 C237.769728,263.130112 200.301568,207.496192 148.589568,170.540032" fill="#00BFB3"></path>
-    </g>
-</svg>
+<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/icons/Mist.svg b/packages/nodes-base/credentials/icons/Mist.svg
index a0b9fcbe89..e52b244713 100644
--- a/packages/nodes-base/credentials/icons/Mist.svg
+++ b/packages/nodes-base/credentials/icons/Mist.svg
@@ -1,111 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   width="490"
-   height="490"
-   viewBox="0 0 129.64583 129.64583"
-   version="1.1"
-   id="svg5"
-   xml:space="preserve"
-   inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
-   sodipodi:docname="mist.svg"
-   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="namedview7"
-     pagecolor="#ffffff"
-     bordercolor="#000000"
-     borderopacity="0.25"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     inkscape:document-units="mm"
-     showgrid="false"
-     inkscape:zoom="1.0419012"
-     inkscape:cx="405.98859"
-     inkscape:cy="259.14165"
-     inkscape:window-width="1920"
-     inkscape:window-height="1007"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer1" /><defs
-     id="defs2" /><g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"><g
-       id="g2105"
-       transform="matrix(1.7489635,0,0,1.7489635,-162.276,-145.04238)"><rect
-         style="fill:#1963ae;fill-opacity:1;stroke-width:0.264583"
-         id="rect1634"
-         width="11.222793"
-         height="11.133011"
-         x="115.57233"
-         y="122.46314"
-         ry="1.2569518" /><rect
-         style="fill:#1963ae;fill-opacity:1;stroke-width:0.264583"
-         id="rect1895-5"
-         width="11.222793"
-         height="11.133011"
-         x="133.7308"
-         y="122.46314"
-         ry="1.2569518" /><rect
-         style="fill:#1963ae;fill-opacity:1;stroke-width:0.264583"
-         id="rect1895-35"
-         width="11.222793"
-         height="11.133011"
-         x="151.05879"
-         y="122.46314"
-         ry="1.2569518" /><rect
-         style="fill:#1963ae;fill-opacity:1;stroke-width:0.264583"
-         id="rect1895-62"
-         width="11.222793"
-         height="11.133011"
-         x="151.05879"
-         y="106.03299"
-         ry="1.2569518" /><rect
-         style="fill:#1963ae;fill-opacity:1;stroke-width:0.264583"
-         id="rect1895-9"
-         width="11.222793"
-         height="11.133011"
-         x="133.7308"
-         y="106.03299"
-         ry="1.2569518" /><rect
-         style="fill:#1963ae;fill-opacity:1;stroke-width:0.264583"
-         id="rect1895-2"
-         width="11.222793"
-         height="11.133011"
-         x="151.05879"
-         y="89.961891"
-         ry="1.2569518" /><rect
-         style="fill:#1963ae;fill-opacity:1;stroke-width:0.264583"
-         id="rect1916"
-         width="11.222793"
-         height="11.133011"
-         x="97.413849"
-         y="138.8933"
-         ry="1.2569518" /><rect
-         style="fill:#1963ae;fill-opacity:1;stroke-width:0.264583"
-         id="rect1895-3"
-         width="11.222793"
-         height="11.133011"
-         x="115.57233"
-         y="138.8933"
-         ry="1.2569518" /><rect
-         style="fill:#1963ae;fill-opacity:1;stroke-width:0.264583"
-         id="rect1895-6"
-         width="11.222793"
-         height="11.133011"
-         x="133.7308"
-         y="138.8933"
-         ry="1.2569518" /><rect
-         style="fill:#1963ae;fill-opacity:1;stroke-width:0.264583"
-         id="rect1895-7"
-         width="11.222793"
-         height="11.133011"
-         x="151.05879"
-         y="138.8933"
-         ry="1.2569518" /></g></g></svg>
+<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
index 0653992a71..a7f2ff4ca8 100644
--- a/packages/nodes-base/credentials/icons/Okta.svg
+++ b/packages/nodes-base/credentials/icons/Okta.svg
@@ -1,7 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="256px" height="256px" viewBox="0 0 256 256" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" preserveAspectRatio="xMidYMid">
-    <title>okta</title>
-    <g>
-        <path d="M140.84428,1.77777778 L135.578481,66.6311111 C133.0879,66.3466667 130.59732,66.2044444 128.03558,66.2044444 C124.833405,66.2044444 121.702389,66.4177778 118.642533,66.9155556 L115.653837,35.4844444 C115.582677,34.4888889 116.365431,33.6355556 117.361663,33.6355556 L122.698621,33.6355556 L120.136881,1.84888889 C120.065722,0.853333333 120.848476,0 121.773549,0 L139.207612,0 C140.203845,0 140.986598,0.853333333 140.84428,1.84888889 L140.84428,1.84888889 L140.84428,1.77777778 Z M96.8677434,4.97777778 C96.5831056,4.05333333 95.5868734,3.48444444 94.6618006,3.84 L78.2951286,9.81333333 C77.3700558,10.1688889 76.9430991,11.2355556 77.3700558,12.0888889 L90.6768718,41.1022222 L85.6245513,42.9511111 C84.6994785,43.3066667 84.2725218,44.3733333 84.6994785,45.2266667 L98.2909322,73.7422222 C103.200934,71.04 108.537892,68.9777778 114.159488,67.6977778 L96.9389028,4.97777778 L96.8677434,4.97777778 Z M56.7338171,23.04 L94.3771628,76.0888889 C89.6094801,79.2177778 85.268754,82.9155556 81.568463,87.1822222 L59.0109193,64.9955556 C58.2993249,64.2844444 58.3704843,63.1466667 59.0820788,62.5066667 L63.2093265,59.0933333 L40.7941017,36.4088889 C40.0825073,35.6977778 40.1536667,34.56 40.9364206,33.92 L54.2432366,22.7555556 C55.0259905,22.1155556 56.0933821,22.2577778 56.6626577,23.04 L56.7338171,23.04 Z M25.1390241,53.76 C24.3562702,53.1911111 23.2177191,53.4755556 22.719603,54.3288889 L14.0381509,69.4044444 C13.5400348,70.2577778 13.895832,71.3244444 14.7497453,71.7511111 L43.6404795,85.4044444 L40.9364206,90.0266667 C40.4383045,90.88 40.7941017,92.0177778 41.7191745,92.3733333 L70.4675897,105.528889 C72.5312136,100.195556 75.3064319,95.2177778 78.7220852,90.7377778 L25.1390241,53.76 Z M3.86235042,94.72 C4.00466931,93.7244444 5.00090152,93.1555556 5.92597429,93.3688889 L68.902082,109.795556 C67.2654148,115.128889 66.340342,120.746667 66.1980231,126.577778 L34.6743896,124.017778 C33.6781573,123.946667 32.9665629,123.022222 33.1800412,122.026667 L34.105114,116.764444 L2.29684266,113.777778 C1.30061044,113.706667 0.660175451,112.782222 0.802494339,111.786667 L3.79119098,94.6488889 L3.79119098,94.6488889 L3.86235042,94.72 Z M1.51408878,137.244444 C0.517856564,137.315556 -0.12257843,138.24 0.0197404578,139.235556 L3.07959654,156.373333 C3.22191543,157.368889 4.21814764,157.937778 5.14322041,157.724444 L36.026419,149.688889 L36.9514918,154.951111 C37.0938106,155.946667 38.0900429,156.515556 39.0151156,156.302222 L69.4713575,147.911111 C67.6923714,142.648889 66.5538203,137.031111 66.2691826,131.271111 L1.44292933,137.244444 L1.51408878,137.244444 Z M11.6187298,182.328889 C11.1206137,181.475556 11.4764109,180.408889 12.3303242,179.982222 L71.1080247,152.106667 C73.3139675,157.368889 76.3026641,162.275556 79.8606363,166.684444 L54.1009177,185.031111 C53.3181638,185.6 52.1796127,185.386667 51.6814966,184.533333 L48.9774377,179.84 L22.719603,197.973333 C21.9368491,198.542222 20.798298,198.257778 20.3001819,197.404444 L11.5475703,182.328889 L11.6187298,182.328889 Z M82.849333,170.097778 L37.0938106,216.391111 C36.3822162,217.102222 36.4533756,218.24 37.2361295,218.88 L50.6141049,230.044444 C51.3968588,230.684444 52.4642505,230.542222 53.033526,229.76 L71.5349814,203.733333 L75.6622291,207.217778 C76.444983,207.857778 77.5835341,207.715556 78.1528097,206.862222 L96.0849895,180.835556 C91.2461473,177.848889 86.7631024,174.222222 82.9204924,170.097778 L82.849333,170.097778 Z M73.8120836,244.408889 C72.8870108,244.053333 72.4600542,242.986667 72.8870108,242.133333 L99.9987589,182.968889 C104.97992,185.528889 110.388038,187.448889 116.009634,188.515556 L108.039776,219.093333 C107.826298,220.017778 106.758906,220.586667 105.833833,220.231111 L100.781513,218.382222 L92.313539,249.173333 C92.0289012,250.097778 91.032669,250.666667 90.1075962,250.311111 L73.7409242,244.337778 L73.7409242,244.337778 L73.8120836,244.408889 Z M120.492679,189.297778 L115.22688,254.151111 C115.15572,255.146667 115.938474,256 116.863547,256 L134.297611,256 C135.293843,256 136.076597,255.146667 135.934278,254.151111 L133.372538,222.364444 L138.709496,222.364444 C139.705728,222.364444 140.488482,221.511111 140.417323,220.515556 L137.428626,189.084444 C134.36877,189.582222 131.237755,189.795556 128.03558,189.795556 C125.47384,189.795556 122.983259,189.653333 120.492679,189.297778 L120.492679,189.297778 Z M183.255308,13.7244444 C183.682265,12.8 183.255308,11.8044444 182.330235,11.4488889 L165.963563,5.47555556 C165.03849,5.12 164.042258,5.68888889 163.75762,6.61333333 L155.289647,37.4044444 L150.237326,35.5555556 C149.312253,35.2 148.316021,35.7688889 148.031383,36.6933333 L140.061526,67.2711111 C145.754281,68.4088889 151.091239,70.3288889 156.072401,72.8177778 L183.255308,13.7244444 L183.255308,13.7244444 Z M218.977349,39.5377778 L173.221826,85.8311111 C169.379217,81.7066667 164.967331,78.08 160.057329,75.0933333 L177.989509,49.0666667 C178.558785,48.2844444 179.697336,48.0711111 180.48009,48.7111111 L184.607337,52.1955556 L203.108793,26.1688889 C203.678068,25.3866667 204.81662,25.2444444 205.528214,25.8844444 L218.906189,37.0488889 C219.688943,37.6888889 219.688943,38.8266667 219.048508,39.5377778 L218.977349,39.5377778 Z M243.740835,75.9466667 C244.665908,75.52 244.950546,74.4533333 244.45243,73.6 L235.699818,58.5244444 C235.201702,57.6711111 234.063151,57.4577778 233.280397,57.9555556 L207.022562,76.0888889 L204.318503,71.4666667 C203.820387,70.6133333 202.681836,70.3288889 201.899082,70.9688889 L176.139364,89.3155556 C179.697336,93.7244444 182.614873,98.6311111 184.891975,103.893333 L243.669676,76.0177778 L243.740835,75.9466667 Z M252.991563,99.5555556 L255.98026,116.693333 C256.122578,117.688889 255.482143,118.542222 254.485911,118.684444 L189.659658,124.728889 C189.37502,118.897778 188.236469,113.351111 186.457483,108.088889 L216.913725,99.6977778 C217.838798,99.4133333 218.83503,100.053333 218.977349,101.048889 L219.902422,106.311111 L250.78562,98.2755556 C251.710693,98.0622222 252.706925,98.6311111 252.849244,99.6266667 L252.849244,99.6266667 L252.991563,99.5555556 Z M250.074026,162.488889 C250.999098,162.702222 251.995331,162.133333 252.13765,161.137778 L255.126346,144 C255.268665,143.004444 254.62823,142.151111 253.631998,142.008889 L221.823727,139.022222 L222.748799,133.76 C222.891118,132.764444 222.250683,131.911111 221.254451,131.768889 L189.730817,129.208889 C189.588499,135.04 188.663426,140.657778 187.026759,145.991111 L250.002866,162.417778 L250.002866,162.417778 L250.074026,162.488889 Z M233.280397,201.6 C232.782281,202.453333 231.64373,202.666667 230.860976,202.168889 L177.277915,165.191111 C180.693568,160.711111 183.468786,155.733333 185.53241,150.4 L214.280826,163.555556 C215.205898,163.982222 215.561696,165.048889 215.063579,165.902222 L212.359521,170.524444 L241.250255,184.177778 C242.104168,184.604444 242.459965,185.671111 241.961849,186.524444 L233.280397,201.6 L233.280397,201.6 L233.280397,201.6 Z M161.622837,179.768889 L199.266183,232.817778 C199.835458,233.6 200.97401,233.742222 201.685604,233.102222 L214.99242,221.937778 C215.775174,221.297778 215.775174,220.16 215.134739,219.448889 L192.719514,196.764444 L196.846762,193.351111 C197.629516,192.711111 197.629516,191.573333 196.917921,190.862222 L174.360378,168.675556 C170.588927,172.942222 166.31936,176.711111 161.551678,179.768889 L161.551678,179.768889 L161.622837,179.768889 Z M161.26704,252.017778 C160.341967,252.373333 159.345735,251.804444 159.061097,250.88 L141.840512,188.16 C147.462108,186.88 152.799066,184.817778 157.709068,182.115556 L171.300522,210.631111 C171.727478,211.555556 171.300522,212.622222 170.375449,212.906667 L165.323128,214.755556 L178.629944,243.768889 C179.056901,244.693333 178.629944,245.688889 177.704871,246.044444 L161.338199,252.017778 L161.338199,252.017778 L161.26704,252.017778 Z" fill="#000000"></path>
-    </g>
-</svg>
+<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/Qualys.svg b/packages/nodes-base/credentials/icons/Qualys.svg
index cccb850db6..4e6f36e883 100644
--- a/packages/nodes-base/credentials/icons/Qualys.svg
+++ b/packages/nodes-base/credentials/icons/Qualys.svg
@@ -1,9 +1 @@
-<svg version="1.2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1271 1512" width="1271" height="1512">
-	<title>qualys-svg</title>
-	<style>
-		.s0 { fill: #ed2e26 } 
-		.s1 { fill: #ffffff } 
-	</style>
-	<path id="Layer" class="s0" d="m634.9 0c413.6 0 621.5 221.1 621.5 221.1 0 0 23.8 163.7 8.6 493.3-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.3 0 0 207.7-221.1 621.2-221.1z"/>
-	<path id="Layer" class="s1" 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-0.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.6z"/>
-</svg>
\ No newline at end of file
+<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
index 65e5c76064..6e8e317fc3 100644
--- a/packages/nodes-base/credentials/icons/RecordedFuture.svg
+++ b/packages/nodes-base/credentials/icons/RecordedFuture.svg
@@ -1,42 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   width="500"
-   height="500"
-   viewBox="0 0 132.29166 132.29167"
-   version="1.1"
-   id="svg5"
-   xml:space="preserve"
-   inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
-   sodipodi:docname="RecordedFuture.svg"
-   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="namedview7"
-     pagecolor="#ffffff"
-     bordercolor="#000000"
-     borderopacity="0.25"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     inkscape:document-units="mm"
-     showgrid="false"
-     inkscape:zoom="1.0582793"
-     inkscape:cx="154.49607"
-     inkscape:cy="295.76312"
-     inkscape:window-width="1920"
-     inkscape:window-height="1019"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer2" /><defs
-     id="defs2" /><g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Layer 2"><path
-       id="path232"
-       style="fill:#000000;fill-opacity:1;stroke-width:0.556055"
-       d="m 66.134978,8.3391846 c -3.958286,-1.547e-4 -7.198432,3.7746914 -7.167,7.1407194 0.09844,10.542557 1.81e-4,17.701735 0.09711,26.402771 0.03749,3.365674 3.208018,7.140255 7.165859,7.14072 3.958288,1.54e-4 7.164845,-3.774559 7.167011,-7.14072 0.0067,-10.652222 -0.15297,-16.586224 -0.09594,-26.402771 0.0199,-3.366116 -3.208721,-7.1408741 -7.167007,-7.1407194 z M 40.106906,23.262633 c -3.958286,-1.55e-4 -7.198432,3.774693 -7.167,7.14072 0.09844,10.542557 1.81e-4,62.783923 0.09711,71.484957 0.03749,3.3657 3.208017,7.14026 7.165858,7.14072 3.958288,1.6e-4 7.164837,-3.77453 7.167003,-7.14072 0.0067,-10.65222 -0.152992,-61.668411 -0.09596,-71.484957 0.0199,-3.366116 -3.208714,-7.140875 -7.167,-7.14072 z m 52.055,0 c -3.95777,5.75e-4 -7.198437,3.775024 -7.167003,7.14072 0.09837,10.542557 2.44e-4,62.783923 0.09704,71.484957 0.03758,3.3657 3.208017,7.14026 7.165853,7.14072 3.958301,1.6e-4 7.164832,-3.77453 7.167003,-7.14072 0.0065,-10.65222 -0.152974,-61.668411 -0.09594,-71.484957 0.01986,-3.365784 -3.208083,-7.140145 -7.165853,-7.14072 z M 14.127955,57.05742 a 9.0884303,9.0884303 0 0 0 -9.0884065,9.088413 9.0884303,9.0884303 0 0 0 9.0884065,9.088413 9.0884303,9.0884303 0 0 0 9.088407,-9.088413 9.0884303,9.0884303 0 0 0 -9.088407,-9.088413 z m 52.055002,0 a 9.0884303,9.0884303 0 0 0 -9.088407,9.088413 9.0884303,9.0884303 0 0 0 9.088407,9.088413 9.0884303,9.0884303 0 0 0 9.088398,-9.088413 9.0884303,9.0884303 0 0 0 -9.088398,-9.088413 z m 51.980753,0 a 9.0884303,9.0884303 0 0 0 -9.08842,9.088413 9.0884303,9.0884303 0 0 0 9.08842,9.088413 9.0884303,9.0884303 0 0 0 9.08841,-9.088413 9.0884303,9.0884303 0 0 0 -9.08841,-9.088413 z M 66.134978,83.268271 c -3.958286,-1.54e-4 -7.198432,3.774714 -7.167,7.14072 0.09844,10.542559 1.81e-4,17.701739 0.09711,26.402769 0.03749,3.3657 3.208018,7.14026 7.165859,7.14072 3.958288,1.6e-4 7.164845,-3.77454 7.167011,-7.14072 0.0067,-10.65222 -0.15297,-16.58623 -0.09594,-26.402769 0.0199,-3.366094 -3.208721,-7.140874 -7.167007,-7.14072 z" /></g></svg>
+<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
index 5e5776aba1..a60aa68d6a 100644
--- a/packages/nodes-base/credentials/icons/Sekoia.svg
+++ b/packages/nodes-base/credentials/icons/Sekoia.svg
@@ -1,44 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   width="500"
-   height="500"
-   viewBox="0 0 500 500"
-   fill="none"
-   version="1.1"
-   id="svg4"
-   sodipodi:docname="sekoiaio.svg"
-   inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
-   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="defs8" />
-  <sodipodi:namedview
-     id="namedview6"
-     pagecolor="#ffffff"
-     bordercolor="#000000"
-     borderopacity="0.25"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     showgrid="false"
-     inkscape:zoom="0.89972337"
-     inkscape:cx="723"
-     inkscape:cy="210.62029"
-     inkscape:window-width="1920"
-     inkscape:window-height="1012"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg4" />
-  <path
-     fill-rule="evenodd"
-     clip-rule="evenodd"
-     d="M 250.05513,25.000028 C 205.55238,24.989116 162.04525,38.175916 125.03725,62.892616 88.028912,87.609314 59.181557,122.74565 42.143432,163.8581 c -17.038237,41.112 -21.50235,86.35388 -12.8268,130.00388 8.675438,43.64887 30.100275,83.74499 61.56495,115.21799 31.464668,31.47188 71.556298,52.9065 115.202918,61.59263 43.64775,8.68612 88.89075,4.23337 130.00725,-12.79463 41.1165,-17.028 76.25925,-45.86625 100.98563,-82.86862 C 461.80263,338.00698 475,294.50323 475,250.00048 474.9415,190.3541 451.22538,133.16585 409.05475,90.984876 366.883,48.803454 309.7015,25.072928 250.05513,25.000028 Z m 0,408.670192 c -36.33975,0 -71.86275,-10.77637 -102.078,-30.96787 C 117.76255,382.51197 94.214392,353.81548 80.310292,320.24098 66.406195,286.66648 62.770645,249.7226 69.864107,214.08148 76.957682,178.44035 94.461662,145.70398 120.1615,120.01201 145.861,94.319826 178.603,76.826079 214.24638,69.743304 c 35.64225,-7.082888 72.585,-3.436763 106.155,10.477462 33.57112,13.91411 62.262,37.471274 82.44337,67.691584 20.18138,30.22088 30.9465,65.74838 30.93525,102.08813 -0.0146,48.73162 -19.37137,95.46637 -53.82112,129.93524 -34.44863,34.47 -81.171,53.856 -129.90375,53.89988 z m -11.3805,-268.73999 c 16.44412,-10.98788 35.77837,-16.8525 55.557,-16.8525 26.52187,0 51.957,10.53562 70.71075,29.28937 18.75262,18.75375 29.28937,44.18888 29.28937,70.71075 0,19.7775 -5.86575,39.11175 -16.85362,55.557 -10.98788,16.44413 -26.60513,29.26238 -44.8785,36.83025 -18.27225,7.569 -38.37938,9.549 -57.77775,5.69138 -19.39725,-3.85875 -37.21613,-13.383 -51.201,-27.36788 -13.98488,-13.986 -23.51025,-31.80375 -27.36788,-51.20212 -3.85875,-19.39838 -1.87762,-39.50438 5.69025,-57.77775 7.569,-18.27225 20.38613,-33.8895 36.83138,-44.8785 z m 22.977,131.90625 c 9.6435,6.444 20.98125,9.88312 32.58,9.88312 15.5475,-0.0146 30.456,-6.19762 41.4495,-17.19225 10.99462,-10.99462 17.17762,-25.902 17.19225,-41.4495 0,-11.59875 -3.44025,-22.9365 -9.88313,-32.58 -6.444,-9.6435 -15.60262,-17.15962 -26.31825,-21.59775 -10.7145,-4.43925 -22.50562,-5.60025 -33.88162,-3.33787 -11.37488,2.2635 -21.82388,7.848 -30.02513,16.04925 -8.20125,8.20125 -13.78575,18.65025 -16.04812,30.02625 -2.2635,11.37487 -1.1025,23.166 3.33675,33.88162 4.43812,10.7145 11.95425,19.87313 21.59775,26.31713 z M 128.8465,167.30848 h 44.2305 v 163.46137 h -44.2305 z"
-     fill="#0a083b"
-     id="path2"
-     sodipodi:nodetypes="ccccccsccccccsccccccccccscscccccccsccccccsccsccccc"
-     style="stroke-width:1.125" />
-</svg>
+<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
index 1024dd6a8d..3b9e38c30a 100644
--- a/packages/nodes-base/credentials/icons/Shuffler.svg
+++ b/packages/nodes-base/credentials/icons/Shuffler.svg
@@ -1,5 +1 @@
-<svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M0 0L-1.48522e-08 13.3913L4.40052 13.3913L4.40052 4.46465L22 4.46465L22 2.44001e-08L0 0Z" fill="#FF8444"/>
-<path d="M17.5995 8.60864L17.5995 17.5353L-9.90052e-09 17.5353L-1.48522e-08 22L22 22L22 8.60864L17.5995 8.60864Z" fill="#FF8444"/>
-<path d="M13.3915 8.60864L8.60889 8.60864L8.60889 13.3913L13.3915 13.3913L13.3915 8.60864Z" fill="#FF8444"/>
-</svg>
+<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
index e7be58a818..f29fab8980 100644
--- a/packages/nodes-base/credentials/icons/Trellix.svg
+++ b/packages/nodes-base/credentials/icons/Trellix.svg
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><svg id="c" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 260.12 218.23"><defs><style>.f{fill:url(#e);}</style><linearGradient id="e" x1="0" y1="107.61" x2="260.12" 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><g id="d"><path class="f" d="M91.97,215.22H0S168.15,0,168.15,0h91.97L91.97,215.22Z"/></g></svg>
\ No newline at end of file
+<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 0000000000..3afce345b1
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
index 3449afe23d..3a19c2937b 100644
--- a/packages/nodes-base/credentials/icons/VirusTotal.svg
+++ b/packages/nodes-base/credentials/icons/VirusTotal.svg
@@ -1,4 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg viewBox="165.097 116 268.436 236.784" xmlns="http://www.w3.org/2000/svg">
-  <path d="M 208.338 254.089 L 86.453 372.481 L 354.889 372.481 L 354.889 135.697 L 86.453 135.697 L 208.338 254.089 Z M 330.345 348.803 L 143.208 348.803 L 243.618 253.498 L 145.908 159.377 L 330.345 159.377 L 330.345 348.803 Z" fill="#3b61ff" style="" transform="matrix(1, 0, 0, 1, 78.643982, -19.696911)"/>
-</svg>
+<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/Zscaler.svg b/packages/nodes-base/credentials/icons/Zscaler.svg
index cb38a9bc04..97469741f5 100644
--- a/packages/nodes-base/credentials/icons/Zscaler.svg
+++ b/packages/nodes-base/credentials/icons/Zscaler.svg
@@ -1,9 +1 @@
-<svg version="1.2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1570 974" width="1570" height="974">
-	<title>logo (34)-svg</title>
-	<style>
-		.s0 { fill: #236bf5 } 
-	</style>
-	<g id="nav">
-		<path id="Layer" fill-rule="evenodd" class="s0" 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.6 96.9-125.3 391.6-350.7 751.6-234.1 192.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.4zm-551.3-283c0.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.5-2.7-1.3-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.5-273.6-53.9-465.2 178.1-454.3 390 10.9 211.8 242.1 344.1 373.8 308q1.1-0.1 2.3-0.2 1.2 0 2.4 0 1.2 0 2.3 0 1.2 0.1 2.4 0.2c29.4-139.9 148.2-465.7 630.8-634.4z"/>
-	</g>
-</svg>
\ No newline at end of file
+<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/vmware.svg b/packages/nodes-base/credentials/icons/vmware.svg
index 2996b461a1..20b525da40 100644
--- a/packages/nodes-base/credentials/icons/vmware.svg
+++ b/packages/nodes-base/credentials/icons/vmware.svg
@@ -1,12 +1 @@
-<?xml version="1.0" encoding="utf-8"?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
-<svg fill="#000000" width="800px" height="800px" viewBox="0 0 32 32" id="icon" xmlns="http://www.w3.org/2000/svg">
-  <defs>
-    <style>
-      .cls-1 {
-        fill: none;
-      }
-    </style>
-  </defs>
-  <path d="M32,16.77V13.8372c0-2.4818-2.4817-3.8355-4.5123-3.8355a6.7446,6.7446,0,0,0-3.8354,1.5793,5.066,5.066,0,0,0-3.61-1.5793,5.9389,5.9389,0,0,0-3.8354,1.5793,3.8172,3.8172,0,0,0-3.3842-1.5793A3.4913,3.4913,0,0,0,9.482,11.8232L6.5058,18.575,3.2011,11.0011a1.67,1.67,0,0,0-2.1883-.8656h0A1.67,1.67,0,0,0,.1536,12.37L4.25,21.2824s.6769,1.5793,2.0305,1.5793a1.9088,1.9088,0,0,0,2.0306-1.1281c.3124-.4687,2.6809-5.45,4.1078-8.4692a.5679.5679,0,0,1,1.0812.2437v7.4868a1.8462,1.8462,0,0,0,1.6848,1.8629,1.8051,1.8051,0,0,0,1.9251-1.801V14.8524a1.9177,1.9177,0,0,1,3.8354,0v6.2044a1.8049,1.8049,0,0,0,3.61,0V14.8524a1.9177,1.9177,0,0,1,3.8354,0v6.2044a1.8049,1.8049,0,0,0,3.61,0Z"/>
-  <rect id="_Transparent_Rectangle_" data-name="&lt;Transparent Rectangle&gt;" class="cls-1" width="32" height="32"/>
-</svg>
\ No newline at end of file
+<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/nodes/ActionNetwork/ActionNetwork.node.json b/packages/nodes-base/nodes/ActionNetwork/ActionNetwork.node.json
index b377551d6f..12a6e0274b 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/actionNetwork.svg b/packages/nodes-base/nodes/ActionNetwork/actionNetwork.svg
index acf96bb6eb..d2a2022e5f 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/ActiveCampaign/ActiveCampaign.node.json b/packages/nodes-base/nodes/ActiveCampaign/ActiveCampaign.node.json
index 8f4c445fc9..9c23a4d48f 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 54de0588d9..404aebb8b0 100644
--- a/packages/nodes-base/nodes/ActiveCampaign/ActiveCampaign.node.ts
+++ b/packages/nodes-base/nodes/ActiveCampaign/ActiveCampaign.node.ts
@@ -285,13 +285,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,
diff --git a/packages/nodes-base/nodes/ActiveCampaign/ActiveCampaignTrigger.node.json b/packages/nodes-base/nodes/ActiveCampaign/ActiveCampaignTrigger.node.json
index f8e91a5066..45431054e6 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/Adalo/adalo.svg b/packages/nodes-base/nodes/Adalo/adalo.svg
index 2f1ff40fcd..0f3f01fceb 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/AgileCrm/AgileCrm.node.json b/packages/nodes-base/nodes/AgileCrm/AgileCrm.node.json
index 3953495541..3bfaf0f16f 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/Airtable/AirtableTrigger.node.ts b/packages/nodes-base/nodes/Airtable/AirtableTrigger.node.ts
index a60ae12bdb..6031ae754e 100644
--- a/packages/nodes-base/nodes/Airtable/AirtableTrigger.node.ts
+++ b/packages/nodes-base/nodes/Airtable/AirtableTrigger.node.ts
@@ -7,11 +7,10 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
+import moment from 'moment-timezone';
 import type { IRecord } from './v1/GenericFunctions';
 import { apiRequestAllItems, downloadRecordAttachments } from './v1/GenericFunctions';
 
-import moment from 'moment';
-
 export class AirtableTrigger implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Airtable Trigger',
diff --git a/packages/nodes-base/nodes/Airtable/airtable.svg b/packages/nodes-base/nodes/Airtable/airtable.svg
index 0235854a9b..5dfcb5696f 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/v1/AirtableV1.node.ts b/packages/nodes-base/nodes/Airtable/v1/AirtableV1.node.ts
index 353423dd0f..f24993b5a5 100644
--- a/packages/nodes-base/nodes/Airtable/v1/AirtableV1.node.ts
+++ b/packages/nodes-base/nodes/Airtable/v1/AirtableV1.node.ts
@@ -9,11 +9,10 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
-import type { IRecord } from './GenericFunctions';
-import { apiRequest, apiRequestAllItems, downloadRecordAttachments } from './GenericFunctions';
-
 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',
diff --git a/packages/nodes-base/nodes/Airtable/v2/helpers/utils.ts b/packages/nodes-base/nodes/Airtable/v2/helpers/utils.ts
index fb43c3df4a..ff1a186248 100644
--- a/packages/nodes-base/nodes/Airtable/v2/helpers/utils.ts
+++ b/packages/nodes-base/nodes/Airtable/v2/helpers/utils.ts
@@ -1,4 +1,4 @@
-import type { IDataObject, NodeApiError } from 'n8n-workflow';
+import { ApplicationError, type IDataObject, type NodeApiError } from 'n8n-workflow';
 import type { UpdateRecord } from './interfaces';
 
 export function removeIgnored(data: IDataObject, ignore: string | string[]) {
@@ -42,7 +42,7 @@ export function findMatches(
 		});
 
 		if (!matches?.length) {
-			throw new Error('No records match provided keys');
+			throw new ApplicationError('No records match provided keys', { level: 'warning' });
 		}
 
 		return matches;
@@ -57,7 +57,9 @@ export function findMatches(
 		});
 
 		if (!match) {
-			throw new Error('Record matching provided keys was not found');
+			throw new ApplicationError('Record matching provided keys was not found', {
+				level: 'warning',
+			});
 		}
 
 		return [match];
diff --git a/packages/nodes-base/nodes/Airtable/v2/methods/listSearch.ts b/packages/nodes-base/nodes/Airtable/v2/methods/listSearch.ts
index 3b0f0a60d8..10f2d89c83 100644
--- a/packages/nodes-base/nodes/Airtable/v2/methods/listSearch.ts
+++ b/packages/nodes-base/nodes/Airtable/v2/methods/listSearch.ts
@@ -118,7 +118,9 @@ export async function viewSearch(
 	});
 
 	if (!tableData) {
-		throw new NodeOperationError(this.getNode(), 'Table information could not be found!');
+		throw new NodeOperationError(this.getNode(), 'Table information could not be found!', {
+			level: 'warning',
+		});
 	}
 
 	if (filter) {
diff --git a/packages/nodes-base/nodes/Airtable/v2/methods/loadOptions.ts b/packages/nodes-base/nodes/Airtable/v2/methods/loadOptions.ts
index 7f2f00f33f..79aaabf1ef 100644
--- a/packages/nodes-base/nodes/Airtable/v2/methods/loadOptions.ts
+++ b/packages/nodes-base/nodes/Airtable/v2/methods/loadOptions.ts
@@ -20,7 +20,9 @@ export async function getColumns(this: ILoadOptionsFunctions): Promise<INodeProp
 	});
 
 	if (!tableData) {
-		throw new NodeOperationError(this.getNode(), 'Table information could not be found!');
+		throw new NodeOperationError(this.getNode(), 'Table information could not be found!', {
+			level: 'warning',
+		});
 	}
 
 	const result: INodePropertyOptions[] = [];
@@ -79,7 +81,9 @@ export async function getAttachmentColumns(
 	});
 
 	if (!tableData) {
-		throw new NodeOperationError(this.getNode(), 'Table information could not be found!');
+		throw new NodeOperationError(this.getNode(), 'Table information could not be found!', {
+			level: 'warning',
+		});
 	}
 
 	const result: INodePropertyOptions[] = [];
diff --git a/packages/nodes-base/nodes/Airtable/v2/methods/resourceMapping.ts b/packages/nodes-base/nodes/Airtable/v2/methods/resourceMapping.ts
index 82460382bf..94759adfbd 100644
--- a/packages/nodes-base/nodes/Airtable/v2/methods/resourceMapping.ts
+++ b/packages/nodes-base/nodes/Airtable/v2/methods/resourceMapping.ts
@@ -78,7 +78,9 @@ export async function getColumns(this: ILoadOptionsFunctions): Promise<ResourceM
 	});
 
 	if (!tableData) {
-		throw new NodeOperationError(this.getNode(), 'Table information could not be found!');
+		throw new NodeOperationError(this.getNode(), 'Table information could not be found!', {
+			level: 'warning',
+		});
 	}
 
 	const fields: ResourceMapperField[] = [];
diff --git a/packages/nodes-base/nodes/Airtable/v2/transport/index.ts b/packages/nodes-base/nodes/Airtable/v2/transport/index.ts
index 63ea8757f8..44aa041a66 100644
--- a/packages/nodes-base/nodes/Airtable/v2/transport/index.ts
+++ b/packages/nodes-base/nodes/Airtable/v2/transport/index.ts
@@ -8,6 +8,7 @@ import type {
 	ILoadOptionsFunctions,
 	INodeExecutionData,
 } from 'n8n-workflow';
+import { ApplicationError } from 'n8n-workflow';
 import type { IAttachment, IRecord } from '../helpers/interfaces';
 import { flattenOutput } from '../helpers/utils';
 
@@ -91,7 +92,9 @@ export async function downloadRecordAttachments(
 		fieldNames = fieldNames.split(',').map((item) => item.trim());
 	}
 	if (!fieldNames.length) {
-		throw new Error("Specify field to download in 'Download Attachments' option");
+		throw new ApplicationError("Specify field to download in 'Download Attachments' option", {
+			level: 'warning',
+		});
 	}
 	const elements: INodeExecutionData[] = [];
 	for (const record of records) {
diff --git a/packages/nodes-base/nodes/ApiTemplateIo/ApiTemplateIo.node.json b/packages/nodes-base/nodes/ApiTemplateIo/ApiTemplateIo.node.json
index 9b52f2b395..e6853ac9ce 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 0d3560fe1d..765a3fc76c 100644
--- a/packages/nodes-base/nodes/ApiTemplateIo/ApiTemplateIo.node.ts
+++ b/packages/nodes-base/nodes/ApiTemplateIo/ApiTemplateIo.node.ts
@@ -181,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'],
diff --git a/packages/nodes-base/nodes/ApiTemplateIo/apiTemplateIo.svg b/packages/nodes-base/nodes/ApiTemplateIo/apiTemplateIo.svg
index 4fe3ce87d5..c2b3602dc4 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 885aa7d4ab..f5cffdd3b8 100644
--- a/packages/nodes-base/nodes/Asana/Asana.node.ts
+++ b/packages/nodes-base/nodes/Asana/Asana.node.ts
@@ -11,6 +11,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 +22,6 @@ import {
 	getWorkspaces,
 } from './GenericFunctions';
 
-import moment from 'moment-timezone';
-
-import { snakeCase } from 'change-case';
-
 export class Asana implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Asana',
diff --git a/packages/nodes-base/nodes/Asana/GenericFunctions.ts b/packages/nodes-base/nodes/Asana/GenericFunctions.ts
index 05f1150a5e..106ede80c4 100644
--- a/packages/nodes-base/nodes/Asana/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Asana/GenericFunctions.ts
@@ -27,7 +27,7 @@ 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,
diff --git a/packages/nodes-base/nodes/Asana/asana.svg b/packages/nodes-base/nodes/Asana/asana.svg
index 2d5de3183d..a66d628f01 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 ff7f1046ed..9ff27a12e1 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/Autopilot/Autopilot.node.json b/packages/nodes-base/nodes/Autopilot/Autopilot.node.json
index ebc53d0fa0..54dbaa35ac 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/AutopilotTrigger.node.json b/packages/nodes-base/nodes/Autopilot/AutopilotTrigger.node.json
index c9b17dd32d..dd9b72ccf1 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 09e985922d..f86ebf0e3c 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/autopilot.svg b/packages/nodes-base/nodes/Autopilot/autopilot.svg
index 93e5c925a0..cfc2f09bc2 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 446da185f4..7aa3c25fb1 100644
--- a/packages/nodes-base/nodes/Aws/AwsSnsTrigger.node.ts
+++ b/packages/nodes-base/nodes/Aws/AwsSnsTrigger.node.ts
@@ -10,9 +10,8 @@ import type {
 } from 'n8n-workflow';
 import { jsonParse, NodeOperationError } from 'n8n-workflow';
 
-import { awsApiRequestSOAP } from './GenericFunctions';
-
 import get from 'lodash/get';
+import { awsApiRequestSOAP } from './GenericFunctions';
 
 export class AwsSnsTrigger implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Aws/CertificateManager/acm.svg b/packages/nodes-base/nodes/Aws/CertificateManager/acm.svg
index 22d4e0e7cb..31726f71ac 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/comprehend.svg b/packages/nodes-base/nodes/Aws/Comprehend/comprehend.svg
index 1e421aa9a8..be82ad92dd 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/GenericFunctions.ts b/packages/nodes-base/nodes/Aws/DynamoDB/GenericFunctions.ts
index a44214133c..eb1a6df226 100644
--- a/packages/nodes-base/nodes/Aws/DynamoDB/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Aws/DynamoDB/GenericFunctions.ts
@@ -7,7 +7,7 @@ import type {
 	IHttpRequestOptions,
 	INodeExecutionData,
 } from 'n8n-workflow';
-import { deepCopy } from 'n8n-workflow';
+import { ApplicationError, deepCopy } from 'n8n-workflow';
 
 import type { IRequestBody } from './types';
 
@@ -37,21 +37,31 @@ 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',
+		});
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Aws/DynamoDB/dynamodb.svg b/packages/nodes-base/nodes/Aws/DynamoDB/dynamodb.svg
index a3293dcc7e..2b4429372a 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/utils.ts b/packages/nodes-base/nodes/Aws/DynamoDB/utils.ts
index a55e9ff46d..eb7c3f4d4a 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/elb.svg b/packages/nodes-base/nodes/Aws/ELB/elb.svg
index d6bcabcb0d..e092562c86 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/Rekognition/AwsRekognition.node.ts b/packages/nodes-base/nodes/Aws/Rekognition/AwsRekognition.node.ts
index 99345befbf..405b26637d 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,
 			},
 			{
diff --git a/packages/nodes-base/nodes/Aws/Rekognition/rekognition.svg b/packages/nodes-base/nodes/Aws/Rekognition/rekognition.svg
index 5eeab98fa0..e85d00b4e7 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
index 0c237d6002..e9fe6debac 100644
--- a/packages/nodes-base/nodes/Aws/Rekognition/test/AwsRekognition.node.test.ts
+++ b/packages/nodes-base/nodes/Aws/Rekognition/test/AwsRekognition.node.test.ts
@@ -1,6 +1,5 @@
-import { getWorkflowFilenames, testWorkflows } from '@test/nodes/Helpers';
-
 import nock from 'nock';
+import { getWorkflowFilenames, testWorkflows } from '@test/nodes/Helpers';
 
 const responseLabels = [
 	{
diff --git a/packages/nodes-base/nodes/Aws/S3/V1/AwsS3V1.node.ts b/packages/nodes-base/nodes/Aws/S3/V1/AwsS3V1.node.ts
index 53062efa5d..51dffe4366 100644
--- a/packages/nodes-base/nodes/Aws/S3/V1/AwsS3V1.node.ts
+++ b/packages/nodes-base/nodes/Aws/S3/V1/AwsS3V1.node.ts
@@ -1,7 +1,6 @@
 /* eslint-disable n8n-nodes-base/node-filename-against-convention */
-import { paramCase, snakeCase } from 'change-case';
-
 import { createHash } from 'crypto';
+import { paramCase, snakeCase } from 'change-case';
 
 import { Builder } from 'xml2js';
 
diff --git a/packages/nodes-base/nodes/Aws/S3/V1/FileDescription.ts b/packages/nodes-base/nodes/Aws/S3/V1/FileDescription.ts
index be5146777e..6328aea0a0 100644
--- a/packages/nodes-base/nodes/Aws/S3/V1/FileDescription.ts
+++ b/packages/nodes-base/nodes/Aws/S3/V1/FileDescription.ts
@@ -373,7 +373,7 @@ export const fileFields: INodeProperties[] = [
 		description: 'If not set the binary data filename will be used',
 	},
 	{
-		displayName: 'Binary Data',
+		displayName: 'Binary File',
 		name: 'binaryData',
 		type: 'boolean',
 		default: true,
@@ -401,7 +401,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',
@@ -414,7 +414,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: 'Additional Fields',
@@ -698,7 +698,7 @@ export const fileFields: INodeProperties[] = [
 		},
 	},
 	{
-		displayName: 'Binary Property',
+		displayName: 'Put Output File in Field',
 		name: 'binaryPropertyName',
 		type: 'string',
 		required: true,
@@ -709,7 +709,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:delete                                 */
diff --git a/packages/nodes-base/nodes/Aws/S3/V2/AwsS3V2.node.ts b/packages/nodes-base/nodes/Aws/S3/V2/AwsS3V2.node.ts
index bff63bf3c3..74f654f7d1 100644
--- a/packages/nodes-base/nodes/Aws/S3/V2/AwsS3V2.node.ts
+++ b/packages/nodes-base/nodes/Aws/S3/V2/AwsS3V2.node.ts
@@ -1,7 +1,7 @@
 /* eslint-disable n8n-nodes-base/node-filename-against-convention */
-import { paramCase, snakeCase } from 'change-case';
-
 import { createHash } from 'crypto';
+import type { Readable } from 'stream';
+import { paramCase, snakeCase } from 'change-case';
 
 import { Builder } from 'xml2js';
 
@@ -22,7 +22,6 @@ import { folderFields, folderOperations } from './FolderDescription';
 import { fileFields, fileOperations } from './FileDescription';
 
 import { awsApiRequestREST, awsApiRequestRESTAllItems } from './GenericFunctions';
-import type { Readable } from 'stream';
 
 // Minimum size 5MB for multipart upload in S3
 const UPLOAD_CHUNK_SIZE = 5120 * 1024;
@@ -1025,7 +1024,7 @@ export class AwsS3V2 implements INodeType {
 								);
 							}
 							const executionData = this.helpers.constructExecutionMetaData(
-								this.helpers.returnJsonArray(responseData as IDataObject),
+								this.helpers.returnJsonArray(responseData ?? { success: true }),
 								{ itemData: { item: i } },
 							);
 							returnData.push(...executionData);
diff --git a/packages/nodes-base/nodes/Aws/S3/V2/FileDescription.ts b/packages/nodes-base/nodes/Aws/S3/V2/FileDescription.ts
index be5146777e..6328aea0a0 100644
--- a/packages/nodes-base/nodes/Aws/S3/V2/FileDescription.ts
+++ b/packages/nodes-base/nodes/Aws/S3/V2/FileDescription.ts
@@ -373,7 +373,7 @@ export const fileFields: INodeProperties[] = [
 		description: 'If not set the binary data filename will be used',
 	},
 	{
-		displayName: 'Binary Data',
+		displayName: 'Binary File',
 		name: 'binaryData',
 		type: 'boolean',
 		default: true,
@@ -401,7 +401,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',
@@ -414,7 +414,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: 'Additional Fields',
@@ -698,7 +698,7 @@ export const fileFields: INodeProperties[] = [
 		},
 	},
 	{
-		displayName: 'Binary Property',
+		displayName: 'Put Output File in Field',
 		name: 'binaryPropertyName',
 		type: 'string',
 		required: true,
@@ -709,7 +709,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:delete                                 */
diff --git a/packages/nodes-base/nodes/Aws/S3/s3.svg b/packages/nodes-base/nodes/Aws/S3/s3.svg
index 4d6e49ae0f..0b3835fb50 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/SES/ses.svg b/packages/nodes-base/nodes/Aws/SES/ses.svg
index d7224cb0ec..c334382ae4 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 ccb9dd1430..9c5572ab85 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 = {
diff --git a/packages/nodes-base/nodes/Aws/SQS/sqs.svg b/packages/nodes-base/nodes/Aws/SQS/sqs.svg
index e8073a53a0..d2d0793ff0 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/textract.svg b/packages/nodes-base/nodes/Aws/Textract/textract.svg
index fa00d88c01..e1df075e4f 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/transcribe.svg b/packages/nodes-base/nodes/Aws/Transcribe/transcribe.svg
index d055f5e9c7..e2cc2da4df 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 729075990f..1d7049faa0 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 3b3d7bac94..a35c6e3249 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 3c0aa64753..e80ae80d99 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 d87f49b3f9..c7ddc01b64 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(
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 c255eeaaa2..ed602347d3 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/execute.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/employee/create/execute.ts
index 6dda349bcb..33c2982776 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 9404f1a99c..9e685756b7 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/execute.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/employee/update/execute.ts
index 25c13478e3..76d1bdd562 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/index.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/index.ts
index 0feafeb4a2..3853a5e9dd 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/index.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/file/index.ts
index f2c3438f1b..d1f8755377 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/Bannerbear/Bannerbear.node.json b/packages/nodes-base/nodes/Bannerbear/Bannerbear.node.json
index 8f6c754d19..fe6592cba2 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/Baserow/baserow.svg b/packages/nodes-base/nodes/Baserow/baserow.svg
index a184ad4b99..14051c4065 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:svg xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg" inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)" sodipodi:docname="baserow.svg" width="60" height="60" version="1.1" viewBox="0 0 60 60"><svg:metadata><rdf:RDF><cc:Work><dc:format>image/svg+xml</dc:format><dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/><dc:title/></cc:Work></rdf:RDF></svg:metadata><svg:defs/><sodipodi:namedview inkscape:current-layer="Group_163" inkscape:cx="-29.906" inkscape:cy="40.001" inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-height="1016" inkscape:window-maximized="1" inkscape:window-width="1848" inkscape:window-x="1512" inkscape:window-y="27" inkscape:zoom="2.558" bordercolor="#666666" borderopacity="1" fit-margin-bottom="0" fit-margin-left="0" fit-margin-right="0" fit-margin-top="0" gridtolerance="10" guidetolerance="10" objecttolerance="10" pagecolor="#ffffff" showgrid="false"/><svg:g data-name="Group 163" transform="translate(-451.976 -540.719)"><svg:g data-name="Group 162" style="stroke-width:.52810001" transform="translate(451.976 543.9)scale(1.89358)"><svg:g data-name="Group 161" style="stroke-width:.52810001"><svg:rect width="21.863" height="3.992" x="0" y="0" data-name="Rectangle 257" style="fill:#566270;stroke-width:.52810001" transform="translate(6.654 24.335)"/><svg:rect width="23.955" height="3.992" x="0" y="0" data-name="Rectangle 258" style="fill:#4570a9;stroke-width:.52810001" transform="translate(0 18.251)"/><svg:rect width="6.464" height="3.992" x="0" y="0" data-name="Rectangle 259" style="fill:#4570a9;stroke-width:.52810001" transform="translate(25.222 18.251)"/><svg:rect width="11.597" height="3.992" x="0" y="0" data-name="Rectangle 260" style="fill:#00a2ce;stroke-width:.52810001" transform="translate(4.563 12.167)"/><svg:rect width="5.228" height="3.992" x="0" y="0" data-name="Rectangle 261" style="fill:#00a2ce;stroke-width:.52810001" transform="translate(17.728 12.167)"/><svg:rect width="19.392" height="3.992" x="0" y="0" data-name="Rectangle 262" style="fill:#6acaff;stroke-width:.52810001" transform="translate(8.365 6.084)"/><svg:rect width="16.35" height="3.992" x="0" y="0" data-name="Rectangle 263" style="fill:#9addff;stroke-width:.52810001" transform="translate(7.319)"/><svg:rect width="5.228" height="3.992" x="0" y="0" data-name="Rectangle 264" style="fill:#9addff;stroke-width:.52810001" transform="translate(.285)"/></svg:g></svg:g></svg:g><script/></svg:svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Beeminder/Beeminder.node.ts b/packages/nodes-base/nodes/Beeminder/Beeminder.node.ts
index 6353bc494b..28eb9742c2 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',
diff --git a/packages/nodes-base/nodes/Bitbucket/bitbucket.svg b/packages/nodes-base/nodes/Bitbucket/bitbucket.svg
index 23c660940c..42120a5e7f 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.svg b/packages/nodes-base/nodes/Bitly/bitly.svg
index 68e50d99fd..fbb7029200 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 871b88ff62..58656f906f 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',
diff --git a/packages/nodes-base/nodes/Bitwarden/bitwarden.svg b/packages/nodes-base/nodes/Bitwarden/bitwarden.svg
index c53078dd43..fb1668e9f4 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 abae92e760..44f5fe1aa1 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',
diff --git a/packages/nodes-base/nodes/Box/FileDescription.ts b/packages/nodes-base/nodes/Box/FileDescription.ts
index 896100ffe9..48c4915740 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/Brevo/Brevo.node.json b/packages/nodes-base/nodes/Brevo/Brevo.node.json
index 931dd09b63..8f2b5b7ac8 100644
--- a/packages/nodes-base/nodes/Brevo/Brevo.node.json
+++ b/packages/nodes-base/nodes/Brevo/Brevo.node.json
@@ -2,7 +2,7 @@
 	"node": "n8n-nodes-base.brevo",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": ["Marketing & Content", "Communication"],
+	"categories": ["Marketing", "Communication"],
 	"resources": {
 		"credentialDocumentation": [
 			{
diff --git a/packages/nodes-base/nodes/Brevo/BrevoTrigger.node.json b/packages/nodes-base/nodes/Brevo/BrevoTrigger.node.json
index 81df05bd70..a4e648ab00 100644
--- a/packages/nodes-base/nodes/Brevo/BrevoTrigger.node.json
+++ b/packages/nodes-base/nodes/Brevo/BrevoTrigger.node.json
@@ -2,7 +2,7 @@
 	"node": "n8n-nodes-base.brevoTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": ["Marketing & Content", "Communication"],
+	"categories": ["Marketing", "Communication"],
 	"resources": {
 		"credentialDocumentation": [
 			{
diff --git a/packages/nodes-base/nodes/Brevo/BrevoTrigger.node.ts b/packages/nodes-base/nodes/Brevo/BrevoTrigger.node.ts
index b0988a9e84..299b15fb59 100644
--- a/packages/nodes-base/nodes/Brevo/BrevoTrigger.node.ts
+++ b/packages/nodes-base/nodes/Brevo/BrevoTrigger.node.ts
@@ -14,6 +14,9 @@ export class BrevoTrigger implements INodeType {
 			{
 				name: 'sendInBlueApi',
 				required: true,
+				displayOptions: {
+					show: {},
+				},
 			},
 		],
 		displayName: 'Brevo Trigger',
@@ -243,7 +246,7 @@ export class BrevoTrigger implements INodeType {
 
 				const responseData = await BrevoWebhookApi.createWebHook(this, type, events, webhookUrl);
 
-				if (responseData === undefined || responseData.id === undefined) {
+				if (responseData?.id === undefined) {
 					// Required data is missing so was not successful
 					return false;
 				}
diff --git a/packages/nodes-base/nodes/Brevo/brevo.svg b/packages/nodes-base/nodes/Brevo/brevo.svg
index 4b097f196f..9106e736eb 100644
--- a/packages/nodes-base/nodes/Brevo/brevo.svg
+++ b/packages/nodes-base/nodes/Brevo/brevo.svg
@@ -1,4 +1 @@
-<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <circle cx="24" cy="24" r="24" fill="#0B996E"/>
-    <path d="M31.5036 21.8092C32.9875 20.3562 33.6829 18.677 33.6829 16.6345C33.6829 12.4146 30.5772 9.59998 25.8963 9.59998H14.4V39.6H23.6705C30.717 39.6 36 35.2887 36 29.5702C36 26.438 34.3782 23.6253 31.5036 21.8092ZM18.572 13.5024H25.4321C27.7492 13.5024 29.2797 14.8184 29.2797 16.8152C29.2797 19.084 27.287 20.8089 23.2082 22.1249C20.4269 22.9863 19.176 23.7128 18.7118 24.5762L18.572 24.5775V13.5024ZM23.2995 35.6976H18.572V31.0688C18.572 29.0263 20.3336 27.0295 22.7906 26.2573C24.9698 25.5309 26.7761 24.8044 28.3067 24.0342C30.346 25.2152 31.5969 27.2558 31.5969 29.3895C31.5969 33.0199 28.0736 35.6976 23.2995 35.6976Z" fill="white"/>
-</svg>
\ No newline at end of file
+<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.svg b/packages/nodes-base/nodes/Bubble/bubble.svg
index 8f68a8b2aa..1c41d3fe7e 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/cal.svg b/packages/nodes-base/nodes/Cal/cal.svg
index c9a78d28e7..6188357337 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/calendly.svg b/packages/nodes-base/nodes/Calendly/calendly.svg
index 1273f10620..195a7461e3 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/Cisco/Webex/CiscoWebex.node.ts b/packages/nodes-base/nodes/Cisco/Webex/CiscoWebex.node.ts
index 5dae3f8f7d..bfe9dd8646 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',
diff --git a/packages/nodes-base/nodes/Cisco/Webex/CiscoWebexTrigger.node.ts b/packages/nodes-base/nodes/Cisco/Webex/CiscoWebexTrigger.node.ts
index 507c9d00ec..2d3db0396a 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 176c99b781..dac7862b00 100644
--- a/packages/nodes-base/nodes/Cisco/Webex/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Cisco/Webex/GenericFunctions.ts
@@ -1,3 +1,4 @@
+import { createHash } from 'crypto';
 import type { OptionsWithUri } from 'request';
 
 import type {
@@ -14,8 +15,6 @@ import { NodeApiError } from 'n8n-workflow';
 
 import upperFirst from 'lodash/upperFirst';
 
-import { createHash } from 'crypto';
-
 export async function webexApiRequest(
 	this: IExecuteFunctions | ILoadOptionsFunctions | IHookFunctions | IWebhookFunctions,
 	method: string,
diff --git a/packages/nodes-base/nodes/Cisco/Webex/descriptions/MessageDescription.ts b/packages/nodes-base/nodes/Cisco/Webex/descriptions/MessageDescription.ts
index c9f7fc3e92..6cf90d50a5 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/citrix.svg b/packages/nodes-base/nodes/Citrix/ADC/citrix.svg
index f91f84b508..19e9d9673f 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.svg b/packages/nodes-base/nodes/Clearbit/clearbit.svg
index 22f7fd495a..3b9ac84aa5 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 3f6eef89cc..71e0431de4 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(),
diff --git a/packages/nodes-base/nodes/ClickUp/ClickUpTrigger.node.ts b/packages/nodes-base/nodes/ClickUp/ClickUpTrigger.node.ts
index bced1d2e5b..af6e696a0c 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/clickup.svg b/packages/nodes-base/nodes/ClickUp/clickup.svg
index 4764b2d9c8..7874aaa42b 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 29407cb459..17793feda6 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',
diff --git a/packages/nodes-base/nodes/Clockify/clockify.svg b/packages/nodes-base/nodes/Clockify/clockify.svg
index 3955055df7..1750886588 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/cloudflare.svg b/packages/nodes-base/nodes/Cloudflare/cloudflare.svg
index f50a496518..1899a92a5a 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 a8da4a322c..56fbbc76ec 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/Coda/GenericFunctions.ts b/packages/nodes-base/nodes/Coda/GenericFunctions.ts
index a993c6c2c9..e2cdf6b8a8 100644
--- a/packages/nodes-base/nodes/Coda/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Coda/GenericFunctions.ts
@@ -20,7 +20,10 @@ export async function codaApiRequest(
 	const credentials = await this.getCredentials('codaApi');
 
 	let options: OptionsWithUri = {
-		headers: { Authorization: `Bearer ${credentials.accessToken}` },
+		headers: {
+			Authorization: `Bearer ${credentials.accessToken}`,
+			'User-Agent': 'n8n',
+		},
 		method,
 		qs,
 		body,
diff --git a/packages/nodes-base/nodes/Coda/coda.svg b/packages/nodes-base/nodes/Coda/coda.svg
index 1d3c64f327..aeb0b8ec8d 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 8ec1cad6c9..57dcb6bc2a 100644
--- a/packages/nodes-base/nodes/Code/Code.node.json
+++ b/packages/nodes-base/nodes/Code/Code.node.json
@@ -13,6 +13,6 @@
 	},
 	"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 12fed0ec34..e616dc2f00 100644
--- a/packages/nodes-base/nodes/Code/Code.node.ts
+++ b/packages/nodes-base/nodes/Code/Code.node.ts
@@ -117,9 +117,9 @@ export class Code implements INodeType {
 				workflowMode === 'manual'
 					? this.sendMessageToUI
 					: CODE_ENABLE_STDOUT === 'true'
-					? (...args) =>
-							console.log(`[Workflow "${this.getWorkflow().id}"][Node "${node.name}"]`, ...args)
-					: () => {},
+					  ? (...args) =>
+								console.log(`[Workflow "${this.getWorkflow().id}"][Node "${node.name}"]`, ...args)
+					  : () => {},
 			);
 			return sandbox;
 		};
@@ -132,7 +132,7 @@ export class Code implements INodeType {
 			const sandbox = getSandbox();
 			let items: INodeExecutionData[];
 			try {
-				items = await sandbox.runCodeAllItems();
+				items = (await sandbox.runCodeAllItems()) as INodeExecutionData[];
 			} catch (error) {
 				if (!this.continueOnFail()) throw error;
 				items = [{ json: { error: error.message } }];
@@ -160,7 +160,12 @@ export class Code implements INodeType {
 				result = await sandbox.runCodeEachItem();
 			} catch (error) {
 				if (!this.continueOnFail()) throw error;
-				returnData.push({ json: { error: error.message } });
+				returnData.push({
+					json: { error: error.message },
+					pairedItem: {
+						item: index,
+					},
+				});
 			}
 
 			if (result) {
diff --git a/packages/nodes-base/nodes/Code/JavaScriptSandbox.ts b/packages/nodes-base/nodes/Code/JavaScriptSandbox.ts
index 1b1da7f58d..af32fade8b 100644
--- a/packages/nodes-base/nodes/Code/JavaScriptSandbox.ts
+++ b/packages/nodes-base/nodes/Code/JavaScriptSandbox.ts
@@ -1,4 +1,4 @@
-import { NodeVM, makeResolverFromLegacyOptions } from '@n8n/vm2';
+import { NodeVM, makeResolverFromLegacyOptions, type Resolver } from '@n8n/vm2';
 import type { IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
 
 import { ValidationError } from './ValidationError';
@@ -27,6 +27,7 @@ export class JavaScriptSandbox extends Sandbox {
 		private jsCode: string,
 		itemIndex: number | undefined,
 		helpers: IExecuteFunctions['helpers'],
+		options?: { resolver?: Resolver },
 	) {
 		super(
 			{
@@ -41,17 +42,29 @@ export class JavaScriptSandbox extends Sandbox {
 		this.vm = new NodeVM({
 			console: 'redirect',
 			sandbox: context,
-			require: vmResolver,
+			require: options?.resolver ?? vmResolver,
 			wasm: false,
 		});
 
 		this.vm.on('console.log', (...args: unknown[]) => this.emit('output', ...args));
 	}
 
-	async runCodeAllItems(): Promise<INodeExecutionData[]> {
+	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[];
+		let executionResult: INodeExecutionData | INodeExecutionData[] | INodeExecutionData[][];
 
 		try {
 			executionResult = await this.vm.run(script, __dirname);
@@ -67,7 +80,25 @@ export class JavaScriptSandbox extends Sandbox {
 
 		if (executionResult === null) return [];
 
-		return this.validateRunCodeAllItems(executionResult);
+		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> {
diff --git a/packages/nodes-base/nodes/Code/PythonSandbox.ts b/packages/nodes-base/nodes/Code/PythonSandbox.ts
index 8be5e188b2..48940bace2 100644
--- a/packages/nodes-base/nodes/Code/PythonSandbox.ts
+++ b/packages/nodes-base/nodes/Code/PythonSandbox.ts
@@ -39,6 +39,10 @@ export class PythonSandbox extends Sandbox {
 		}, {} as PythonSandboxContext);
 	}
 
+	async runCode(): Promise<unknown> {
+		return this.runCodeInPython<unknown>();
+	}
+
 	async runCodeAllItems() {
 		const executionResult = await this.runCodeInPython<INodeExecutionData[]>();
 		return this.validateRunCodeAllItems(executionResult);
diff --git a/packages/nodes-base/nodes/Code/Sandbox.ts b/packages/nodes-base/nodes/Code/Sandbox.ts
index 2c7152b963..fb8aeb5ced 100644
--- a/packages/nodes-base/nodes/Code/Sandbox.ts
+++ b/packages/nodes-base/nodes/Code/Sandbox.ts
@@ -1,9 +1,8 @@
 import { EventEmitter } from 'events';
+import type { IExecuteFunctions, INodeExecutionData, IWorkflowDataProxyData } from 'n8n-workflow';
 import { ValidationError } from './ValidationError';
 import { isObject } from './utils';
 
-import type { IExecuteFunctions, INodeExecutionData, IWorkflowDataProxyData } from 'n8n-workflow';
-
 interface SandboxTextKeys {
 	object: {
 		singular: string;
@@ -17,7 +16,7 @@ export interface SandboxContext extends IWorkflowDataProxyData {
 	helpers: IExecuteFunctions['helpers'];
 }
 
-export const REQUIRED_N8N_ITEM_KEYS = new Set(['json', 'binary', 'pairedItem']);
+export const REQUIRED_N8N_ITEM_KEYS = new Set(['json', 'binary', 'pairedItem', 'error']);
 
 export function getSandboxContext(this: IExecuteFunctions, index: number): SandboxContext {
 	return {
@@ -41,7 +40,9 @@ export abstract class Sandbox extends EventEmitter {
 		super();
 	}
 
-	abstract runCodeAllItems(): Promise<INodeExecutionData[]>;
+	abstract runCode(): Promise<unknown>;
+
+	abstract runCodeAllItems(): Promise<INodeExecutionData[] | INodeExecutionData[][]>;
 
 	abstract runCodeEachItem(): Promise<INodeExecutionData | undefined>;
 
diff --git a/packages/nodes-base/nodes/Code/descriptions/JavascriptCodeDescription.ts b/packages/nodes-base/nodes/Code/descriptions/JavascriptCodeDescription.ts
index 5b34e58861..acfb833ce6 100644
--- a/packages/nodes-base/nodes/Code/descriptions/JavascriptCodeDescription.ts
+++ b/packages/nodes-base/nodes/Code/descriptions/JavascriptCodeDescription.ts
@@ -7,7 +7,6 @@ const commonDescription: INodeProperties = {
 	typeOptions: {
 		editor: 'codeNodeEditor',
 		editorLanguage: 'javaScript',
-		rows: 5,
 	},
 	default: '',
 	description:
diff --git a/packages/nodes-base/nodes/Code/descriptions/PythonCodeDescription.ts b/packages/nodes-base/nodes/Code/descriptions/PythonCodeDescription.ts
index e9db25924a..e3c9d4cb43 100644
--- a/packages/nodes-base/nodes/Code/descriptions/PythonCodeDescription.ts
+++ b/packages/nodes-base/nodes/Code/descriptions/PythonCodeDescription.ts
@@ -7,11 +7,10 @@ const commonDescription: INodeProperties = {
 	typeOptions: {
 		editor: 'codeNodeEditor',
 		editorLanguage: 'python',
-		rows: 5,
 	},
 	default: '',
 	description:
-		'Python code to execute.<br><br>Tip: You can use luxon vars like <code>_today</code> for dates and <code>$_mespath</code> for querying JSON structures. <a href="https://docs.n8n.io/nodes/n8n-nodes-base.function">Learn more</a>.',
+		'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,
 };
 
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 da798db3a8..2b827877e8 100644
--- a/packages/nodes-base/nodes/Code/test/Code.node.test.ts
+++ b/packages/nodes-base/nodes/Code/test/Code.node.test.ts
@@ -1,11 +1,11 @@
 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, initBinaryDataService } from '@test/nodes/Helpers';
 import { Code } from '../Code.node';
 import { ValidationError } from '../ValidationError';
+import { testWorkflows, getWorkflowFilenames, initBinaryDataService } from '@test/nodes/Helpers';
 
 describe('Test Code Node', () => {
 	const workflows = getWorkflowFilenames(__dirname);
@@ -79,7 +79,7 @@ describe('Code Node unit test', () => {
 
 					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]");
@@ -131,7 +131,7 @@ describe('Code Node unit test', () => {
 
 					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/CoinGecko/CoinGecko.node.ts b/packages/nodes-base/nodes/CoinGecko/CoinGecko.node.ts
index d116deb562..5bda5ea290 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',
diff --git a/packages/nodes-base/nodes/CoinGecko/coinGecko.svg b/packages/nodes-base/nodes/CoinGecko/coinGecko.svg
index 13d2c55d87..8a8469fdf6 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 4d821972fb..516b8928c6 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/GenericFunctions.ts b/packages/nodes-base/nodes/CompareDatasets/GenericFunctions.ts
index c89ac64040..14318acabc 100644
--- a/packages/nodes-base/nodes/CompareDatasets/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/CompareDatasets/GenericFunctions.ts
@@ -1,4 +1,4 @@
-import type { IDataObject, INodeExecutionData } from 'n8n-workflow';
+import { ApplicationError, type IDataObject, type INodeExecutionData } from 'n8n-workflow';
 
 import difference from 'lodash/difference';
 import get from 'lodash/get';
@@ -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' },
 						);
 					}
 
@@ -258,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 = {
@@ -402,16 +400,18 @@ 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' },
 			);
 		}
 	}
@@ -446,7 +446,10 @@ export function checkInputAndThrowError(
 			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 652f53f5d7..1e15d06b9a 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/Compression/Compression.node.json b/packages/nodes-base/nodes/Compression/Compression.node.json
index 5661d44760..c85e4aaf6b 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 b5c3c3e6aa..a26a99657b 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,7 +50,7 @@ export class Compression implements INodeType {
 		icon: 'fa:file-archive',
 		group: ['transform'],
 		subtitle: '={{$parameter["operation"]}}',
-		version: 1,
+		version: [1, 1.1],
 		description: 'Compress and decompress files',
 		defaults: {
 			name: 'Compression',
@@ -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 {
@@ -213,20 +292,37 @@ export class Compression implements INodeType {
 
 								binaryObject[`${outputPrefix}${zipIndex++}`] = data;
 							}
-						} else if (binaryData.fileExtension?.toLowerCase() === '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 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 data = await gzip(binaryDataBuffer);
 
-							const fileName = binaryData.fileName?.split('.')[0];
-
-							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({
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 ea7ff18819..65833677c7 100644
--- a/packages/nodes-base/nodes/Compression/test/node/Compression.test.ts
+++ b/packages/nodes-base/nodes/Compression/test/node/Compression.test.ts
@@ -1,6 +1,8 @@
 /* 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,
@@ -10,9 +12,6 @@ import {
 } from '@test/nodes/Helpers';
 import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 
-import path from 'path';
-import os from 'node:os';
-
 if (os.platform() !== 'win32') {
 	describe('Execute Compression Node', () => {
 		beforeEach(async () => {
diff --git a/packages/nodes-base/nodes/Contentful/Contentful.node.json b/packages/nodes-base/nodes/Contentful/Contentful.node.json
index 6b2d37595b..22ea2f5699 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/ConvertKit/ConvertKit.node.json b/packages/nodes-base/nodes/ConvertKit/ConvertKit.node.json
index d5f0f61c2c..1a872c0ec0 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/ConvertKitTrigger.node.json b/packages/nodes-base/nodes/ConvertKit/ConvertKitTrigger.node.json
index 730e6a866d..be7798fc93 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 b37a1bd147..415f4ceef1 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/convertKit.svg b/packages/nodes-base/nodes/ConvertKit/convertKit.svg
index 59f55f4941..bf3e8be4a8 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 10ca71a4a6..4c7e5be4d7 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.svg b/packages/nodes-base/nodes/Copper/copper.svg
index 19c4ac4da4..34114d9b91 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/Cortex/AnalyzerDescriptions.ts b/packages/nodes-base/nodes/Cortex/AnalyzerDescriptions.ts
index f5c78b1579..449f34a593 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 09c15c75ce..73b11a9050 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 8b51c79b8f..31a27cb77e 100644
--- a/packages/nodes-base/nodes/Cortex/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Cortex/GenericFunctions.ts
@@ -7,7 +7,7 @@ import type {
 	ILoadOptionsFunctions,
 } from 'n8n-workflow';
 
-import moment from 'moment';
+import moment from 'moment-timezone';
 
 export async function cortexApiRequest(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
diff --git a/packages/nodes-base/nodes/Cortex/ResponderDescription.ts b/packages/nodes-base/nodes/Cortex/ResponderDescription.ts
index 31fb47e356..64966847f3 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 35d1d48c2d..f3ee5021b4 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 b0e6dab6c9..3676d919ef 100644
--- a/packages/nodes-base/nodes/CrateDb/CrateDb.node.ts
+++ b/packages/nodes-base/nodes/CrateDb/CrateDb.node.ts
@@ -6,6 +6,7 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
+import pgPromise from 'pg-promise';
 import {
 	generateReturning,
 	getItemCopy,
@@ -15,8 +16,6 @@ import {
 	pgUpdate,
 } from '../Postgres/v1/genericFunctions';
 
-import pgPromise from 'pg-promise';
-
 export class CrateDb implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'CrateDB',
diff --git a/packages/nodes-base/nodes/Cron/Cron.node.ts b/packages/nodes-base/nodes/Cron/Cron.node.ts
index e84ad5f69d..7430e6c07a 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.svg b/packages/nodes-base/nodes/CrowdDev/crowdDev.svg
index 0ba87c1306..c131b92df9 100644
--- a/packages/nodes-base/nodes/CrowdDev/crowdDev.svg
+++ b/packages/nodes-base/nodes/CrowdDev/crowdDev.svg
@@ -1,15 +1 @@
-<svg width="131" height="24" viewBox="0 0 131 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M57.3097 1.04274C57.4165 1.06739 57.4993 1.15158 57.5223 1.25872L58.1022 3.9642C58.1357 4.12016 58.0334 4.27285 57.8764 4.30128L52.2156 5.32696C52.028 5.36095 51.8614 5.20312 51.8851 5.01395L52.4824 0.247384C52.5032 0.0813045 52.6631 -0.0303341 52.8262 0.00732829L57.3097 1.04274Z" fill="#E94F2E"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M88.9753 23.6416C90.9399 23.6416 92.6615 22.9127 93.7118 21.6226C93.8883 21.4059 94.2929 21.4955 94.3218 21.7735L94.4476 22.9845C94.4626 23.1284 94.5838 23.2378 94.7285 23.2378H97.6708C97.8268 23.2378 97.9532 23.1113 97.9532 22.9553V0.407414C97.9532 0.251441 97.8268 0.125 97.6708 0.125H94.4767C94.3208 0.125 94.1943 0.25144 94.1943 0.407413V8.87388C94.1943 9.15681 93.7865 9.28936 93.5874 9.0883C92.5408 8.03107 90.9503 7.4254 89.1928 7.4254C88.3496 7.4254 87.5673 7.53878 86.8516 7.75317V11.9657C87.577 11.236 88.5844 10.8115 89.8141 10.8115C92.4547 10.8115 94.1633 12.7376 94.1633 15.5024C94.1633 18.2673 92.4547 20.1623 89.8141 20.1623C88.5844 20.1623 87.577 19.7445 86.8516 19.0221V23.365C87.5069 23.5465 88.2167 23.6416 88.9753 23.6416ZM107.836 23.6416C111.709 23.6416 114.45 21.7562 115.219 18.6021C115.261 18.4296 115.127 18.2673 114.95 18.2673H111.992C111.867 18.2673 111.759 18.3501 111.715 18.4671C111.218 19.8009 109.883 20.5351 107.899 20.5351C105.481 20.5351 104.067 19.2729 103.712 16.7761C103.688 16.6106 103.819 16.4651 103.986 16.4646L114.948 16.4352C115.104 16.4347 115.23 16.3084 115.23 16.1527V15.285C115.23 10.5009 112.31 7.4254 107.712 7.4254C103.208 7.4254 100.07 10.7494 100.07 15.5646C100.07 20.3176 103.27 23.6416 107.836 23.6416ZM107.743 10.532C109.908 10.532 111.337 11.8061 111.462 13.7596C111.472 13.9153 111.345 14.0424 111.189 14.0424H104.099C103.925 14.0424 103.792 13.8857 103.828 13.7155C104.274 11.6288 105.615 10.532 107.743 10.532ZM124.813 23.064C124.77 23.1692 124.667 23.2378 124.553 23.2378H121.205C121.089 23.2378 120.985 23.1671 120.942 23.0595L115.078 8.27795C115.004 8.09255 115.141 7.89138 115.34 7.89138H118.768C118.885 7.89138 118.99 7.96398 119.032 8.07374L121.634 14.9433C122.045 16.0969 122.406 17.1521 122.664 17.9849C122.754 18.273 123.25 18.2731 123.341 17.9856C123.618 17.1075 124.004 16.0386 124.43 14.9433L127.155 8.06971C127.198 7.96207 127.302 7.89138 127.418 7.89138H130.717C130.918 7.89138 131.055 8.09646 130.977 8.28249L124.813 23.064Z" fill="url(#paint0_linear_470_15680)"/>
-<path d="M0 15.5335C0 20.4108 3.04442 23.6416 7.70425 23.6416C11.5916 23.6416 14.5144 21.3323 15.1114 17.9329C15.1408 17.765 15.0088 17.6149 14.8383 17.6149H11.5614C11.4309 17.6149 11.3184 17.705 11.2808 17.83C10.8176 19.3719 9.51665 20.2244 7.70425 20.2244C5.28114 20.2244 3.78999 18.4226 3.78999 15.5335C3.78999 12.6444 5.4054 10.8115 7.82851 10.8115C9.55529 10.8115 10.797 11.639 11.2803 13.2392C11.3177 13.3632 11.4298 13.4521 11.5594 13.4521H14.814C14.9821 13.4521 15.1134 13.3058 15.0884 13.1395C14.5611 9.62446 11.7476 7.4254 7.67318 7.4254C3.13762 7.4254 0 10.7805 0 15.5335Z" fill="#140505"/>
-<path d="M26.6792 8.04975C26.6792 7.92016 26.5911 7.80665 26.4646 7.77846C25.9342 7.66022 25.4679 7.61179 25.0017 7.61179C23.4123 7.61179 22.1776 8.22781 21.3989 9.21386C21.2178 9.44318 20.7606 9.35331 20.7323 9.06247L20.6462 8.17753C20.6322 8.03283 20.5105 7.92245 20.3652 7.92245H17.3313C17.1753 7.92245 17.0489 8.04889 17.0489 8.20486V22.9553C17.0489 23.1113 17.1753 23.2378 17.3313 23.2378H20.5565C20.7125 23.2378 20.8389 23.1113 20.8389 22.9553V15.782C20.8389 12.7997 22.5475 11.3397 25.2813 11.3397H26.3968C26.5528 11.3397 26.6792 11.2132 26.6792 11.0572V8.04975Z" fill="#140505"/>
-<path d="M26.8959 15.5335C26.8959 20.3176 30.3442 23.6105 35.0972 23.6105C39.8503 23.6105 43.2985 20.3176 43.2985 15.5335C43.2985 10.7494 39.8503 7.45646 35.0972 7.45646C30.3442 7.45646 26.8959 10.7494 26.8959 15.5335ZM30.6859 15.5335C30.6859 12.7376 32.4877 10.8426 35.0972 10.8426C37.7068 10.8426 39.5085 12.7376 39.5085 15.5335C39.5085 18.3294 37.7068 20.2244 35.0972 20.2244C32.4877 20.2244 30.6859 18.3294 30.6859 15.5335Z" fill="#140505"/>
-<path d="M73.9835 23.6416C75.9481 23.6416 77.6697 22.9127 78.72 21.6226C78.8964 21.4059 79.3011 21.4955 79.33 21.7735L79.4558 22.9845C79.4707 23.1284 79.592 23.2378 79.7367 23.2378H82.679C82.835 23.2378 82.9614 23.1113 82.9614 22.9553V0.407414C82.9614 0.251441 82.835 0.125 82.679 0.125H79.4849C79.329 0.125 79.2025 0.251441 79.2025 0.407414V8.87388C79.2025 9.15681 78.7947 9.28936 78.5957 9.0883C77.549 8.03107 75.9585 7.4254 74.201 7.4254C69.5722 7.4254 66.7763 10.8426 66.7763 15.6267C66.7763 20.3797 69.5411 23.6416 73.9835 23.6416ZM74.8223 20.1623C72.1817 20.1623 70.5663 18.2362 70.5663 15.5024C70.5663 12.7687 72.1817 10.8115 74.8223 10.8115C77.4629 10.8115 79.1714 12.7376 79.1714 15.5024C79.1714 18.2673 77.4629 20.1623 74.8223 20.1623Z" fill="#140505"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M44.468 11.2986C44.2998 11.3291 44.197 11.5008 44.2497 11.6635L47.9351 23.0424C47.9729 23.1588 48.0814 23.2378 48.2038 23.2378H51.4892C51.612 23.2378 51.7206 23.1585 51.7581 23.0416L53.8077 16.6519C54.202 15.3742 54.4682 14.465 54.655 13.7859C54.7379 13.4849 55.2539 13.4953 55.3278 13.7986C55.5105 14.5481 55.7667 15.4853 56.1065 16.5897L58.1564 23.0409C58.1937 23.1581 58.3025 23.2378 58.4256 23.2378H61.5593C61.6797 23.2378 61.7868 23.1615 61.8262 23.0477L66.9429 8.26618C67.0064 8.08272 66.8702 7.89138 66.676 7.89138H63.2731C63.1494 7.89138 63.0402 7.9718 63.0034 8.08985L61.0149 14.4773C60.8324 15.1057 60.5574 16.1045 60.3192 17.042C60.2432 17.3415 59.7535 17.3377 59.6796 17.0377C59.4283 16.0181 59.1181 14.8855 58.9956 14.4773L57.0071 8.08985C56.9703 7.9718 56.8611 7.89138 56.7374 7.89138H53.2992C53.1764 7.89138 53.0677 7.97066 53.0302 8.08754L50.9807 14.4773C50.6607 15.4573 50.4308 16.2056 50.233 17.0122C50.1589 17.3145 49.6915 17.3143 49.6243 17.0104C49.427 16.1185 49.2164 15.2712 48.9925 14.4773L47.9046 10.929C47.8627 10.7922 47.725 10.7084 47.5843 10.7339L44.468 11.2986Z" fill="#140505"/>
-<defs>
-<linearGradient id="paint0_linear_470_15680" x1="93.4995" y1="15.0132" x2="84.4995" y2="16.0133" gradientUnits="userSpaceOnUse">
-<stop stop-color="#E94F2E"/>
-<stop offset="1" stop-color="#CA2400"/>
-</linearGradient>
-</defs>
-</svg>
+<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/index.ts b/packages/nodes-base/nodes/CrowdDev/descriptions/index.ts
index 2d92d79380..4bc1496287 100644
--- a/packages/nodes-base/nodes/CrowdDev/descriptions/index.ts
+++ b/packages/nodes-base/nodes/CrowdDev/descriptions/index.ts
@@ -1,10 +1,10 @@
+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 type { INodeProperties } from 'n8n-workflow';
 import { automationFields, automationOperations } from './automationFields';
 
 export const allProperties: INodeProperties[] = [
diff --git a/packages/nodes-base/nodes/CrowdDev/descriptions/memberFields.ts b/packages/nodes-base/nodes/CrowdDev/descriptions/memberFields.ts
index c42acd25c7..08f4548b69 100644
--- a/packages/nodes-base/nodes/CrowdDev/descriptions/memberFields.ts
+++ b/packages/nodes-base/nodes/CrowdDev/descriptions/memberFields.ts
@@ -1,7 +1,7 @@
 import type { INodeProperties } from 'n8n-workflow';
+import { memberPresend } from '../GenericFunctions';
 import { getAdditionalOptions, getId, mapWith, showFor } from './utils';
 import * as shared from './shared';
-import { memberPresend } from '../GenericFunctions';
 
 const displayOpts = showFor(['member']);
 
diff --git a/packages/nodes-base/nodes/Crypto/Crypto.node.json b/packages/nodes-base/nodes/Crypto/Crypto.node.json
index 16a9b7ea5d..30e1febb08 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 35412582de..e95ff7ef65 100644
--- a/packages/nodes-base/nodes/Crypto/Crypto.node.ts
+++ b/packages/nodes-base/nodes/Crypto/Crypto.node.ts
@@ -1,5 +1,7 @@
-import set from 'lodash/set';
-
+import type { BinaryToTextEncoding } from 'crypto';
+import { createHash, createHmac, createSign, getHashes, randomBytes } from 'crypto';
+import stream from 'stream';
+import { promisify } from 'util';
 import type {
 	IExecuteFunctions,
 	INodeExecutionData,
@@ -8,11 +10,7 @@ import type {
 	JsonObject,
 } from 'n8n-workflow';
 import { deepCopy, BINARY_ENCODING } from 'n8n-workflow';
-
-import type { BinaryToTextEncoding } from 'crypto';
-import { createHash, createHmac, createSign, getHashes, randomBytes } from 'crypto';
-import stream from 'stream';
-import { promisify } from 'util';
+import set from 'lodash/set';
 
 import { v4 as uuid } from 'uuid';
 
@@ -123,7 +121,7 @@ export class Crypto implements INodeType {
 				required: true,
 			},
 			{
-				displayName: 'Binary Data',
+				displayName: 'Binary File',
 				name: 'binaryData',
 				type: 'boolean',
 				default: false,
@@ -309,7 +307,6 @@ export class Crypto implements INodeType {
 				displayOptions: {
 					show: {
 						action: ['sign'],
-						binaryData: [false],
 					},
 				},
 				type: 'string',
diff --git a/packages/nodes-base/nodes/CustomerIo/customerio.svg b/packages/nodes-base/nodes/CustomerIo/customerio.svg
index 396806209e..0ef4bf0101 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
+<svg xmlns="http://www.w3.org/2000/svg" width="256" height="180" preserveAspectRatio="xMidYMid"><path fill="#FFCD00" d="M127.843 102.423a51.21 51.21 0 1 0-51.21-51.186 51.186 51.186 0 0 0 51.21 51.186"/><path fill="#00ECBB" 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.171z"/><path fill="#AF64FF" 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-.147z"/><path fill="#7131FF" d="M218.509 141.73a127.99 127.99 0 0 1-181.013 0l36.197-36.197c30 29.98 78.618 29.98 108.618 0l36.198 36.198z"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/DateTime/DateTime.node.json b/packages/nodes-base/nodes/DateTime/DateTime.node.json
index f1d41f281b..8c325f0007 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 478fac354d..daffa817c0 100644
--- a/packages/nodes-base/nodes/DateTime/DateTime.node.ts
+++ b/packages/nodes-base/nodes/DateTime/DateTime.node.ts
@@ -2,7 +2,6 @@ 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 {
diff --git a/packages/nodes-base/nodes/DateTime/V2/AddToDateDescription.ts b/packages/nodes-base/nodes/DateTime/V2/AddToDateDescription.ts
index 7d96fe75ff..247eb9d33a 100644
--- a/packages/nodes-base/nodes/DateTime/V2/AddToDateDescription.ts
+++ b/packages/nodes-base/nodes/DateTime/V2/AddToDateDescription.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+import { includeInputFields } from './common.descriptions';
 
 export const AddToDateDescription: INodeProperties[] = [
 	{
@@ -102,4 +103,17 @@ export const AddToDateDescription: INodeProperties[] = [
 			},
 		},
 	},
+	{
+		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
index 1d8c34369c..0440f67ba4 100644
--- a/packages/nodes-base/nodes/DateTime/V2/CurrentDateDescription.ts
+++ b/packages/nodes-base/nodes/DateTime/V2/CurrentDateDescription.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+import { includeInputFields } from './common.descriptions';
 
 export const CurrentDateDescription: INodeProperties[] = [
 	{
@@ -50,6 +51,7 @@ export const CurrentDateDescription: INodeProperties[] = [
 		},
 		default: {},
 		options: [
+			includeInputFields,
 			{
 				displayName: 'Timezone',
 				name: 'timezone',
diff --git a/packages/nodes-base/nodes/DateTime/V2/DateTimeV2.node.ts b/packages/nodes-base/nodes/DateTime/V2/DateTimeV2.node.ts
index 8a72d90c0a..4ee0f00e11 100644
--- a/packages/nodes-base/nodes/DateTime/V2/DateTimeV2.node.ts
+++ b/packages/nodes-base/nodes/DateTime/V2/DateTimeV2.node.ts
@@ -1,5 +1,4 @@
 import type {
-	IDataObject,
 	IExecuteFunctions,
 	INodeExecutionData,
 	INodeType,
@@ -8,14 +7,14 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
+import type { DateTimeUnit, DurationUnit } from 'luxon';
+import { DateTime } from 'luxon';
 import { CurrentDateDescription } from './CurrentDateDescription';
 import { AddToDateDescription } from './AddToDateDescription';
 import { SubtractFromDateDescription } from './SubtractFromDateDescription';
 import { FormatDateDescription } from './FormatDateDescription';
 import { RoundDateDescription } from './RoundDateDescription';
 import { GetTimeBetweenDatesDescription } from './GetTimeBetweenDates';
-import type { DateTimeUnit, DurationUnit } from 'luxon';
-import { DateTime } from 'luxon';
 import { ExtractDateDescription } from './ExtractDateDescription';
 import { parseDate } from './GenericFunctions';
 
@@ -32,6 +31,7 @@ export class DateTimeV2 implements INodeType {
 			},
 			inputs: ['main'],
 			outputs: ['main'],
+			description: 'Manipulate date and time values',
 			properties: [
 				{
 					displayName: 'Operation',
@@ -84,134 +84,146 @@ export class DateTimeV2 implements INodeType {
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 		const items = this.getInputData();
 		const returnData: INodeExecutionData[] = [];
-		const responseData = [];
 		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++) {
-			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;
+			try {
+				const item: INodeExecutionData = includeInputFields ? copyShallow(items[i]) : { json: {} };
+				item.pairedItem = {
+					item: i,
 				};
 
-				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.`,
-					);
-				}
-				responseData.push(
-					includeTime
-						? { [outputFieldName]: DateTime.now().setZone(newLocal).toString() }
-						: {
-								[outputFieldName]: DateTime.now().setZone(newLocal).startOf('day').toString(),
-						  },
-				);
-			} 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;
+				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 dateToAdd = parseDate.call(this, addToDate, workflowTimezone);
-				const returnedDate = dateToAdd.plus({ [timeUnit]: duration });
-				responseData.push({ [outputFieldName]: returnedDate.toString() });
-			} 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, workflowTimezone);
-				const returnedDate = dateToAdd.minus({ [timeUnit]: duration });
-				responseData.push({ [outputFieldName]: returnedDate.toString() });
-			} 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 } = this.getNodeParameter('options', i) as { timezone: boolean };
-
-				if (date === null || date === undefined) {
-					responseData.push({
-						[outputFieldName]: date,
-					});
-				} else {
-					const dateLuxon = timezone
-						? parseDate.call(this, date, workflowTimezone)
-						: parseDate.call(this, date);
-					if (format === 'custom') {
-						const customFormat = this.getNodeParameter('customFormat', i) as string;
-						responseData.push({
-							[outputFieldName]: dateLuxon.toFormat(customFormat),
-						});
-					} else {
-						responseData.push({
-							[outputFieldName]: dateLuxon.toFormat(format),
-						});
+					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.`,
+						);
 					}
-				}
-			} 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, workflowTimezone);
+					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;
 
-				if (mode === 'roundDown') {
-					const toNearest = this.getNodeParameter('toNearest', i) as string;
-					responseData.push({
-						[outputFieldName]: dateLuxon.startOf(toNearest as DateTimeUnit).toString(),
-					});
-				} else if (mode === 'roundUp') {
-					const to = this.getNodeParameter('to', i) as string;
-					responseData.push({
-						[outputFieldName]: dateLuxon
+					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(),
-					});
+							.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 === '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, workflowTimezone);
-				const luxonEndDate = parseDate.call(this, endDate, workflowTimezone);
-				const duration = luxonEndDate.diff(luxonStartDate, unit);
-				isoString
-					? responseData.push({
-							[outputFieldName]: duration.toString(),
-					  })
-					: responseData.push({
-							[outputFieldName]: duration.toObject(),
-					  });
-			} 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, workflowTimezone);
-				const selectedPart = part === 'week' ? parsedDate.weekNumber : parsedDate.get(part);
-				responseData.push({ [outputFieldName]: selectedPart });
+			} catch (error) {
+				if (this.continueOnFail()) {
+					returnData.push({ json: { error: error.message } });
+					continue;
+				}
+				throw new NodeOperationError(this.getNode(), error, { itemIndex: i });
 			}
-
-			const executionData = this.helpers.constructExecutionMetaData(
-				this.helpers.returnJsonArray(responseData as IDataObject[]),
-				{
-					itemData: { item: i },
-				},
-			);
-			returnData.push(...executionData);
-			// Reset responseData
-			responseData.length = 0;
 		}
 		return [returnData];
 	}
diff --git a/packages/nodes-base/nodes/DateTime/V2/ExtractDateDescription.ts b/packages/nodes-base/nodes/DateTime/V2/ExtractDateDescription.ts
index 0fcb7bb20d..2cda97f00f 100644
--- a/packages/nodes-base/nodes/DateTime/V2/ExtractDateDescription.ts
+++ b/packages/nodes-base/nodes/DateTime/V2/ExtractDateDescription.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+import { includeInputFields } from './common.descriptions';
 
 export const ExtractDateDescription: INodeProperties[] = [
 	{
@@ -79,4 +80,17 @@ export const ExtractDateDescription: INodeProperties[] = [
 			},
 		},
 	},
+	{
+		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
index dad16abcec..18c041b279 100644
--- a/packages/nodes-base/nodes/DateTime/V2/FormatDateDescription.ts
+++ b/packages/nodes-base/nodes/DateTime/V2/FormatDateDescription.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+import { includeInputFields } from './common.descriptions';
 
 export const FormatDateDescription: INodeProperties[] = [
 	{
@@ -117,6 +118,17 @@ export const FormatDateDescription: INodeProperties[] = [
 		},
 		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',
diff --git a/packages/nodes-base/nodes/DateTime/V2/GenericFunctions.ts b/packages/nodes-base/nodes/DateTime/V2/GenericFunctions.ts
index 153d875d3b..215c0f60d3 100644
--- a/packages/nodes-base/nodes/DateTime/V2/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/DateTime/V2/GenericFunctions.ts
@@ -1,20 +1,23 @@
 import { DateTime } from 'luxon';
-import moment from 'moment';
+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,
-	timezone?: string,
+	options: Partial<{
+		timezone: string;
+		fromFormat: string;
+	}> = {},
 ) {
 	let parsedDate;
 
 	if (date instanceof DateTime) {
 		parsedDate = date;
 	} else {
-		// Check if the input is a number
-		if (!Number.isNaN(Number(date))) {
+		// 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
@@ -23,6 +26,7 @@ export function parseDate(
 			}
 		}
 
+		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
@@ -37,7 +41,11 @@ export function parseDate(
 				timezone = `Etc/GMT-${offset * 1}`;
 			}
 
-			parsedDate = DateTime.fromISO(moment(date).toISOString());
+			if (options.fromFormat) {
+				parsedDate = DateTime.fromFormat(date as string, options.fromFormat);
+			} else {
+				parsedDate = DateTime.fromISO(moment(date).toISOString());
+			}
 		}
 
 		parsedDate = parsedDate.setZone(timezone || 'Etc/UTC');
diff --git a/packages/nodes-base/nodes/DateTime/V2/GetTimeBetweenDates.ts b/packages/nodes-base/nodes/DateTime/V2/GetTimeBetweenDates.ts
index 161858936c..cb5edf4958 100644
--- a/packages/nodes-base/nodes/DateTime/V2/GetTimeBetweenDates.ts
+++ b/packages/nodes-base/nodes/DateTime/V2/GetTimeBetweenDates.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+import { includeInputFields } from './common.descriptions';
 
 export const GetTimeBetweenDatesDescription: INodeProperties[] = [
 	{
@@ -93,6 +94,7 @@ export const GetTimeBetweenDatesDescription: INodeProperties[] = [
 		},
 		default: {},
 		options: [
+			includeInputFields,
 			{
 				displayName: 'Output as ISO String',
 				name: 'isoString',
diff --git a/packages/nodes-base/nodes/DateTime/V2/RoundDateDescription.ts b/packages/nodes-base/nodes/DateTime/V2/RoundDateDescription.ts
index 5d244efae2..4cd4266f58 100644
--- a/packages/nodes-base/nodes/DateTime/V2/RoundDateDescription.ts
+++ b/packages/nodes-base/nodes/DateTime/V2/RoundDateDescription.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+import { includeInputFields } from './common.descriptions';
 
 export const RoundDateDescription: INodeProperties[] = [
 	{
@@ -119,4 +120,17 @@ export const RoundDateDescription: INodeProperties[] = [
 			},
 		},
 	},
+	{
+		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
index 247d63b0b0..acd9604e44 100644
--- a/packages/nodes-base/nodes/DateTime/V2/SubtractFromDateDescription.ts
+++ b/packages/nodes-base/nodes/DateTime/V2/SubtractFromDateDescription.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+import { includeInputFields } from './common.descriptions';
 
 export const SubtractFromDateDescription: INodeProperties[] = [
 	{
@@ -102,4 +103,17 @@ export const SubtractFromDateDescription: INodeProperties[] = [
 			},
 		},
 	},
+	{
+		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 0000000000..65b0b98e8d
--- /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 99110c67b0..60c630d076 100644
--- a/packages/nodes-base/nodes/DateTime/test/node/DateTime.test.ts
+++ b/packages/nodes-base/nodes/DateTime/test/node/DateTime.test.ts
@@ -1,4 +1,4 @@
-import moment from 'moment';
+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/workflow.includeInputFields_v2.json b/packages/nodes-base/nodes/DateTime/test/node/workflow.includeInputFields_v2.json
new file mode 100644
index 0000000000..a6ee548eef
--- /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/DebugHelper/DebugHelper.node.json b/packages/nodes-base/nodes/DebugHelper/DebugHelper.node.json
index 2f539b510f..0d29880dbf 100644
--- a/packages/nodes-base/nodes/DebugHelper/DebugHelper.node.json
+++ b/packages/nodes-base/nodes/DebugHelper/DebugHelper.node.json
@@ -9,5 +9,6 @@
 				"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
index 071f24ba22..6d657f6645 100644
--- a/packages/nodes-base/nodes/DebugHelper/DebugHelper.node.ts
+++ b/packages/nodes-base/nodes/DebugHelper/DebugHelper.node.ts
@@ -4,7 +4,8 @@ import type {
 	INodeType,
 	INodeTypeDescription,
 } from 'n8n-workflow';
-import { NodeApiError, NodeOperationError } from 'n8n-workflow';
+import { ApplicationError, NodeApiError, NodeOperationError } from 'n8n-workflow';
+import { setSeed, array as mfArray } from 'minifaker';
 import {
 	generateCreditCard,
 	generateIPv4,
@@ -19,7 +20,6 @@ import {
 	generateUUID,
 	generateVersion,
 } from './randomData';
-import { setSeed, array as mfArray } from 'minifaker';
 import { generateGarbageMemory, runGarbageCollector } from './functions';
 
 export class DebugHelper implements INodeType {
@@ -273,7 +273,7 @@ export class DebugHelper implements INodeType {
 								});
 							case 'Error':
 								// eslint-disable-next-line n8n-nodes-base/node-execute-block-wrong-error-thrown
-								throw new Error(throwErrorMessage);
+								throw new ApplicationError(throwErrorMessage);
 							default:
 								break;
 						}
diff --git a/packages/nodes-base/nodes/DebugHelper/DebugHelper.svg b/packages/nodes-base/nodes/DebugHelper/DebugHelper.svg
index 0a63b95e52..b1a62f59e0 100644
--- a/packages/nodes-base/nodes/DebugHelper/DebugHelper.svg
+++ b/packages/nodes-base/nodes/DebugHelper/DebugHelper.svg
@@ -1,28 +1 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
-<svg height="800px" width="800px" version="1.1" id="Layer_1"
-	xmlns="http://www.w3.org/2000/svg"
-	xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 512 512" xml:space="preserve">
-	<path style="fill:#F4A026;" d="M345,167c32.953,0,46.333,40.047,46.333,73v100.333c0,74.375-60.292,134.667-134.667,134.667l0,0
-	C182.292,475,122,414.708,122,340.333V240c0-32.953,13.38-73,46.333-73H345z"/>
-	<path style="fill:#CA463D;" d="M309,200.333H204.333C185.372,200.333,170,184.961,170,166l0,0c0-39.948,32.385-72.333,72.333-72.333
-	H271c39.948,0,72.333,32.385,72.333,72.333l0,0C343.333,184.961,327.961,200.333,309,200.333z"/>
-	<path d="M498.667,290.667H404V240c0-1.016,0.313-2.036,0.291-3.055C452.4,231.927,480,200.272,480,148.333v-12
-	c0-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
-	c-6.069-27.025-20.875-50.381-45.537-55.7c-3.745-28.54-21.413-52.689-46.115-65.227c10.321-10.501,16.871-24.887,16.871-40.74V37
-	c0-7.364-5.971-13.333-13.333-13.333S300,29.636,300,37v11.833C300,66.203,285.536,80,268.167,80h-23
-	c-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.833
-	c0,15.853,6.549,30.239,16.871,40.741c-24.701,12.537-42.453,36.687-46.199,65.227c-24.695,5.324-39.465,28.736-45.519,55.808
-	c-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.333v12
-	c0,52.415,27.439,84.168,76.375,88.739C108.353,238.048,108,239.025,108,240v50.667H13.333C5.971,290.667,0,296.636,0,304
-	c0,7.364,5.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.333v12
-	c0,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
-	c22.451,53.208,75.151,90.649,136.435,90.649c61.276,0,113.971-37.432,136.425-90.629c40.519,0.784,60.241,21.283,60.241,62.629v12
-	c0,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
-	c2.151-10.025,2.96-20.421,2.96-31.079v-23h94.667c7.363,0,13.333-5.969,13.333-13.333C512,296.636,506.029,290.667,498.667,290.667
-	z M242.333,106.667h2.833h23H271c32.532,0,59,26.468,59,59c0,11.58-9.42,21-21,21H204.333c-11.58,0-21-9.42-21-21
-	C183.333,133.135,209.801,106.667,242.333,106.667z M134.667,340.333V240c0-20.793,6.948-50.531,24.483-58.035
-	c6.627,18.368,24.56,31.368,45.184,31.368h38.333v247.521C182.333,453.891,134.667,402.501,134.667,340.333z M269.333,461.007
-	V213.333H309c20.624,0,37.891-13,44.517-31.368c17.535,7.504,23.816,37.241,23.816,58.035v100.333
-	C377.333,402.96,330.307,454.653,269.333,461.007z"/>
-</svg>
+<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/DeepL/deepl.svg b/packages/nodes-base/nodes/DeepL/deepl.svg
index 0738c3c766..889cf28b77 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/demio.svg b/packages/nodes-base/nodes/Demio/demio.svg
index 3698f1e463..e853de9ce1 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/dhl.svg b/packages/nodes-base/nodes/Dhl/dhl.svg
index 854e589d3c..20cfb917bb 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 41df8ad45d..9a7b950eb8 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 { INodeTypeBaseDescription, IVersionedNodeType } from 'n8n-workflow';
+import { VersionedNodeType } 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',
-					},
-				],
-			},
-		],
-	};
+import { DiscordV1 } from './v1/DiscordV1.node';
+import { DiscordV2 } from './v2/DiscordV2.node';
 
-	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
-		const returnData: INodeExecutionData[] = [];
+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 webhookUri = this.getNodeParameter('webhookUri', 0, '') as string;
+		const nodeVersions: IVersionedNodeType['nodeVersions'] = {
+			1: new DiscordV1(baseDescription),
+			2: new DiscordV2(baseDescription),
+		};
 
-		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 [returnData];
+		super(nodeVersions, baseDescription);
 	}
 }
diff --git a/packages/nodes-base/nodes/Discord/discord.svg b/packages/nodes-base/nodes/Discord/discord.svg
index 079b54bdd7..f5e0e691e6 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 0000000000..f1497191bc
--- /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 () => 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 0000000000..52e95e2abc
--- /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 0000000000..abb5f6df42
--- /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 () => 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 0000000000..051f3ff02d
--- /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 0000000000..61fa6d8da6
--- /dev/null
+++ b/packages/nodes-base/nodes/Discord/test/v2/node/channel/get.test.ts
@@ -0,0 +1,112 @@
+import type { INodeTypes } from 'n8n-workflow';
+import nock from 'nock';
+import type { OptionsWithUrl } from 'request-promise-native';
+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: OptionsWithUrl, 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 () => 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 0000000000..dd3b1844eb
--- /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 0000000000..342cb9b62a
--- /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 () => 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 0000000000..02b813627a
--- /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 0000000000..c42c56a8ff
--- /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 () => 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 0000000000..149229e373
--- /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 0000000000..80589af952
--- /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 () => 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 0000000000..d2f1bc8b4f
--- /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 0000000000..1fe60cd181
--- /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 () => 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 0000000000..fe3dd6e02c
--- /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 0000000000..c9befeca61
--- /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 () => 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 0000000000..980c0d7e7d
--- /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 0000000000..5a2fc3c578
--- /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 () => 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 0000000000..84cd5870be
--- /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 0000000000..5dd36d8711
--- /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 () => 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 0000000000..85df4cfdbe
--- /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 0000000000..0d2d4d7702
--- /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 () => 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 0000000000..212ae76271
--- /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 0000000000..c830c6a580
--- /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 () => 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 0000000000..9f27053f6e
--- /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 0000000000..81292e3fdc
--- /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 () => 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 0000000000..f1ca99ef37
--- /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 0000000000..04c1e77218
--- /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 () => 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 0000000000..3ae3b9b01b
--- /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 0000000000..a54d48eee9
--- /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 0000000000..bf04088fd5
--- /dev/null
+++ b/packages/nodes-base/nodes/Discord/v1/DiscordV1.node.ts
@@ -0,0 +1,290 @@
+/* eslint-disable n8n-nodes-base/node-filename-against-convention */
+
+import type {
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeType,
+	INodeTypeBaseDescription,
+	INodeTypeDescription,
+} 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;
+
+			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 0000000000..cfec663665
--- /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 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 0000000000..5372fb92b7
--- /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 0000000000..14a601938e
--- /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 0000000000..5d0a09d4bd
--- /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 0000000000..c71f305b42
--- /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 0000000000..e866e89ac0
--- /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 0000000000..670a875ae1
--- /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 0000000000..a4ce3f4147
--- /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 0000000000..6394997d83
--- /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 0000000000..a2260b731c
--- /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 0000000000..4cd83fe2fd
--- /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 0000000000..025975054b
--- /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 0000000000..2d605ad086
--- /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 0000000000..b9366088fa
--- /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 0000000000..0378bfc82b
--- /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 0000000000..a2fb1955a4
--- /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 0000000000..a12acad581
--- /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 0000000000..eb207c53b1
--- /dev/null
+++ b/packages/nodes-base/nodes/Discord/v2/actions/message/send.operation.ts
@@ -0,0 +1,227 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
+import { 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, i);
+		}
+
+		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;
+
+				channelId = (
+					(await discordApiRequest.call(this, 'POST', '/users/@me/channels', {
+						recipient_id: userId,
+					})) as IDataObject
+				).id as string;
+			}
+
+			if (sendTo === 'channel') {
+				channelId = this.getNodeParameter('channelId', i, undefined, {
+					extractValue: true,
+				}) as string;
+			}
+
+			if (!channelId) {
+				throw new NodeOperationError(this.getNode(), 'Channel ID is required');
+			}
+
+			if (isOAuth2) await checkAccessToChannel.call(this, channelId, userGuilds, 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 0000000000..c415fe663d
--- /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 0000000000..2a65ca6145
--- /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 0000000000..23c7e3337f
--- /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: 'Manage messages, channels, and members on a server',
+				},
+				{
+					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 0000000000..0faa42665b
--- /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 0000000000..29a9733739
--- /dev/null
+++ b/packages/nodes-base/nodes/Discord/v2/actions/webhook/sendLegacy.operation.ts
@@ -0,0 +1,167 @@
+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: '',
+		required: true,
+		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 0000000000..8951320a3f
--- /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[], i = 0) {
+	return embeds
+		.map((embed, index) => {
+			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 fing 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 0000000000..073c80a2ea
--- /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 0000000000..902dfb1563
--- /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 0000000000..ab79a4bd1d
--- /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 0000000000..5c3c3db1ba
--- /dev/null
+++ b/packages/nodes-base/nodes/Discord/v2/transport/discord.api.ts
@@ -0,0 +1,101 @@
+import type { OptionsWithUrl } from 'request';
+
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	IExecuteSingleFunctions,
+	IHookFunctions,
+	ILoadOptionsFunctions,
+} 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: string,
+	endpoint: string,
+	body?: IDataObject,
+	qs?: IDataObject,
+) {
+	const authentication = this.getNodeParameter('authentication', 0, 'webhook') as string;
+	const headers: IDataObject = {};
+
+	const credentialType = getCredentialsType(authentication);
+
+	const options: OptionsWithUrl = {
+		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 excing 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: string,
+	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: OptionsWithUrl = {
+		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 excing 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 0000000000..39341c5f4f
--- /dev/null
+++ b/packages/nodes-base/nodes/Discord/v2/transport/helpers.ts
@@ -0,0 +1,47 @@
+import type { OptionsWithUrl } from 'request';
+
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	IExecuteSingleFunctions,
+	IHookFunctions,
+	ILoadOptionsFunctions,
+} 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: OptionsWithUrl,
+	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 0000000000..0e90e2df38
--- /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 5bd488805d..62e518b599 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',
diff --git a/packages/nodes-base/nodes/Discourse/UserDescription.ts b/packages/nodes-base/nodes/Discourse/UserDescription.ts
index cf921a3a1d..8b750bfd0c 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 3bb78593df..0e74b4e015 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/Dropbox/Dropbox.node.ts b/packages/nodes-base/nodes/Dropbox/Dropbox.node.ts
index af836169f3..2b2e006a60 100644
--- a/packages/nodes-base/nodes/Dropbox/Dropbox.node.ts
+++ b/packages/nodes-base/nodes/Dropbox/Dropbox.node.ts
@@ -312,7 +312,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 +323,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 +346,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 +374,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 +387,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',
 			},
 
 			// ----------------------------------
diff --git a/packages/nodes-base/nodes/Dropbox/dropbox.svg b/packages/nodes-base/nodes/Dropbox/dropbox.svg
index 9be2f8d406..3399a31c71 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.svg b/packages/nodes-base/nodes/Dropcontact/dropcontact.svg
index 447973cc55..e92eec2381 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/ERPNext/erpnext.svg b/packages/nodes-base/nodes/ERPNext/erpnext.svg
index 4e61fdc20e..516ae2b6d7 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/EditImage/EditImage.node.json b/packages/nodes-base/nodes/EditImage/EditImage.node.json
index ae77de2401..56219a87a2 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 dff2c1a555..7288b55776 100644
--- a/packages/nodes-base/nodes/EditImage/EditImage.node.ts
+++ b/packages/nodes-base/nodes/EditImage/EditImage.node.ts
@@ -1,3 +1,6 @@
+import { parse as pathParse } from 'path';
+import { writeFile as fsWriteFile } from 'fs';
+import { promisify } from 'util';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -11,9 +14,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';
 
diff --git a/packages/nodes-base/nodes/Egoi/Egoi.node.json b/packages/nodes-base/nodes/Egoi/Egoi.node.json
index fa25029bc4..fd42328b28 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 5fae285cdf..acffe03e97 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',
diff --git a/packages/nodes-base/nodes/Elastic/ElasticSecurity/ElasticSecurity.node.ts b/packages/nodes-base/nodes/Elastic/ElasticSecurity/ElasticSecurity.node.ts
index af73b44283..72ff4d3602 100644
--- a/packages/nodes-base/nodes/Elastic/ElasticSecurity/ElasticSecurity.node.ts
+++ b/packages/nodes-base/nodes/Elastic/ElasticSecurity/ElasticSecurity.node.ts
@@ -12,6 +12,7 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
+import type { OptionsWithUri } from 'request';
 import {
 	elasticSecurityApiRequest,
 	getConnector,
@@ -39,8 +40,6 @@ import type {
 	ElasticSecurityApiCredentials,
 } from './types';
 
-import type { OptionsWithUri } from 'request';
-
 export class ElasticSecurity implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Elastic Security',
diff --git a/packages/nodes-base/nodes/Elastic/ElasticSecurity/elasticSecurity.svg b/packages/nodes-base/nodes/Elastic/ElasticSecurity/elasticSecurity.svg
index 307e912c45..ffe2086bf5 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/Elasticsearch/Elasticsearch.node.ts b/packages/nodes-base/nodes/Elastic/Elasticsearch/Elasticsearch.node.ts
index 22c5c1c87f..c209b84538 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',
diff --git a/packages/nodes-base/nodes/Elastic/Elasticsearch/elasticsearch.svg b/packages/nodes-base/nodes/Elastic/Elasticsearch/elasticsearch.svg
index 7e2fad792c..c31ebec7f6 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/EmailReadImap/EmailReadImap.node.json b/packages/nodes-base/nodes/EmailReadImap/EmailReadImap.node.json
index 321c472398..ca29d5e782 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/EmailSend/EmailSend.node.json b/packages/nodes-base/nodes/EmailSend/EmailSend.node.json
index 51a9454610..3f5a2d5a13 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/v2/EmailSendV2.node.ts b/packages/nodes-base/nodes/EmailSend/v2/EmailSendV2.node.ts
index afb41c8623..5c9e653c48 100644
--- a/packages/nodes-base/nodes/EmailSend/v2/EmailSendV2.node.ts
+++ b/packages/nodes-base/nodes/EmailSend/v2/EmailSendV2.node.ts
@@ -9,7 +9,6 @@ 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',
diff --git a/packages/nodes-base/nodes/EmailSend/v2/send.operation.ts b/packages/nodes-base/nodes/EmailSend/v2/send.operation.ts
index 0cd04aeb77..a6ef660c64 100644
--- a/packages/nodes-base/nodes/EmailSend/v2/send.operation.ts
+++ b/packages/nodes-base/nodes/EmailSend/v2/send.operation.ts
@@ -51,14 +51,17 @@ 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',
@@ -282,9 +285,7 @@ export async function execute(this: IExecuteFunctions): Promise<INodeExecutionDa
 					<em>${attributionText}<a href="${link}" target="_blank">n8n</a></em>
 					`;
 				} else {
-					mailOptions.text = `${
-						mailOptions.text
-					}\n\n---\n${attributionText}n8n\n${'https://n8n.io'}`;
+					mailOptions.text = `${mailOptions.text}\n\n---\n${attributionText}n8n\n${'https://n8n.io'}`;
 				}
 			}
 
diff --git a/packages/nodes-base/nodes/Emelia/Emelia.node.json b/packages/nodes-base/nodes/Emelia/Emelia.node.json
index 83a48c978f..955dbff292 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 37231ff2ff..7a767f1885 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',
diff --git a/packages/nodes-base/nodes/Emelia/EmeliaTrigger.node.json b/packages/nodes-base/nodes/Emelia/EmeliaTrigger.node.json
index 843c0c97e9..cdc7e83ad6 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/emelia.svg b/packages/nodes-base/nodes/Emelia/emelia.svg
index 3a59dfc009..a8a0515f7f 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 1ea73accf2..63e9c228c1 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/ExecuteCommand/ExecuteCommand.node.ts b/packages/nodes-base/nodes/ExecuteCommand/ExecuteCommand.node.ts
index 3c0cb7d6e4..6cec9a9a41 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;
diff --git a/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow.node.json b/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow.node.json
index 9bb4ffae1e..9fc5229703 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 c05200cb2e..bd7ca7835b 100644
--- a/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow.node.ts
+++ b/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow.node.ts
@@ -6,8 +6,8 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 
-import { getWorkflowInfo } from './GenericFunctions';
 import { generatePairedItemData } from '../../utils/utilities';
+import { getWorkflowInfo } from './GenericFunctions';
 
 export class ExecuteWorkflow implements INodeType {
 	description: INodeTypeDescription = {
@@ -111,9 +111,8 @@ export class ExecuteWorkflow implements INodeType {
 			{
 				displayName: 'Workflow JSON',
 				name: 'workflowJson',
-				type: 'string',
+				type: 'json',
 				typeOptions: {
-					editor: 'json',
 					rows: 10,
 				},
 				displayOptions: {
diff --git a/packages/nodes-base/nodes/ExecuteWorkflow/GenericFunctions.ts b/packages/nodes-base/nodes/ExecuteWorkflow/GenericFunctions.ts
index 8022391d80..b91d6ee4b5 100644
--- a/packages/nodes-base/nodes/ExecuteWorkflow/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/ExecuteWorkflow/GenericFunctions.ts
@@ -1,11 +1,6 @@
-import {
-	NodeOperationError,
-	type IExecuteFunctions,
-	type IExecuteWorkflowInfo,
-	jsonParse,
-} from 'n8n-workflow';
-
 import { readFile as fsReadFile } from 'fs/promises';
+import { NodeOperationError, jsonParse } from 'n8n-workflow';
+import type { IWorkflowBase, IExecuteFunctions, IExecuteWorkflowInfo } from 'n8n-workflow';
 
 export async function getWorkflowInfo(this: IExecuteFunctions, source: string, itemIndex = 0) {
 	const workflowInfo: IExecuteWorkflowInfo = {};
@@ -34,8 +29,7 @@ export async function getWorkflowInfo(this: IExecuteFunctions, source: string, i
 		workflowInfo.code = jsonParse(workflowJson);
 	} else if (source === 'parameter') {
 		// Read workflow from parameter
-		const workflowJson = this.getNodeParameter('workflowJson', itemIndex) as string;
-		workflowInfo.code = jsonParse(workflowJson);
+		workflowInfo.code = this.getNodeParameter('workflowJson', itemIndex) as IWorkflowBase;
 	} else if (source === 'url') {
 		// Read workflow from url
 		const workflowUrl = this.getNodeParameter('workflowUrl', itemIndex) as string;
diff --git a/packages/nodes-base/nodes/Facebook/FacebookGraphApi.node.ts b/packages/nodes-base/nodes/Facebook/FacebookGraphApi.node.ts
index 09e232c365..b457a2c621 100644
--- a/packages/nodes-base/nodes/Facebook/FacebookGraphApi.node.ts
+++ b/packages/nodes-base/nodes/Facebook/FacebookGraphApi.node.ts
@@ -184,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: {
@@ -197,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: '',
@@ -210,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',
diff --git a/packages/nodes-base/nodes/Facebook/FacebookTrigger.node.json b/packages/nodes-base/nodes/Facebook/FacebookTrigger.node.json
index 96ada90eef..6b8cc9a40e 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 d76abf95f5..0a1cea0c4e 100644
--- a/packages/nodes-base/nodes/Facebook/FacebookTrigger.node.ts
+++ b/packages/nodes-base/nodes/Facebook/FacebookTrigger.node.ts
@@ -195,6 +195,7 @@ export class FacebookTrigger implements INodeType {
 					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' },
 					);
 				}
 
diff --git a/packages/nodes-base/nodes/Facebook/facebook.svg b/packages/nodes-base/nodes/Facebook/facebook.svg
index 14021e35e4..fe77ac6978 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/FacebookLeadAds/FacebookLeadAdsTrigger.node.json b/packages/nodes-base/nodes/FacebookLeadAds/FacebookLeadAdsTrigger.node.json
index ee37bf06d7..661b382b04 100644
--- a/packages/nodes-base/nodes/FacebookLeadAds/FacebookLeadAdsTrigger.node.json
+++ b/packages/nodes-base/nodes/FacebookLeadAds/FacebookLeadAdsTrigger.node.json
@@ -2,7 +2,7 @@
 	"node": "n8n-nodes-base.facebookLeadAdsTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": ["Marketing & Content"],
+	"categories": ["Marketing"],
 	"resources": {
 		"credentialDocumentation": [
 			{
diff --git a/packages/nodes-base/nodes/FacebookLeadAds/FacebookLeadAdsTrigger.node.ts b/packages/nodes-base/nodes/FacebookLeadAds/FacebookLeadAdsTrigger.node.ts
index 209f5351a7..e5eb80043c 100644
--- a/packages/nodes-base/nodes/FacebookLeadAds/FacebookLeadAdsTrigger.node.ts
+++ b/packages/nodes-base/nodes/FacebookLeadAds/FacebookLeadAdsTrigger.node.ts
@@ -169,6 +169,7 @@ export class FacebookLeadAdsTrigger implements INodeType {
 					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' },
 					);
 				}
 
diff --git a/packages/nodes-base/nodes/FacebookLeadAds/facebook.svg b/packages/nodes-base/nodes/FacebookLeadAds/facebook.svg
index 14021e35e4..fe77ac6978 100644
--- a/packages/nodes-base/nodes/FacebookLeadAds/facebook.svg
+++ b/packages/nodes-base/nodes/FacebookLeadAds/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/Figma/FigmaTrigger.node.ts b/packages/nodes-base/nodes/Figma/FigmaTrigger.node.ts
index 707fe46644..5e204aa59e 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,11 +8,8 @@ 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 = {
diff --git a/packages/nodes-base/nodes/Figma/figma.svg b/packages/nodes-base/nodes/Figma/figma.svg
index f1a2faa12d..25a5271373 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 04bf68c792..8f54a7c8bb 100644
--- a/packages/nodes-base/nodes/FileMaker/FileMaker.node.ts
+++ b/packages/nodes-base/nodes/FileMaker/FileMaker.node.ts
@@ -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 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,
diff --git a/packages/nodes-base/nodes/FileMaker/GenericFunctions.ts b/packages/nodes-base/nodes/FileMaker/GenericFunctions.ts
index bdb13b1099..52e0faac60 100644
--- a/packages/nodes-base/nodes/FileMaker/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/FileMaker/GenericFunctions.ts
@@ -5,7 +5,7 @@ import type {
 	INodePropertyOptions,
 	JsonObject,
 } from 'n8n-workflow';
-import { NodeApiError, NodeOperationError } from 'n8n-workflow';
+import { ApplicationError, NodeApiError, NodeOperationError } from 'n8n-workflow';
 
 import type { OptionsWithUri } from 'request';
 
@@ -81,7 +81,7 @@ export async function getToken(this: ILoadOptionsFunctions | IExecuteFunctions):
 		} else {
 			message = error.message;
 		}
-		throw new Error(message);
+		throw new ApplicationError(message, { level: 'warning' });
 	}
 }
 
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 0000000000..bb99ab9459
--- /dev/null
+++ b/packages/nodes-base/nodes/Files/ConvertToFile/ConvertToFile.node.json
@@ -0,0 +1,35 @@
+{
+	"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",
+		"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 0000000000..d17b431e15
--- /dev/null
+++ b/packages/nodes-base/nodes/Files/ConvertToFile/ConvertToFile.node.ts
@@ -0,0 +1,121 @@
+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 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,
+		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 iCal',
+						value: 'iCal',
+						action: 'Convert to iCal',
+						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 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,
+			...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 === '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 0000000000..7fcca69b4c
--- /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 0000000000..eb0beca2ce
--- /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 0000000000..770b55b72b
--- /dev/null
+++ b/packages/nodes-base/nodes/Files/ConvertToFile/actions/toBinary.operation.ts
@@ -0,0 +1,147 @@
+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',
+			},
+			{
+				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],
+					},
+				},
+			},
+			{
+				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[] = [];
+
+	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,
+				mimeType: options.mimeType as string,
+				dataIsBase64: options.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/actions/toJson.operation.ts b/packages/nodes-base/nodes/Files/ConvertToFile/actions/toJson.operation.ts
new file mode 100644
index 0000000000..eaccdfb5ff
--- /dev/null
+++ b/packages/nodes-base/nodes/Files/ConvertToFile/actions/toJson.operation.ts
@@ -0,0 +1,165 @@
+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: '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,
+				},
+			);
+
+			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,
+					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/convertToFile.svg b/packages/nodes-base/nodes/Files/ConvertToFile/convertToFile.svg
new file mode 100644
index 0000000000..60ca4a415a
--- /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/ExtractFromFile/ExtractFromFile.node.json b/packages/nodes-base/nodes/Files/ExtractFromFile/ExtractFromFile.node.json
new file mode 100644
index 0000000000..989173a6a5
--- /dev/null
+++ b/packages/nodes-base/nodes/Files/ExtractFromFile/ExtractFromFile.node.json
@@ -0,0 +1,39 @@
+{
+	"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",
+		"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 0000000000..3908fc842e
--- /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 JSON',
+						value: 'fromJson',
+						action: 'Extract from JSON',
+						description: 'Transform a JSON 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 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 XLS',
+						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 0000000000..523c2090cc
--- /dev/null
+++ b/packages/nodes-base/nodes/Files/ExtractFromFile/actions/moveTo.operation.ts
@@ -0,0 +1,192 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
+
+import { BINARY_ENCODING, NodeOperationError, deepCopy, jsonParse } from 'n8n-workflow';
+
+import { encodeDecodeOptions } from '@utils/descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
+
+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';
+
+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 0000000000..5947385145
--- /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 0000000000..6153037438
--- /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 0000000000..2c235b7a2d
--- /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 0000000000..57bdf62dd7
--- /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 0000000000..9c4b95d170
--- /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 0000000000..48e532c8a7
--- /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 { updateDisplayOptions } from '@utils/utilities';
+import { errorMapper } from '../helpers/utils';
+
+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 0000000000..310f753320
--- /dev/null
+++ b/packages/nodes-base/nodes/Files/ReadWriteFile/actions/write.operation.ts
@@ -0,0 +1,123 @@
+import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
+import { BINARY_ENCODING } from 'n8n-workflow';
+
+import type { Readable } from 'stream';
+
+import { updateDisplayOptions } from '@utils/utilities';
+import { errorMapper } from '../helpers/utils';
+
+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 0000000000..8ecbb66706
--- /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 0000000000..288224b956
--- /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 0000000000..38c8d0057e
--- /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 0000000000..46fb3bc2a0
--- /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 0000000000..24b60c421e
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 0000000000..9ff4604263
--- /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 0000000000..ea5c3a274c
--- /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 28a67f27cb..2706b44f44 100644
--- a/packages/nodes-base/nodes/Filter/Filter.node.json
+++ b/packages/nodes-base/nodes/Filter/Filter.node.json
@@ -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 d5a3e84d27..880542c488 100644
--- a/packages/nodes-base/nodes/Filter/Filter.node.ts
+++ b/packages/nodes-base/nodes/Filter/Filter.node.ts
@@ -1,372 +1,24 @@
-import type {
-	IExecuteFunctions,
-	INodeExecutionData,
-	INodeParameters,
-	INodeType,
-	INodeTypeDescription,
-	NodeParameterValue,
-} from 'n8n-workflow';
+import type { INodeTypeBaseDescription, IVersionedNodeType } from 'n8n-workflow';
+import { VersionedNodeType } from 'n8n-workflow';
 
-import { compareOperationFunctions, convertDateTime } from './GenericFunctions';
+import { FilterV1 } from './V1/FilterV1.node';
+import { FilterV2 } from './V2/FilterV2.node';
 
-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',
-			},
-		],
-	};
+export class Filter extends VersionedNodeType {
+	constructor() {
+		const baseDescription: INodeTypeBaseDescription = {
+			displayName: 'Filter',
+			name: 'filter',
+			icon: 'fa:filter',
+			group: ['transform'],
+			description: 'Remove items matching a condition',
+		};
 
-	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
-		const returnDataTrue: INodeExecutionData[] = [];
-		const returnDataFalse: INodeExecutionData[] = [];
+		const nodeVersions: IVersionedNodeType['nodeVersions'] = {
+			1: new FilterV1(baseDescription),
+			2: new FilterV2(baseDescription),
+		};
 
-		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];
+		super(nodeVersions, baseDescription);
 	}
 }
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 0000000000..62c4060eff
--- /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 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 (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/GenericFunctions.ts b/packages/nodes-base/nodes/Filter/V1/GenericFunctions.ts
similarity index 99%
rename from packages/nodes-base/nodes/Filter/GenericFunctions.ts
rename to packages/nodes-base/nodes/Filter/V1/GenericFunctions.ts
index d25c7b0ecc..06288535b1 100644
--- a/packages/nodes-base/nodes/Filter/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Filter/V1/GenericFunctions.ts
@@ -1,7 +1,7 @@
 import type { INode, NodeParameterValue } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
-import moment from 'moment';
+import moment from 'moment-timezone';
 
 const isDateObject = (value: NodeParameterValue) =>
 	Object.prototype.toString.call(value) === '[object Date]';
diff --git a/packages/nodes-base/nodes/Filter/V2/FilterV2.node.ts b/packages/nodes-base/nodes/Filter/V2/FilterV2.node.ts
new file mode 100644
index 0000000000..be9fb9f80b
--- /dev/null
+++ b/packages/nodes-base/nodes/Filter/V2/FilterV2.node.ts
@@ -0,0 +1,111 @@
+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'],
+			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 to change the operator, switch ON the option 'Less Strict Type Validation', or change the type with an expression",
+						);
+					}
+					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/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 0000000000..d7836473c9
--- /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/Form/FormTrigger.node.json b/packages/nodes-base/nodes/Form/FormTrigger.node.json
index d50582abd9..8fb0763a34 100644
--- a/packages/nodes-base/nodes/Form/FormTrigger.node.json
+++ b/packages/nodes-base/nodes/Form/FormTrigger.node.json
@@ -13,6 +13,6 @@
 		"generic": []
 	},
 	"subcategories": {
-		"Core Nodes": ["Helpers", "Other Trigger Nodes"]
+		"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
index 24e32a0667..d81758abfa 100644
--- a/packages/nodes-base/nodes/Form/FormTrigger.node.ts
+++ b/packages/nodes-base/nodes/Form/FormTrigger.node.ts
@@ -1,282 +1,24 @@
-import type {
-	IDataObject,
-	INodeType,
-	INodeTypeDescription,
-	IWebhookResponseData,
-	IWebhookFunctions,
-} from 'n8n-workflow';
-import { FORM_TRIGGER_PATH_IDENTIFIER, jsonParse } from 'n8n-workflow';
+import type { INodeTypeBaseDescription, IVersionedNodeType } from 'n8n-workflow';
+import { VersionedNodeType } from 'n8n-workflow';
+import { FormTriggerV1 } from './v1/FormTriggerV1.node';
+import { FormTriggerV2 } from './v2/FormTriggerV2.node';
 
-import type { FormField } from './interfaces';
-import { prepareFormData } from './utils';
-
-export class FormTrigger implements INodeType {
-	description: 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',
-		},
-		inputs: [],
-		outputs: ['main'],
-		webhooks: [
-			{
-				name: 'setup',
-				httpMethod: 'GET',
-				responseMode: 'onReceived',
-				path: FORM_TRIGGER_PATH_IDENTIFIER,
-				ndvHideUrl: true,
-			},
-			{
-				name: 'default',
-				httpMethod: 'POST',
-				responseMode: '={{$parameter["responseMode"]}}',
-				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: {
-			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.',
-			},
-		},
-		properties: [
-			{
-				displayName: 'Form Title',
-				name: 'formTitle',
-				type: 'string',
-				default: '',
-				placeholder: 'e.g. Contact us',
-				required: true,
-				description: 'Shown at the top of the form',
-			},
-			{
-				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.',
-			},
-			{
-				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: 'Text',
-										value: 'text',
-									},
-									{
-										name: 'Number',
-										value: 'number',
-									},
-									{
-										name: 'Date',
-										value: 'date',
-									},
-									{
-										name: 'Dropdown List',
-										value: 'dropdown',
-									},
-								],
-								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',
-							},
-						],
-					},
-				],
-			},
-			{
-				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',
-					},
-				],
-				default: 'onReceived',
-				description: 'When to respond to the form submission',
-			},
-			{
-				displayName: 'Options',
-				name: 'options',
-				type: 'collection',
-				placeholder: 'Add Option',
-				default: {},
-				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',
-					},
-				],
-			},
-		],
-	};
-
-	async webhook(this: IWebhookFunctions): Promise<IWebhookResponseData> {
-		const webhookName = this.getWebhookName();
-		const mode = this.getMode() === 'manual' ? 'test' : 'production';
-		const formFields = this.getNodeParameter('formFields.values', []) as FormField[];
-
-		//Show the form on GET request
-		if (webhookName === 'setup') {
-			const formTitle = this.getNodeParameter('formTitle', '') as string;
-			const formDescription = this.getNodeParameter('formDescription', '') as string;
-			const instanceId = this.getInstanceId();
-			const { formSubmittedText } = this.getNodeParameter('options', {}) as IDataObject;
-
-			const data = prepareFormData(
-				formTitle,
-				formDescription,
-				formSubmittedText as string,
-				formFields,
-				mode === 'test',
-				instanceId,
-			);
-
-			const res = this.getResponseObject();
-			res.render('form-trigger', data);
-			return {
-				noWebhookResponse: true,
-			};
-		}
-
-		const bodyData = (this.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: [this.helpers.returnJsonArray(returnData)],
+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 0000000000..4408f43a8d
--- /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
index 36545f067c..62c934be26 100644
--- a/packages/nodes-base/nodes/Form/form.svg
+++ b/packages/nodes-base/nodes/Form/form.svg
@@ -1,5 +1 @@
-<svg width="46" height="40" viewBox="0 0 46 40" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M34.9784 37.7321C34.9784 38.1465 34.8139 38.5439 34.5207 38.8369C34.2278 39.1301 33.8303 39.2946 33.4159 39.2946H6.25967C5.84529 39.2946 5.44784 39.13 5.15484 38.8369C4.86171 38.544 4.69717 38.1465 4.69717 37.7321V9.60712C4.69668 9.20212 4.85359 8.81282 5.13467 8.52122L11.4393 1.98994V7.33372H8.21267C7.79405 7.33372 7.40717 7.55702 7.19788 7.91962C6.98841 8.28222 6.98841 8.72882 7.19788 9.09152C7.40719 9.45412 7.79409 9.67742 8.21267 9.67742H12.6422C12.9531 9.67742 13.2511 9.55382 13.4709 9.33412C13.6906 9.11442 13.8141 8.81642 13.8141 8.50552V0.232178H33.4158C33.8302 0.232178 34.2276 0.396729 34.5206 0.68985C34.8138 0.982807 34.9783 1.38027 34.9783 1.79468L34.9783 12.1222L32.1177 14.9829L23.8657 23.2583C23.5924 23.5323 23.3622 23.7641 23.1373 23.9905C22.8466 24.2831 22.5649 24.5666 22.2112 24.9205L21.8753 25.2565C21.5818 25.55 21.387 25.9276 21.3177 26.3368L20.3004 31.9218C20.1924 32.5604 20.0852 33.0006 20.5114 33.3398C20.9137 33.6602 21.4119 33.5143 22.0504 33.4062L27.4592 32.4783C27.8679 32.4091 28.2451 32.2147 28.5384 31.9218L34.9784 25.4933L34.9784 37.7321ZM10.9472 16.4667C10.9493 16.7769 11.0733 17.0738 11.2927 17.293C11.5119 17.5124 11.8088 17.6364 12.119 17.6385H25.2819C25.7005 17.6385 26.0874 17.4152 26.2967 17.0526C26.5061 16.69 26.5061 16.2434 26.2967 15.8808C26.0873 15.5181 25.7004 15.2948 25.2819 15.2948H12.119C11.8082 15.2948 11.5102 15.4184 11.2904 15.6381C11.0707 15.8578 10.9472 16.1559 10.9472 16.4667ZM18.2421 31.2325C18.2421 30.9216 18.1186 30.6236 17.8988 30.4039C17.6791 30.1842 17.3811 30.0606 17.0702 30.0606H12.119C11.7004 30.0606 11.3135 30.2839 11.1042 30.6465C10.8948 31.0092 10.8948 31.4558 11.1042 31.8184C11.3135 32.181 11.7004 32.4043 12.119 32.4043H17.0702C17.3811 32.4043 17.6791 32.2808 17.8988 32.0611C18.1185 31.8413 18.2421 31.5434 18.2421 31.2325ZM19.1015 23.8417C19.1015 23.5308 18.9779 23.2328 18.7582 23.013C18.5385 22.7933 18.2404 22.6698 17.9296 22.6698H12.1188C11.7002 22.6698 11.3133 22.8931 11.104 23.2557C10.8946 23.6183 10.8946 24.065 11.104 24.4276C11.3133 24.7902 11.7002 25.0135 12.1188 25.0135H17.9296C18.2409 25.0156 18.5402 24.8927 18.7604 24.6725C18.9807 24.4523 19.1036 24.1531 19.1015 23.8417Z" fill="#00B7BC"/>
-<path d="M33.5319 16.3971L37.821 12.108L41.5789 15.8189L43.196 14.2017L45.4539 16.4595C45.6718 16.6772 45.7948 16.9719 45.7971 17.2799C45.7951 17.5903 45.6718 17.8875 45.4534 18.1081L38.6488 24.9047C38.4318 25.1284 38.1322 25.2527 37.8206 25.2485C37.5094 25.2509 37.2106 25.1267 36.9925 24.9047C36.7749 24.684 36.653 24.3865 36.653 24.0766C36.653 23.7667 36.7749 23.4692 36.9925 23.2485L42.9692 17.2797L41.6567 15.9672L40.2739 17.3813L27.1255 30.5063L22.5084 31.2876L23.2897 26.6705L23.6256 26.3345L26.1881 28.8892C26.3784 29.0902 26.6362 29.211 26.9096 29.2306C26.9449 29.2331 26.9805 29.2339 27.0162 29.233C27.3279 29.238 27.6279 29.1137 27.8444 28.8892C28.062 28.6685 28.1839 28.371 28.1839 28.0611C28.1839 27.7512 28.062 27.4537 27.8444 27.233L25.2819 24.6705L33.5319 16.3971Z" fill="#00B7BC"/>
-<path d="M44.7359 12.2409C44.7359 12.6536 44.5725 13.0496 44.2815 13.3424L43.3596 14.2564L39.508 10.4283L40.4377 9.49863C40.7305 9.20763 41.1265 9.04422 41.5393 9.04422C41.9521 9.04422 42.3481 9.20763 42.6409 9.49863L44.2815 11.1393C44.5725 11.4321 44.7359 11.8281 44.7359 12.2409Z" fill="#00B7BC"/>
-</svg>
+<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
index fd7a1f5ae5..2d20c8f1c6 100644
--- a/packages/nodes-base/nodes/Form/interfaces.ts
+++ b/packages/nodes-base/nodes/Form/interfaces.ts
@@ -9,6 +9,7 @@ export type FormField = {
 export type FormTriggerInput = {
 	isSelect?: boolean;
 	isMultiSelect?: boolean;
+	isTextarea?: boolean;
 	isInput?: boolean;
 	labbel: string;
 	id: string;
@@ -25,6 +26,8 @@ export type FormTriggerData = {
 	formTitle: string;
 	formDescription?: string;
 	formSubmittedText?: string;
+	redirectUrl?: string;
 	n8nWebsiteLink: string;
 	formFields: FormTriggerInput[];
+	useResponseData?: boolean;
 };
diff --git a/packages/nodes-base/nodes/Form/utils.ts b/packages/nodes-base/nodes/Form/utils.ts
index 78535eee8a..92531ed912 100644
--- a/packages/nodes-base/nodes/Form/utils.ts
+++ b/packages/nodes-base/nodes/Form/utils.ts
@@ -1,13 +1,15 @@
-import type { IDataObject } from 'n8n-workflow';
+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,
 ) => {
 	const validForm = formFields.length > 0;
 	const utm_campaign = instanceId ? `&utm_campaign=${instanceId}` : '';
@@ -25,8 +27,16 @@ export const prepareFormData = (
 		formSubmittedText,
 		n8nWebsiteLink,
 		formFields: [],
+		useResponseData,
 	};
 
+	if (redirectUrl) {
+		if (!redirectUrl.includes('://')) {
+			redirectUrl = `http://${redirectUrl}`;
+		}
+		formData.redirectUrl = redirectUrl;
+	}
+
 	if (!validForm) {
 		return formData;
 	}
@@ -52,6 +62,8 @@ export const prepareFormData = (
 			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';
@@ -62,3 +74,83 @@ export const prepareFormData = (
 
 	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;
+
+		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;
+		}
+
+		const useResponseData = responseMode === 'responseNode';
+
+		const data = prepareFormData(
+			formTitle,
+			formDescription,
+			formSubmittedText,
+			redirectUrl,
+			formFields,
+			mode === 'test',
+			instanceId,
+			useResponseData,
+		);
+
+		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 0000000000..c9096ddcb6
--- /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 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 0000000000..864c24d508
--- /dev/null
+++ b/packages/nodes-base/nodes/Form/v2/FormTriggerV2.node.ts
@@ -0,0 +1,102 @@
+/* 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: {},
+			displayOptions: {
+				hide: {
+					responseMode: ['responseNode'],
+				},
+			},
+			options: [respondWithOptions],
+		},
+	],
+};
+
+export class FormTriggerV2 implements INodeType {
+	description: INodeTypeDescription;
+
+	constructor(baseDescription: INodeTypeBaseDescription) {
+		this.description = {
+			...baseDescription,
+			...descriptionV2,
+		};
+	}
+
+	async webhook(this: IWebhookFunctions) {
+		return formWebhook(this);
+	}
+}
diff --git a/packages/nodes-base/nodes/FormIo/GenericFunctions.ts b/packages/nodes-base/nodes/FormIo/GenericFunctions.ts
index be82c1c980..e4ff44f3e2 100644
--- a/packages/nodes-base/nodes/FormIo/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/FormIo/GenericFunctions.ts
@@ -5,7 +5,7 @@ import type {
 	IWebhookFunctions,
 	JsonObject,
 } from 'n8n-workflow';
-import { NodeApiError } from 'n8n-workflow';
+import { ApplicationError, NodeApiError } from 'n8n-workflow';
 
 interface IFormIoCredentials {
 	environment: 'cloudHosted' | ' selfHosted';
@@ -42,8 +42,9 @@ async function getToken(
 		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' },
 		);
 	}
 }
diff --git a/packages/nodes-base/nodes/FormIo/formio.svg b/packages/nodes-base/nodes/FormIo/formio.svg
index 0887bca61d..99e152bf81 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 de19384130..d4dbadf30c 100644
--- a/packages/nodes-base/nodes/Formstack/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Formstack/GenericFunctions.ts
@@ -7,7 +7,7 @@ import type {
 	INodePropertyOptions,
 	JsonObject,
 } from 'n8n-workflow';
-import { NodeApiError } from 'n8n-workflow';
+import { ApplicationError, NodeApiError } from 'n8n-workflow';
 
 import type { OptionsWithUri } from 'request';
 
@@ -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 7d6860f60a..a0acf183ed 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/Freshservice/Freshservice.node.ts b/packages/nodes-base/nodes/Freshservice/Freshservice.node.ts
index 03036ff288..19555200c6 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',
diff --git a/packages/nodes-base/nodes/Freshservice/GenericFunctions.ts b/packages/nodes-base/nodes/Freshservice/GenericFunctions.ts
index d9bc1b9c95..da222cccaa 100644
--- a/packages/nodes-base/nodes/Freshservice/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Freshservice/GenericFunctions.ts
@@ -7,6 +7,9 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
+import type { OptionsWithUri } from 'request';
+
+import { omit } from 'lodash';
 import type {
 	AddressFixedCollection,
 	FreshserviceCredentials,
@@ -14,10 +17,6 @@ import type {
 	RolesParameter,
 } from './types';
 
-import type { OptionsWithUri } from 'request';
-
-import { omit } from 'lodash';
-
 export async function freshserviceApiRequest(
 	this: IExecuteFunctions | IHookFunctions | ILoadOptionsFunctions,
 	method: string,
diff --git a/packages/nodes-base/nodes/Freshservice/freshservice.svg b/packages/nodes-base/nodes/Freshservice/freshservice.svg
index f806e022d7..b27ef00228 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/FreshworksCrm/FreshworksCrm.node.json b/packages/nodes-base/nodes/FreshworksCrm/FreshworksCrm.node.json
index 9b5157ab6e..fa66068095 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 bbba70978c..376e7eb63b 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',
diff --git a/packages/nodes-base/nodes/FreshworksCrm/GenericFunctions.ts b/packages/nodes-base/nodes/FreshworksCrm/GenericFunctions.ts
index 88d47d7ce7..7438c72dd4 100644
--- a/packages/nodes-base/nodes/FreshworksCrm/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/FreshworksCrm/GenericFunctions.ts
@@ -8,6 +8,7 @@ import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
 import type { OptionsWithUri } from 'request';
 
+import omit from 'lodash/omit';
 import type {
 	FreshworksConfigResponse,
 	FreshworksCrmApiCredentials,
@@ -15,8 +16,6 @@ import type {
 	ViewsResponse,
 } from './types';
 
-import omit from 'lodash/omit';
-
 export async function freshworksCrmApiRequest(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
 	method: string,
diff --git a/packages/nodes-base/nodes/FreshworksCrm/freshworksCrm.svg b/packages/nodes-base/nodes/FreshworksCrm/freshworksCrm.svg
index 06e0cf9acf..15f5fdf8cc 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/Ftp/Ftp.node.json b/packages/nodes-base/nodes/Ftp/Ftp.node.json
index 33da5703c2..076aa4f81e 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 1404208f4e..70f3ed726a 100644
--- a/packages/nodes-base/nodes/Ftp/Ftp.node.ts
+++ b/packages/nodes-base/nodes/Ftp/Ftp.node.ts
@@ -1,3 +1,9 @@
+import { createWriteStream } from 'fs';
+import { basename, dirname } from 'path';
+import type { Readable } from 'stream';
+import { pipeline } from 'stream';
+import { promisify } from 'util';
+import { BINARY_ENCODING, NodeApiError } from 'n8n-workflow';
 import type {
 	ICredentialDataDecryptedObject,
 	ICredentialsDecrypted,
@@ -10,17 +16,11 @@ import type {
 	INodeTypeDescription,
 	JsonObject,
 } from 'n8n-workflow';
-import { BINARY_ENCODING, NodeApiError } from 'n8n-workflow';
-import { formatPrivateKey } from '@utils/utilities';
-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 } from '@utils/utilities';
 
 interface ReturnFtpItem {
 	type: string;
@@ -120,7 +120,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',
@@ -223,6 +223,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,
 			},
 
@@ -273,12 +274,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'],
@@ -287,7 +288,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,
 			},
 
@@ -304,6 +305,7 @@ export class Ftp implements INodeType {
 				name: 'oldPath',
 				type: 'string',
 				default: '',
+				placeholder: 'e.g. /public/documents/old-file.txt',
 				required: true,
 			},
 			{
@@ -316,6 +318,7 @@ export class Ftp implements INodeType {
 				name: 'newPath',
 				type: 'string',
 				default: '',
+				placeholder: 'e.g. /public/documents/new-file.txt',
 				required: true,
 			},
 			{
@@ -355,10 +358,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'],
@@ -371,7 +375,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'],
@@ -381,7 +385,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,
 			},
 			{
@@ -411,6 +415,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,
 			},
@@ -469,6 +474,7 @@ export class Ftp implements INodeType {
 							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,
 						});
@@ -520,6 +526,7 @@ export class Ftp implements INodeType {
 						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,
 					});
diff --git a/packages/nodes-base/nodes/Function/Function.node.ts b/packages/nodes-base/nodes/Function/Function.node.ts
index 0475157702..75b003a733 100644
--- a/packages/nodes-base/nodes/Function/Function.node.ts
+++ b/packages/nodes-base/nodes/Function/Function.node.ts
@@ -40,7 +40,7 @@ export class Function implements INodeType {
 				typeOptions: {
 					alwaysOpenEditWindow: true,
 					codeAutocomplete: 'function',
-					editor: 'code',
+					editor: 'jsEditor',
 					rows: 10,
 				},
 				type: 'string',
diff --git a/packages/nodes-base/nodes/FunctionItem/FunctionItem.node.ts b/packages/nodes-base/nodes/FunctionItem/FunctionItem.node.ts
index 85d4c76dd2..348f52aaef 100644
--- a/packages/nodes-base/nodes/FunctionItem/FunctionItem.node.ts
+++ b/packages/nodes-base/nodes/FunctionItem/FunctionItem.node.ts
@@ -40,7 +40,7 @@ export class FunctionItem implements INodeType {
 				typeOptions: {
 					alwaysOpenEditWindow: true,
 					codeAutocomplete: 'functionItem',
-					editor: 'code',
+					editor: 'jsEditor',
 					rows: 10,
 				},
 				type: 'string',
diff --git a/packages/nodes-base/nodes/GetResponse/GetResponse.node.json b/packages/nodes-base/nodes/GetResponse/GetResponse.node.json
index e4853d405b..a3f18af402 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 5a7c1dfc83..640038c874 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',
diff --git a/packages/nodes-base/nodes/GetResponse/GetResponseTrigger.node.json b/packages/nodes-base/nodes/GetResponse/GetResponseTrigger.node.json
index 7b9dfc6a75..0c3ff3a356 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/Ghost.node.json b/packages/nodes-base/nodes/Ghost/Ghost.node.json
index 919b10268a..539214cccd 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 de6a521aaf..51f1d0c5a4 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',
diff --git a/packages/nodes-base/nodes/Ghost/ghost.svg b/packages/nodes-base/nodes/Ghost/ghost.svg
index d10051e900..eac8f93da5 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 5e684a0643..77400698d0 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',
diff --git a/packages/nodes-base/nodes/Git/git.svg b/packages/nodes-base/nodes/Git/git.svg
index 637e92cea7..506c3ce5a1 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 348647b12d..12672ab212 100644
--- a/packages/nodes-base/nodes/Github/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Github/GenericFunctions.ts
@@ -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.');
diff --git a/packages/nodes-base/nodes/Github/Github.node.ts b/packages/nodes-base/nodes/Github/Github.node.ts
index 8de0b9ed49..6b3f2e4a7f 100644
--- a/packages/nodes-base/nodes/Github/Github.node.ts
+++ b/packages/nodes-base/nodes/Github/Github.node.ts
@@ -7,9 +7,9 @@ import type {
 } 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 {
@@ -550,7 +550,7 @@ export class Github implements INodeType {
 			//         file:create/edit
 			// ----------------------------------
 			{
-				displayName: 'Binary Data',
+				displayName: 'Binary File',
 				name: 'binaryData',
 				type: 'boolean',
 				default: false,
@@ -580,7 +580,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 +593,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 +699,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 +712,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',
 			},
 
 			{
@@ -2204,6 +2203,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 +2218,8 @@ export class Github implements INodeType {
 							path as string,
 						);
 
-						items[i] = newItem;
-
-						return [items];
+						returnData.push(newItem);
+						continue;
 					}
 				}
 
diff --git a/packages/nodes-base/nodes/Github/GithubTrigger.node.ts b/packages/nodes-base/nodes/Github/GithubTrigger.node.ts
index 1e009e3948..87de8c2ecc 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 c83db1cbb9..cefbcec946 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/Gitlab.node.ts b/packages/nodes-base/nodes/Gitlab/Gitlab.node.ts
index 67203495c2..ecfece1211 100644
--- a/packages/nodes-base/nodes/Gitlab/Gitlab.node.ts
+++ b/packages/nodes-base/nodes/Gitlab/Gitlab.node.ts
@@ -745,8 +745,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 +758,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 +935,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 +1138,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 +1151,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 +1183,7 @@ export class Gitlab implements INodeType {
 			//         file:create/edit
 			// ----------------------------------
 			{
-				displayName: 'Binary Data',
+				displayName: 'Binary File',
 				name: 'binaryData',
 				type: 'boolean',
 				default: false,
@@ -1207,7 +1213,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 +1226,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',
@@ -1563,6 +1569,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') {
diff --git a/packages/nodes-base/nodes/Gitlab/gitlab.svg b/packages/nodes-base/nodes/Gitlab/gitlab.svg
index 3c9b970288..e264c71078 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 1a56ff146d..6ccdcb16bb 100644
--- a/packages/nodes-base/nodes/GoToWebinar/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/GoToWebinar/GenericFunctions.ts
@@ -10,7 +10,7 @@ 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';
 
diff --git a/packages/nodes-base/nodes/GoToWebinar/GoToWebinar.node.ts b/packages/nodes-base/nodes/GoToWebinar/GoToWebinar.node.ts
index db1396794a..1628b34b2c 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',
diff --git a/packages/nodes-base/nodes/GoToWebinar/gotowebinar.svg b/packages/nodes-base/nodes/GoToWebinar/gotowebinar.svg
index 1dc4713b80..59cd8b0d04 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,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"/></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,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" 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 c2c2894f28..4506b33d3c 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: '={{"/v13/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: '={{"/v13/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 89bf766da9..7864eb762d 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: '/v13/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 a295244f04..42fa5ca41d 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 19b89e413e..4b193cca0b 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/GoogleAnalyticsV1.node.ts b/packages/nodes-base/nodes/Google/Analytics/v1/GoogleAnalyticsV1.node.ts
index 7ac4c9517b..2d264622ac 100644
--- a/packages/nodes-base/nodes/Google/Analytics/v1/GoogleAnalyticsV1.node.ts
+++ b/packages/nodes-base/nodes/Google/Analytics/v1/GoogleAnalyticsV1.node.ts
@@ -10,10 +10,10 @@ import type {
 	INodeTypeDescription,
 } 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';
diff --git a/packages/nodes-base/nodes/Google/BigQuery/googleBigQuery.svg b/packages/nodes-base/nodes/Google/BigQuery/googleBigQuery.svg
index 35cf00485e..274de708ad 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 7f36571bd4..26cfd317e2 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,13 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
 
+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';
 
-import * as transport from '../../../v2/transport';
-
-import nock from 'nock';
-
 jest.mock('../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../v2/transport');
 	return {
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 13c2d4ae77..838b665eed 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,11 +1,10 @@
 import type { INodeTypes } from 'n8n-workflow';
 
+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';
-import nock from 'nock';
-
-import * as transport from '../../../v2/transport';
 
 jest.mock('../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../v2/transport');
diff --git a/packages/nodes-base/nodes/Google/BigQuery/test/v2/node/insert.manualMode.test.ts b/packages/nodes-base/nodes/Google/BigQuery/test/v2/node/insert.manualMode.test.ts
index 8478555f3d..d0c3863e72 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,11 +1,10 @@
 import type { INodeTypes } from 'n8n-workflow';
 
+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';
-import nock from 'nock';
-
-import * as transport from '../../../v2/transport';
 
 jest.mock('../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../v2/transport');
diff --git a/packages/nodes-base/nodes/Google/BigQuery/test/v2/utils/utils.test.ts b/packages/nodes-base/nodes/Google/BigQuery/test/v2/utils/utils.test.ts
index 80b27a351d..89a246fb72 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,7 +1,7 @@
 import type { IDataObject, IExecuteFunctions } from 'n8n-workflow';
 import { constructExecutionMetaData } from 'n8n-core';
-import { prepareOutput } from '../../../v2/helpers/utils';
 import { mock } from 'jest-mock-extended';
+import { prepareOutput } from '../../../v2/helpers/utils';
 
 describe('Google BigQuery v2 Utils', () => {
 	it('should prepareOutput', () => {
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 e250fc3b69..d15f05a630 100644
--- a/packages/nodes-base/nodes/Google/BigQuery/v1/GoogleBigQueryV1.node.ts
+++ b/packages/nodes-base/nodes/Google/BigQuery/v1/GoogleBigQueryV1.node.ts
@@ -13,14 +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';
-import { generatePairedItemData } from '../../../../utils/utilities';
 
 const versionDescription: INodeTypeDescription = {
 	displayName: 'Google BigQuery',
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 40bdd7ad79..25da3dc09e 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
@@ -5,12 +5,12 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 
-import { NodeOperationError, sleep } from 'n8n-workflow';
-import { getResolvables, updateDisplayOptions } from '@utils/utilities';
+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[] = [
 	{
@@ -20,7 +20,6 @@ const properties: INodeProperties[] = [
 		noDataExpression: true,
 		typeOptions: {
 			editor: 'sqlEditor',
-			rows: 5,
 		},
 		displayOptions: {
 			hide: {
@@ -39,7 +38,6 @@ const properties: INodeProperties[] = [
 		noDataExpression: true,
 		typeOptions: {
 			editor: 'sqlEditor',
-			rows: 5,
 		},
 		displayOptions: {
 			show: {
@@ -285,10 +283,11 @@ export async function execute(this: IExecuteFunctions): Promise<INodeExecutionDa
 				}
 				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) {
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 19c51467e0..8a9abeaa61 100644
--- a/packages/nodes-base/nodes/Google/BigQuery/v2/actions/database/insert.operation.ts
+++ b/packages/nodes-base/nodes/Google/BigQuery/v2/actions/database/insert.operation.ts
@@ -6,10 +6,10 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 import { v4 as uuid } from 'uuid';
-import { generatePairedItemData, updateDisplayOptions } from '@utils/utilities';
 import type { TableSchema } from '../../helpers/interfaces';
 import { checkSchema, wrapData } from '../../helpers/utils';
 import { googleApiRequest } from '../../transport';
+import { generatePairedItemData, updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
@@ -33,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: '',
diff --git a/packages/nodes-base/nodes/Google/Books/googlebooks.svg b/packages/nodes-base/nodes/Google/Books/googlebooks.svg
index f0715d1bf6..128cc7a184 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/GoogleCalendar.node.ts b/packages/nodes-base/nodes/Google/Calendar/GoogleCalendar.node.ts
index f37917df53..5a61f61a0a 100644
--- a/packages/nodes-base/nodes/Google/Calendar/GoogleCalendar.node.ts
+++ b/packages/nodes-base/nodes/Google/Calendar/GoogleCalendar.node.ts
@@ -10,6 +10,8 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
+import moment from 'moment-timezone';
+import { v4 as uuid } from 'uuid';
 import {
 	encodeURIComponentOnce,
 	getCalendars,
@@ -24,10 +26,6 @@ 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',
diff --git a/packages/nodes-base/nodes/Google/Calendar/GoogleCalendarTrigger.node.ts b/packages/nodes-base/nodes/Google/Calendar/GoogleCalendarTrigger.node.ts
index 48c091b235..a79726cef5 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 moment from 'moment';
+import moment from 'moment-timezone';
 
-import { getCalendars, googleApiRequest, googleApiRequestAllItems } from './GenericFunctions';
+import {
+	encodeURIComponentOnce,
+	getCalendars,
+	googleApiRequest,
+	googleApiRequestAllItems,
+} from './GenericFunctions';
 
 export class GoogleCalendarTrigger implements INodeType {
 	description: INodeTypeDescription = {
@@ -132,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;
 
diff --git a/packages/nodes-base/nodes/Google/Calendar/googleCalendar.svg b/packages/nodes-base/nodes/Google/Calendar/googleCalendar.svg
index 8e8fa53a09..fe1e1676b2 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/Chat/GoogleChat.node.ts b/packages/nodes-base/nodes/Google/Chat/GoogleChat.node.ts
index ae5e42930f..2547e7fd56 100644
--- a/packages/nodes-base/nodes/Google/Chat/GoogleChat.node.ts
+++ b/packages/nodes-base/nodes/Google/Chat/GoogleChat.node.ts
@@ -12,9 +12,10 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
-import type { IMessage, IMessageUi } from './MessageInterface';
-
 import type { OptionsWithUri } from 'request';
+import moment from 'moment-timezone';
+import jwt from 'jsonwebtoken';
+import type { IMessage, IMessageUi } from './MessageInterface';
 
 import {
 	// attachmentFields,
@@ -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',
diff --git a/packages/nodes-base/nodes/Google/Chat/descriptions/MediaDescription.ts b/packages/nodes-base/nodes/Google/Chat/descriptions/MediaDescription.ts
index 37131819ae..18fc055056 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 9799f878d6..1646e75d0a 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/CloudStorage/ObjectDescription.ts b/packages/nodes-base/nodes/Google/CloudStorage/ObjectDescription.ts
index 9bcb313db0..a4378515b9 100644
--- a/packages/nodes-base/nodes/Google/CloudStorage/ObjectDescription.ts
+++ b/packages/nodes-base/nodes/Google/CloudStorage/ObjectDescription.ts
@@ -1,5 +1,5 @@
-import FormData from 'form-data';
 import type { Readable } from 'stream';
+import FormData from 'form-data';
 import {
 	BINARY_ENCODING,
 	type IDataObject,
@@ -179,9 +179,8 @@ export const objectOperations: INodeProperties[] = [
 								// 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;
@@ -497,7 +496,7 @@ export const objectFields: INodeProperties[] = [
 		},
 	},
 	{
-		displayName: 'Use Binary Property',
+		displayName: 'Use Input Binary Field',
 		name: 'createFromBinary',
 		type: 'boolean',
 		displayOptions: {
@@ -511,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'],
@@ -538,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 59db35d960..8ffb8af355 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/GoogleContacts.node.ts b/packages/nodes-base/nodes/Google/Contacts/GoogleContacts.node.ts
index 3b7b3ed103..098f991042 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',
diff --git a/packages/nodes-base/nodes/Google/Docs/googleDocs.svg b/packages/nodes-base/nodes/Google/Docs/googleDocs.svg
index c35f74f7cc..ec052c8e13 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/Drive/GoogleDriveTrigger.node.ts b/packages/nodes-base/nodes/Google/Drive/GoogleDriveTrigger.node.ts
index 17835dbc0c..50efeade16 100644
--- a/packages/nodes-base/nodes/Google/Drive/GoogleDriveTrigger.node.ts
+++ b/packages/nodes-base/nodes/Google/Drive/GoogleDriveTrigger.node.ts
@@ -9,10 +9,9 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import { extractId, googleApiRequest, googleApiRequestAllItems } from './v1/GenericFunctions';
-
-import moment from 'moment';
+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 {
diff --git a/packages/nodes-base/nodes/Google/Drive/googleDrive.svg b/packages/nodes-base/nodes/Google/Drive/googleDrive.svg
index f312de582e..643c5d9941 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/file/download.test.ts b/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/download.test.ts
index 33445637eb..16869c6de0 100644
--- a/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/download.test.ts
+++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/download.test.ts
@@ -26,7 +26,7 @@ describe('test GoogleDriveV2: file download', () => {
 		jest.unmock('../../../../v2/transport');
 	});
 
-	it('shuold be called with', async () => {
+	it('should be called with', async () => {
 		const nodeParameters = {
 			operation: 'deleteFile',
 			fileId: {
@@ -58,7 +58,7 @@ describe('test GoogleDriveV2: file download', () => {
 			{},
 			{ alt: 'media' },
 			undefined,
-			{ encoding: null, json: false, resolveWithFullResponse: true, useStream: true },
+			{ encoding: 'arraybuffer', json: false, returnFullResponse: true, useStream: true },
 		);
 	});
 });
diff --git a/packages/nodes-base/nodes/Google/Drive/v1/GoogleDriveV1.node.ts b/packages/nodes-base/nodes/Google/Drive/v1/GoogleDriveV1.node.ts
index 3f10690e98..9099b12c58 100644
--- a/packages/nodes-base/nodes/Google/Drive/v1/GoogleDriveV1.node.ts
+++ b/packages/nodes-base/nodes/Google/Drive/v1/GoogleDriveV1.node.ts
@@ -1,4 +1,5 @@
 /* eslint-disable n8n-nodes-base/node-filename-against-convention */
+import type { Readable } from 'stream';
 import type {
 	IBinaryKeyData,
 	IDataObject,
@@ -10,14 +11,13 @@ import type {
 } 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 { v4 as uuid } from 'uuid';
-import type { Readable } from 'stream';
 import { driveSearch, fileSearch, folderSearch } from './SearchFunctions';
 
 import { oldVersionNotice } from '@utils/descriptions';
-import { GOOGLE_DRIVE_FILE_URL_REGEX, GOOGLE_DRIVE_FOLDER_URL_REGEX } from '../../constants';
 
 const UPLOAD_CHUNK_SIZE = 256 * 1024;
 
@@ -355,7 +355,7 @@ const versionDescription: INodeTypeDescription = {
 		//         file:download
 		// ----------------------------------
 		{
-			displayName: 'Binary Property',
+			displayName: 'Put Output File in Field',
 			name: 'binaryPropertyName',
 			type: 'string',
 			required: true,
@@ -366,7 +366,7 @@ const versionDescription: INodeTypeDescription = {
 					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',
 		},
 		{
 			displayName: 'Options',
@@ -833,7 +833,7 @@ const versionDescription: INodeTypeDescription = {
 		},
 
 		{
-			displayName: 'Binary Data',
+			displayName: 'Binary File',
 			name: 'binaryData',
 			type: 'boolean',
 			default: false,
@@ -861,7 +861,7 @@ const versionDescription: INodeTypeDescription = {
 			description: 'The text content of the file to upload',
 		},
 		{
-			displayName: 'Binary Property',
+			displayName: 'Input Binary Field',
 			name: 'binaryPropertyName',
 			type: 'string',
 			default: 'data',
@@ -874,8 +874,7 @@ const versionDescription: INodeTypeDescription = {
 				},
 			},
 			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',
 		},
 
 		// ----------------------------------
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/create.operation.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/create.operation.ts
index deb4a321fb..18aa62a68b 100644
--- a/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/create.operation.ts
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/create.operation.ts
@@ -5,10 +5,9 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 
-import { updateDisplayOptions } from '@utils/utilities';
-import { googleApiRequest } from '../../transport';
-
 import { v4 as uuid } from 'uuid';
+import { googleApiRequest } from '../../transport';
+import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/deleteDrive.operation.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/deleteDrive.operation.ts
index e1ea452356..1c63a0f1fe 100644
--- a/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/deleteDrive.operation.ts
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/deleteDrive.operation.ts
@@ -1,8 +1,8 @@
 import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
 
-import { updateDisplayOptions } from '@utils/utilities';
 import { googleApiRequest } from '../../transport';
 import { sharedDriveRLC } from '../common.descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/get.operation.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/get.operation.ts
index a7813ef3f4..890043d43f 100644
--- a/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/get.operation.ts
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/get.operation.ts
@@ -5,9 +5,9 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 
-import { updateDisplayOptions } from '@utils/utilities';
 import { googleApiRequest } from '../../transport';
 import { sharedDriveRLC } from '../common.descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/list.operation.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/list.operation.ts
index 61ff570fb8..7f9d03162e 100644
--- a/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/list.operation.ts
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/list.operation.ts
@@ -5,9 +5,8 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 
-import { updateDisplayOptions } from '@utils/utilities';
-
 import { googleApiRequest, googleApiRequestAllItems } from '../../transport';
+import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/update.operation.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/update.operation.ts
index 99b5d5468a..07b598b512 100644
--- a/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/update.operation.ts
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/update.operation.ts
@@ -5,9 +5,9 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 
-import { updateDisplayOptions } from '@utils/utilities';
 import { googleApiRequest } from '../../transport';
 import { sharedDriveRLC } from '../common.descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/file/copy.operation.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/file/copy.operation.ts
index 04444abb4c..368ff55e22 100644
--- a/packages/nodes-base/nodes/Google/Drive/v2/actions/file/copy.operation.ts
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/file/copy.operation.ts
@@ -6,10 +6,10 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 
-import { updateDisplayOptions } from '@utils/utilities';
 import { googleApiRequest } from '../../transport';
 import { driveRLC, fileRLC, folderRLC } from '../common.descriptions';
 import { setParentFolder } from '../../helpers/utils';
+import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/file/createFromText.operation.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/file/createFromText.operation.ts
index 36b5c9c89f..e79a019f45 100644
--- a/packages/nodes-base/nodes/Google/Drive/v2/actions/file/createFromText.operation.ts
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/file/createFromText.operation.ts
@@ -5,11 +5,11 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 
-import { updateDisplayOptions } from '@utils/utilities';
 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[] = [
 	{
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/file/deleteFile.operation.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/file/deleteFile.operation.ts
index 5116f05d7c..241c210a81 100644
--- a/packages/nodes-base/nodes/Google/Drive/v2/actions/file/deleteFile.operation.ts
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/file/deleteFile.operation.ts
@@ -1,8 +1,8 @@
 import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
 
-import { updateDisplayOptions } from '@utils/utilities';
 import { googleApiRequest } from '../../transport';
 import { fileRLC } from '../common.descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/file/download.operation.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/file/download.operation.ts
index f61afc4d58..618c5293c3 100644
--- a/packages/nodes-base/nodes/Google/Drive/v2/actions/file/download.operation.ts
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/file/download.operation.ts
@@ -6,9 +6,9 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 
-import { updateDisplayOptions } from '@utils/utilities';
 import { googleApiRequest } from '../../transport';
 import { fileRLC } from '../common.descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
@@ -23,13 +23,13 @@ const properties: INodeProperties[] = [
 		default: {},
 		options: [
 			{
-				displayName: 'Binary Property',
+				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 field to put the binary file data in',
+				hint: 'The name of the output binary field to put the file in',
 			},
 			{
 				displayName: 'Google File Conversion',
@@ -192,8 +192,8 @@ export async function execute(
 
 	const requestOptions = {
 		useStream: true,
-		resolveWithFullResponse: true,
-		encoding: null,
+		returnFullResponse: true,
+		encoding: 'arraybuffer',
 		json: false,
 	};
 
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/file/move.operation.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/file/move.operation.ts
index 7a7e743095..d6770f596c 100644
--- a/packages/nodes-base/nodes/Google/Drive/v2/actions/file/move.operation.ts
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/file/move.operation.ts
@@ -5,10 +5,10 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 
-import { updateDisplayOptions } from '@utils/utilities';
 import { driveRLC, fileRLC, folderRLC } from '../common.descriptions';
 import { googleApiRequest } from '../../transport';
 import { setParentFolder } from '../../helpers/utils';
+import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/file/share.operation.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/file/share.operation.ts
index 3285559d3d..93a5fe77d3 100644
--- a/packages/nodes-base/nodes/Google/Drive/v2/actions/file/share.operation.ts
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/file/share.operation.ts
@@ -5,9 +5,9 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 
-import { updateDisplayOptions } from '@utils/utilities';
 import { googleApiRequest } from '../../transport';
 import { fileRLC, permissionsOptions, shareOptions } from '../common.descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/file/update.operation.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/file/update.operation.ts
index ddd728f1bb..367157fa90 100644
--- a/packages/nodes-base/nodes/Google/Drive/v2/actions/file/update.operation.ts
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/file/update.operation.ts
@@ -6,7 +6,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
-import { updateDisplayOptions } from '@utils/utilities';
 import {
 	getItemBinaryData,
 	prepareQueryString,
@@ -15,6 +14,7 @@ import {
 } from '../../helpers/utils';
 import { googleApiRequest } from '../../transport';
 import { fileRLC, updateCommonOptions } from '../common.descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/file/upload.operation.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/file/upload.operation.ts
index 17b5bb3fcc..35fcc2baf1 100644
--- a/packages/nodes-base/nodes/Google/Drive/v2/actions/file/upload.operation.ts
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/file/upload.operation.ts
@@ -5,7 +5,6 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 
-import { updateDisplayOptions } from '@utils/utilities';
 import { googleApiRequest } from '../../transport';
 import { driveRLC, folderRLC, updateCommonOptions } from '../common.descriptions';
 import {
@@ -14,6 +13,7 @@ import {
 	setUpdateCommonParams,
 	setParentFolder,
 } from '../../helpers/utils';
+import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/fileFolder/search.operation.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/fileFolder/search.operation.ts
index 5041d8f2f2..d06997a3c1 100644
--- a/packages/nodes-base/nodes/Google/Drive/v2/actions/fileFolder/search.operation.ts
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/fileFolder/search.operation.ts
@@ -5,12 +5,12 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 
-import { updateDisplayOptions } from '@utils/utilities';
 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[] = [
 	{
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/folder/create.operation.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/folder/create.operation.ts
index 3a9a5bdbec..643fa592cf 100644
--- a/packages/nodes-base/nodes/Google/Drive/v2/actions/folder/create.operation.ts
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/folder/create.operation.ts
@@ -5,11 +5,11 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 
-import { updateDisplayOptions } from '@utils/utilities';
 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[] = [
 	{
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/folder/deleteFolder.operation.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/folder/deleteFolder.operation.ts
index dfbbf7f607..8f1d8caad4 100644
--- a/packages/nodes-base/nodes/Google/Drive/v2/actions/folder/deleteFolder.operation.ts
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/folder/deleteFolder.operation.ts
@@ -1,8 +1,8 @@
 import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
 
-import { updateDisplayOptions } from '@utils/utilities';
 import { googleApiRequest } from '../../transport';
 import { folderNoRootRLC } from '../common.descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/folder/share.operation.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/folder/share.operation.ts
index e31db0c16b..a3908b2c29 100644
--- a/packages/nodes-base/nodes/Google/Drive/v2/actions/folder/share.operation.ts
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/folder/share.operation.ts
@@ -5,9 +5,9 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 
-import { updateDisplayOptions } from '@utils/utilities';
 import { googleApiRequest } from '../../transport';
 import { folderNoRootRLC, permissionsOptions, shareOptions } from '../common.descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/helpers/utils.ts b/packages/nodes-base/nodes/Google/Drive/v2/helpers/utils.ts
index 097ccefadb..62f029931d 100644
--- a/packages/nodes-base/nodes/Google/Drive/v2/helpers/utils.ts
+++ b/packages/nodes-base/nodes/Google/Drive/v2/helpers/utils.ts
@@ -1,7 +1,7 @@
+import type { Readable } from 'stream';
 import type { IDataObject, IExecuteFunctions } from 'n8n-workflow';
 import { BINARY_ENCODING, NodeOperationError } from 'n8n-workflow';
 
-import type { Readable } from 'stream';
 import { RLC_DRIVE_DEFAULT, RLC_FOLDER_DEFAULT, UPLOAD_CHUNK_SIZE } from './interfaces';
 
 export function prepareQueryString(fields: string[] | undefined) {
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/transport/index.ts b/packages/nodes-base/nodes/Google/Drive/v2/transport/index.ts
index 54961bb628..2af1bdb3be 100644
--- a/packages/nodes-base/nodes/Google/Drive/v2/transport/index.ts
+++ b/packages/nodes-base/nodes/Google/Drive/v2/transport/index.ts
@@ -29,7 +29,6 @@ export async function googleApiRequest(
 		headers: {
 			'Content-Type': 'application/json',
 		},
-
 		method,
 		body,
 		qs,
@@ -38,7 +37,6 @@ export async function googleApiRequest(
 	};
 
 	options = Object.assign({}, options, option);
-
 	try {
 		if (Object.keys(body).length === 0) {
 			delete options.body;
@@ -52,7 +50,11 @@ export async function googleApiRequest(
 			options.headers!.Authorization = `Bearer ${access_token}`;
 			return await this.helpers.httpRequest(options);
 		} else {
-			return await this.helpers.requestOAuth2.call(this, 'googleDriveOAuth2Api', options);
+			return await this.helpers.httpRequestWithAuthentication.call(
+				this,
+				'googleDriveOAuth2Api',
+				options,
+			);
 		}
 	} catch (error) {
 		if (error.code === 'ERR_OSSL_PEM_NO_START_LINE') {
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 fb166d0e06..49c76afbb4 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,
@@ -19,7 +20,6 @@ import {
 import { collectionFields, collectionOperations } from './CollectionDescription';
 
 import { documentFields, documentOperations } from './DocumentDescription';
-import { generatePairedItemData } from '../../../../utils/utilities';
 
 export class GoogleFirebaseCloudFirestore implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Google/Firebase/RealtimeDatabase/googleFirebaseRealtimeDatabase.svg b/packages/nodes-base/nodes/Google/Firebase/RealtimeDatabase/googleFirebaseRealtimeDatabase.svg
index feec452fc2..9fa5cea4f9 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/Gmail/GmailTrigger.node.ts b/packages/nodes-base/nodes/Google/Gmail/GmailTrigger.node.ts
index 40b1f28484..ac6855d58a 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",
 					},
 				],
 			},
diff --git a/packages/nodes-base/nodes/Google/Gmail/gmail.svg b/packages/nodes-base/nodes/Google/Gmail/gmail.svg
index e9a598fe76..a15343672c 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 91813b0273..7aaa6d7093 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 ddbf359a1b..dc5ad0b057 100644
--- a/packages/nodes-base/nodes/Google/Gmail/v1/GmailV1.node.ts
+++ b/packages/nodes-base/nodes/Google/Gmail/v1/GmailV1.node.ts
@@ -11,6 +11,7 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 
+import isEmpty from 'lodash/isEmpty';
 import type { IEmail } from '../GenericFunctions';
 import {
 	encodeEmail,
@@ -28,8 +29,6 @@ import { labelFields, labelOperations } from './LabelDescription';
 
 import { draftFields, draftOperations } from './DraftDescription';
 
-import isEmpty from 'lodash/isEmpty';
-
 import { oldVersionNotice } from '@utils/descriptions';
 
 const versionDescription: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Google/Perspective/GooglePerspective.node.ts b/packages/nodes-base/nodes/Google/Perspective/GooglePerspective.node.ts
index 8a4d432b79..74de6a53ee 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',
diff --git a/packages/nodes-base/nodes/Google/Perspective/perspective.svg b/packages/nodes-base/nodes/Google/Perspective/perspective.svg
index 2cfbaf8a3d..428a6647bc 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/Sheet/GoogleSheets.node.json b/packages/nodes-base/nodes/Google/Sheet/GoogleSheets.node.json
index 1f61a2a1a3..4384816b67 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 3c5fd6ad49..47784b22a5 100644
--- a/packages/nodes-base/nodes/Google/Sheet/GoogleSheets.node.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/GoogleSheets.node.ts
@@ -11,7 +11,7 @@ export class GoogleSheets extends VersionedNodeType {
 			name: 'googleSheets',
 			icon: 'file:googleSheets.svg',
 			group: ['input', 'output'],
-			defaultVersion: 4.1,
+			defaultVersion: 4.2,
 			subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
 			description: 'Read, update and write data to Google Sheets',
 		};
@@ -22,6 +22,7 @@ export class GoogleSheets extends VersionedNodeType {
 			3: new GoogleSheetsV2(baseDescription),
 			4: new GoogleSheetsV2(baseDescription),
 			4.1: new GoogleSheetsV2(baseDescription),
+			4.2: 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 45fe4aa16c..5686e5dceb 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,
@@ -20,7 +21,6 @@ import {
 	getRevisionFile,
 	sheetBinaryToArrayOfArrays,
 } from './GoogleSheetsTrigger.utils';
-import { GOOGLE_DRIVE_FILE_URL_REGEX } from '../constants';
 
 export class GoogleSheetsTrigger implements INodeType {
 	description: INodeTypeDescription = {
@@ -399,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;
+			};
 
-			sheetId = sheetId === 'gid=0' ? '0' : sheetId;
+			const googleSheet = new GoogleSheet(documentId, this);
+			const { sheetId, title: sheetName } = await googleSheet.spreadsheetGetSheet(
+				this.getNode(),
+				sheetMode,
+				sheetWithinDocument,
+			);
+
+			const options = this.getNodeParameter('options') as IDataObject;
 
 			// If the documentId or sheetId changed, reset the workflow static data
 			if (
@@ -417,10 +427,6 @@ export class GoogleSheetsTrigger implements INodeType {
 				workflowStaticData.lastIndexChecked = undefined;
 			}
 
-			const googleSheet = new GoogleSheet(documentId, this);
-			const sheetName: string = await googleSheet.spreadsheetGetSheetNameById(sheetId);
-			const options = this.getNodeParameter('options') as IDataObject;
-
 			const previousRevision = workflowStaticData.lastRevision as number;
 			const previousRevisionLink = workflowStaticData.lastRevisionLink as string;
 
diff --git a/packages/nodes-base/nodes/Google/Sheet/GoogleSheetsTrigger.utils.ts b/packages/nodes-base/nodes/Google/Sheet/GoogleSheetsTrigger.utils.ts
index b820d0fe01..91ab4c69a8 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 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 257f88ea8e..f65da90364 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/v1/GoogleSheet.ts b/packages/nodes-base/nodes/Google/Sheet/v1/GoogleSheet.ts
index 224b2f5c0e..aad614bebd 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 { googleApiRequest } from './GenericFunctions';
 
 export interface ISheetOptions {
 	scope: string[];
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 e276054e7f..5b4fd9dfc9 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,
@@ -25,8 +27,6 @@ import { GoogleSheet } from './GoogleSheet';
 import { googleApiRequest, hexToRgb } from './GenericFunctions';
 
 import { versionDescription } from './versionDescription';
-import { getGoogleAccessToken } from '../../GenericFunctions';
-import { generatePairedItemData } from '../../../../utils/utilities';
 
 export class GoogleSheetsV1 implements INodeType {
 	description: INodeTypeDescription;
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/actions/router.ts b/packages/nodes-base/nodes/Google/Sheet/v2/actions/router.ts
index 70432adf01..591567c6f8 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/actions/router.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/actions/router.ts
@@ -1,9 +1,9 @@
 import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
-import * as sheet from './sheet/Sheet.resource';
-import * as spreadsheet from './spreadsheet/SpreadSheet.resource';
 import { GoogleSheet } from '../helpers/GoogleSheet';
 import { getSpreadsheetId } from '../helpers/GoogleSheets.utils';
 import type { GoogleSheets, ResourceLocator } from '../helpers/GoogleSheets.types';
+import * as spreadsheet from './spreadsheet/SpreadSheet.resource';
+import * as sheet from './sheet/Sheet.resource';
 
 export async function router(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 	let operationResult: INodeExecutionData[] = [];
@@ -20,22 +20,34 @@ export async function router(this: IExecuteFunctions): Promise<INodeExecutionDat
 		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;
+				};
+
+				const result = await googleSheet.spreadsheetGetSheet(
+					this.getNode(),
+					sheetMode,
+					sheetWithinDocument,
+				);
+				sheetId = result.sheetId.toString();
+				sheetName = result.title;
 			}
 
-			if (sheetId === 'gid=0') {
-				sheetId = '0';
-			}
-
-			let sheetName = '';
 			switch (operation) {
 				case 'create':
 					sheetName = spreadsheetId;
@@ -46,8 +58,6 @@ export async function router(this: IExecuteFunctions): Promise<INodeExecutionDat
 				case 'remove':
 					sheetName = `${spreadsheetId}||${sheetId}`;
 					break;
-				default:
-					sheetName = await googleSheet.spreadsheetGetSheetNameById(sheetId);
 			}
 
 			results = await sheet[googleSheets.operation].execute.call(
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 47c653f289..e7df39ac46 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';
@@ -7,7 +8,6 @@ import * as del from './delete.operation';
 import * as read from './read.operation';
 import * as remove from './remove.operation';
 import * as update from './update.operation';
-import { GOOGLE_DRIVE_FILE_URL_REGEX } from '../../../../constants';
 
 export { append, appendOrUpdate, clear, create, del as delete, read, remove, update };
 
@@ -60,10 +60,10 @@ export const descriptions: INodeProperties[] = [
 				action: 'Delete rows or columns from sheet',
 			},
 			{
-				name: 'Get Many Rows',
+				name: 'Get Row(s)',
 				value: 'read',
-				description: 'Retrieves all the rows in a sheet',
-				action: 'Get many rows in sheet',
+				description: 'Retrieve one or more rows from a sheet',
+				action: 'Get row(s) in sheet',
 			},
 			{
 				name: 'Update Row',
@@ -184,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 6508cee1f3..afb463c225 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
@@ -46,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: '',
@@ -136,7 +136,7 @@ export const description: SheetProperties = [
 			show: {
 				resource: ['sheet'],
 				operation: ['append'],
-				'@version': [4, 4.1],
+				'@version': [4, 4.1, 4.2],
 			},
 			hide: {
 				...untilSheetSelected,
@@ -191,6 +191,14 @@ export const description: SheetProperties = [
 				...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',
+			},
 		],
 	},
 ];
@@ -228,17 +236,28 @@ 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) || cellFormatDefault(nodeVersion),
-		false,
-	);
+		await sheet.appendSheetData(
+			setData,
+			sheetName,
+			headerRow,
+			(options.cellFormat as ValueInputOption) || cellFormatDefault(nodeVersion),
+			false,
+		);
+	}
 
 	if (nodeVersion < 4 || dataMode === 'autoMapInputData') {
 		return items;
@@ -247,7 +266,7 @@ export async function execute(
 		for (const [index, entry] of setData.entries()) {
 			returnData.push({
 				json: entry,
-				pairedItems: { item: index },
+				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 5350f02b53..6d51a32b88 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,11 +1,11 @@
 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 { cellFormatDefault, untilSheetSelected } from '../../helpers/GoogleSheets.utils';
 import { cellFormat, handlingExtraData, locationDefine } from './commonDescription';
@@ -172,7 +172,7 @@ export const description: SheetProperties = [
 			show: {
 				resource: ['sheet'],
 				operation: ['appendOrUpdate'],
-				'@version': [4, 4.1],
+				'@version': [4, 4.1, 4.2],
 			},
 			hide: {
 				...untilSheetSelected,
@@ -202,6 +202,14 @@ export const description: SheetProperties = [
 				...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',
+			},
 		],
 	},
 ];
@@ -245,7 +253,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}`,
@@ -394,17 +402,30 @@ 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') {
@@ -414,7 +435,7 @@ export async function execute(
 		for (const [index, entry] of mappedValues.entries()) {
 			returnData.push({
 				json: entry,
-				pairedItems: { item: index },
+				pairedItem: { item: index },
 			});
 		}
 		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 dd27d615e2..f9c777e6e3 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
@@ -5,7 +5,6 @@ import {
 	prepareSheetData,
 	untilSheetSelected,
 } from '../../helpers/GoogleSheets.utils';
-import { dataLocationOnSheet, outputFormatting } from './commonDescription';
 import type {
 	ILookupValues,
 	RangeDetectionOptions,
@@ -13,7 +12,8 @@ import type {
 	SheetRangeData,
 	ValueRenderOption,
 } from '../../helpers/GoogleSheets.types';
-import { generatePairedItemData } from '../../../../../../utils/utilities';
+
+import { dataLocationOnSheet, outputFormatting } from './commonDescription';
 
 export const description: SheetProperties = [
 	{
@@ -111,70 +111,93 @@ 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 items = this.getInputData();
+	const nodeVersion = this.getNode().typeVersion;
+	let length = 1;
 
-	const dataLocationOnSheetOptions =
-		((options.dataLocationOnSheet as IDataObject)?.values as RangeDetectionOptions) || {};
-
-	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 [];
-	}
-
-	const { data, headerRow, firstDataRow } = prepareSheetData(sheetData, dataLocationOnSheetOptions);
-
-	let responseData = [];
-
-	const lookupValues = this.getNodeParameter('filtersUI.values', 0, []) as ILookupValues[];
-
-	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 (dataLocationOnSheetOptions.rangeDefinition === undefined) {
+			dataLocationOnSheetOptions.rangeDefinition = 'detectAutomatically';
 		}
 
-		responseData = await sheet.lookupValues(
-			data as string[][],
-			headerRow,
-			firstDataRow,
-			lookupValues,
-			returnAllMatches,
+		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;
+
+		if (sheetData === undefined || sheetData.length === 0) {
+			return [];
+		}
+
+		const { data, headerRow, firstDataRow } = prepareSheetData(
+			sheetData,
+			dataLocationOnSheetOptions,
+		);
+
+		let responseData = [];
+
+		const lookupValues = this.getNodeParameter(
+			'filtersUI.values',
+			itemIndex,
+			[],
+		) as ILookupValues[];
+
+		if (lookupValues.length) {
+			const returnAllMatches = options.returnAllMatches === 'returnAllMatches' ? true : false;
+
+			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);
+					}
+				}
+			}
+
+			responseData = await sheet.lookupValues(
+				data as string[][],
+				headerRow,
+				firstDataRow,
+				lookupValues,
+				returnAllMatches,
+			);
+		} else {
+			responseData = sheet.structureArrayDataByColumn(data as string[][], headerRow, firstDataRow);
+		}
+
+		returnData.push(
+			...responseData.map((item, index) => {
+				return {
+					json: item,
+					pairedItem: { item: itemIndex },
+				};
+			}),
 		);
-	} else {
-		responseData = sheet.structureArrayDataByColumn(data as string[][], headerRow, firstDataRow);
 	}
 
-	const items = this.getInputData();
-	const pairedItem = generatePairedItemData(items.length);
-
-	const returnData: INodeExecutionData[] = responseData.map((item, index) => {
-		return {
-			json: item,
-			pairedItem,
-		};
-	});
-
 	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 2f1d4b65fa..89b3503cf1 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,11 +1,11 @@
 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 { cellFormatDefault, untilSheetSelected } from '../../helpers/GoogleSheets.utils';
 import { cellFormat, handlingExtraData, locationDefine } from './commonDescription';
@@ -172,7 +172,7 @@ export const description: SheetProperties = [
 			show: {
 				resource: ['sheet'],
 				operation: ['update'],
-				'@version': [4, 4.1],
+				'@version': [4, 4.1, 4.2],
 			},
 			hide: {
 				...untilSheetSelected,
@@ -244,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}`,
@@ -414,7 +414,7 @@ export async function execute(
 		for (const [index, entry] of mappedValues.entries()) {
 			returnData.push({
 				json: entry,
-				pairedItems: { item: index },
+				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 b8c82e4944..c0e7f3acfa 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 };
 
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 170ecb50f5..8936062383 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, 4, 4.1],
+	version: [3, 4, 4.1, 4.2],
 	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 9d0ed5be82..ef3e4b9130 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 { 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;
@@ -115,28 +118,35 @@ 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`);
+			throw new NodeOperationError(
+				node,
+				`Sheet with ${mode === 'name' ? 'name' : 'ID'} ${value} not found`,
+				{ level: 'warning' },
+			);
 		}
-		return foundItem.properties.title;
+
+		return foundItem.properties;
 	}
 
 	/**
@@ -221,7 +231,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(
@@ -242,24 +254,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;
@@ -270,6 +266,7 @@ export class GoogleSheet {
 			valueInputMode,
 			lastRowWithData,
 			data.length,
+			useAppend,
 		);
 
 		return response;
@@ -281,6 +278,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}`;
@@ -294,13 +292,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;
 	}
@@ -381,6 +391,7 @@ export class GoogleSheet {
 		usePathForKeyRow: boolean,
 		columnNamesList?: string[][],
 		lastRow?: number,
+		useAppend?: boolean,
 	): Promise<string[][]> {
 		const data = await this.convertObjectArrayToSheetDataArray(
 			inputData,
@@ -388,8 +399,9 @@ export class GoogleSheet {
 			keyRowIndex,
 			usePathForKeyRow,
 			columnNamesList,
+			useAppend ? null : '',
 		);
-		return this.appendData(range, data, valueInputMode, lastRow);
+		return this.appendData(range, data, valueInputMode, lastRow, useAppend);
 	}
 
 	getColumnWithOffset(startColumn: string, offset: number): string {
@@ -695,6 +707,7 @@ export class GoogleSheet {
 		keyRowIndex: number,
 		usePathForKeyRow: boolean,
 		columnNamesList?: string[][],
+		emptyValue: string | null = '',
 	): Promise<string[][]> {
 		const decodedRange = this.getDecodedSheetRange(range);
 
@@ -725,7 +738,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 a55fc71ae4..ef643d9953 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 bea92aa442..be64a34e83 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);
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 60fb036ad7..36f18521e4 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 b9fe07f9f4..90aa11cf90 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;
+	const { mode: sheetMode } = this.getNodeParameter('sheetName', 0) as {
+		mode: ResourceLocator;
+	};
 
-	if (sheetWithinDocument === 'gid=0') {
-		sheetWithinDocument = '0';
-	}
-
-	const sheetName = await sheet.spreadsheetGetSheetNameById(sheetWithinDocument);
+	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
index 11c7ed8bb2..40ae402a64 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/methods/resourceMapping.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/methods/resourceMapping.ts
@@ -11,19 +11,25 @@ import { getSpreadsheetId } from '../helpers/GoogleSheets.utils';
 export async function getMappingColumns(
 	this: ILoadOptionsFunctions,
 ): Promise<ResourceMapperFields> {
-	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 { fields: [] };
+
+	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;
+	const { mode: sheetMode } = this.getNodeParameter('sheetName', 0) as { mode: ResourceLocator };
 
-	if (sheetWithinDocument === 'gid=0') {
-		sheetWithinDocument = '0';
-	}
-
-	const sheetName = await sheet.spreadsheetGetSheetNameById(sheetWithinDocument);
+	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 !== '');
diff --git a/packages/nodes-base/nodes/Google/Slides/GoogleSlides.node.json b/packages/nodes-base/nodes/Google/Slides/GoogleSlides.node.json
index f745a70d99..fa81174273 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 183f0734e8..38ee4bb8ab 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'],
diff --git a/packages/nodes-base/nodes/Google/Slides/googleslides.svg b/packages/nodes-base/nodes/Google/Slides/googleslides.svg
index 666d185ea5..7ed5db6413 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/YouTube/ChannelDescription.ts b/packages/nodes-base/nodes/Google/YouTube/ChannelDescription.ts
index 7475c23920..7503b0af01 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/VideoDescription.ts b/packages/nodes-base/nodes/Google/YouTube/VideoDescription.ts
index bdb6e8160f..339d20e3f0 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 50e5eb2aac..34edb0df55 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 f4038c4d53..9115cd473f 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';
 
diff --git a/packages/nodes-base/nodes/Grafana/grafana.svg b/packages/nodes-base/nodes/Grafana/grafana.svg
index c78f110490..1080e570ce 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/Grist/GenericFunctions.ts b/packages/nodes-base/nodes/Grist/GenericFunctions.ts
index 3fb890c20b..1090be4837 100644
--- a/packages/nodes-base/nodes/Grist/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Grist/GenericFunctions.ts
@@ -30,8 +30,8 @@ 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 = {
 		headers: {
diff --git a/packages/nodes-base/nodes/Grist/Grist.node.ts b/packages/nodes-base/nodes/Grist/Grist.node.ts
index 9cdaf85702..cf7c093149 100644
--- a/packages/nodes-base/nodes/Grist/Grist.node.ts
+++ b/packages/nodes-base/nodes/Grist/Grist.node.ts
@@ -83,8 +83,8 @@ 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 = {
 					headers: {
diff --git a/packages/nodes-base/nodes/Grist/grist.svg b/packages/nodes-base/nodes/Grist/grist.svg
index 180f36b827..6945efdfa6 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/HackerNews/HackerNews.node.json b/packages/nodes-base/nodes/HackerNews/HackerNews.node.json
index 6a9fb7c977..f7cffd717c 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/HaloPSA/GenericFunctions.ts b/packages/nodes-base/nodes/HaloPSA/GenericFunctions.ts
index 2d000453ec..f4a9c2072a 100644
--- a/packages/nodes-base/nodes/HaloPSA/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/HaloPSA/GenericFunctions.ts
@@ -96,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 === 'UPDATE' && message)) {
 			let newErrorMessage;
 			if (message.includes('400')) {
 				console.log(message);
@@ -106,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);
diff --git a/packages/nodes-base/nodes/HaloPSA/halopsa.svg b/packages/nodes-base/nodes/HaloPSA/halopsa.svg
index 7419d179fe..865e3b62d7 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/HelpScout/HelpScoutTrigger.node.ts b/packages/nodes-base/nodes/HelpScout/HelpScoutTrigger.node.ts
index 3ebed8e04a..5fb6e92793 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 f82e8a8c1b..94d2eaf05c 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/HighLevel.node.json b/packages/nodes-base/nodes/HighLevel/HighLevel.node.json
index a7370f857c..305d966ca1 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 f81310d29a..3df6e466f0 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 31d76dda84..540a4af70d 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/homeAssistant.svg b/packages/nodes-base/nodes/HomeAssistant/homeAssistant.svg
index 9e25b23da5..6b2cc124f7 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 6c73ada8bf..dbd9b221e4 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", "table"]
 }
diff --git a/packages/nodes-base/nodes/Html/Html.node.ts b/packages/nodes-base/nodes/Html/Html.node.ts
index fea791aff7..10d3e75e9c 100644
--- a/packages/nodes-base/nodes/Html/Html.node.ts
+++ b/packages/nodes-base/nodes/Html/Html.node.ts
@@ -9,8 +9,8 @@ import type {
 import { NodeOperationError } from 'n8n-workflow';
 import { placeholder } from './placeholder';
 import { getValue } from './utils';
-import { getResolvables } from '@utils/utilities';
 import type { IValueData } from './types';
+import { getResolvables } from '@utils/utilities';
 
 export const capitalizeHeader = (header: string, capitalize?: boolean) => {
 	if (!capitalize) return header;
@@ -112,7 +112,7 @@ export class Html implements INodeType {
 				},
 			},
 			{
-				displayName: 'Binary Property',
+				displayName: 'Input Binary Field',
 				name: 'dataPropertyName',
 				type: 'string',
 				requiresDataPath: 'single',
@@ -124,8 +124,7 @@ 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',
diff --git a/packages/nodes-base/nodes/Html/html.svg b/packages/nodes-base/nodes/Html/html.svg
index 80cab9e7ac..816043b887 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/HtmlExtract/HtmlExtract.node.ts b/packages/nodes-base/nodes/HtmlExtract/HtmlExtract.node.ts
index 9161a0d9e9..d62cd05f06 100644
--- a/packages/nodes-base/nodes/HtmlExtract/HtmlExtract.node.ts
+++ b/packages/nodes-base/nodes/HtmlExtract/HtmlExtract.node.ts
@@ -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',
diff --git a/packages/nodes-base/nodes/HttpRequest/HttpRequest.node.ts b/packages/nodes-base/nodes/HttpRequest/HttpRequest.node.ts
index 9dfa8054b0..c0d77e28dc 100644
--- a/packages/nodes-base/nodes/HttpRequest/HttpRequest.node.ts
+++ b/packages/nodes-base/nodes/HttpRequest/HttpRequest.node.ts
@@ -10,7 +10,7 @@ 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',
diff --git a/packages/nodes-base/nodes/HttpRequest/V1/HttpRequestV1.node.ts b/packages/nodes-base/nodes/HttpRequest/V1/HttpRequestV1.node.ts
index f1db2e33ae..6bf4e0a98f 100644
--- a/packages/nodes-base/nodes/HttpRequest/V1/HttpRequestV1.node.ts
+++ b/packages/nodes-base/nodes/HttpRequest/V1/HttpRequestV1.node.ts
@@ -232,7 +232,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 +242,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',
 				},
 
 				{
@@ -397,7 +397,7 @@ export class HttpRequestV1 implements INodeType {
 
 				// Body Parameter
 				{
-					displayName: 'Send Binary Data',
+					displayName: 'Send Binary File',
 					name: 'sendBinaryData',
 					type: 'boolean',
 					displayOptions: {
@@ -414,7 +414,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 +428,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',
@@ -993,6 +994,7 @@ export class HttpRequestV1 implements INodeType {
 			}
 
 			response = response.value;
+			if (response?.request?.constructor.name === 'ClientRequest') delete response.request;
 
 			const options = this.getNodeParameter('options', itemIndex, {});
 
diff --git a/packages/nodes-base/nodes/HttpRequest/V2/HttpRequestV2.node.ts b/packages/nodes-base/nodes/HttpRequest/V2/HttpRequestV2.node.ts
index c2f5a7553c..2c5d78f206 100644
--- a/packages/nodes-base/nodes/HttpRequest/V2/HttpRequestV2.node.ts
+++ b/packages/nodes-base/nodes/HttpRequest/V2/HttpRequestV2.node.ts
@@ -247,7 +247,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',
@@ -257,7 +257,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',
 				},
 
 				{
@@ -412,7 +412,7 @@ export class HttpRequestV2 implements INodeType {
 
 				// Body Parameter
 				{
-					displayName: 'Send Binary Data',
+					displayName: 'Send Binary File',
 					name: 'sendBinaryData',
 					type: 'boolean',
 					displayOptions: {
@@ -429,7 +429,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,
@@ -443,8 +443,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',
@@ -1046,6 +1047,7 @@ export class HttpRequestV2 implements INodeType {
 			}
 
 			response = response.value;
+			if (response?.request?.constructor.name === 'ClientRequest') delete response.request;
 
 			const options = this.getNodeParameter('options', itemIndex, {});
 
diff --git a/packages/nodes-base/nodes/HttpRequest/V3/HttpRequestV3.node.ts b/packages/nodes-base/nodes/HttpRequest/V3/HttpRequestV3.node.ts
index f1c47580f8..c6fabfa41e 100644
--- a/packages/nodes-base/nodes/HttpRequest/V3/HttpRequestV3.node.ts
+++ b/packages/nodes-base/nodes/HttpRequest/V3/HttpRequestV3.node.ts
@@ -9,6 +9,7 @@ import type {
 	INodeTypeBaseDescription,
 	INodeTypeDescription,
 	IRequestOptionsSimplified,
+	PaginationOptions,
 	JsonObject,
 } from 'n8n-workflow';
 
@@ -21,12 +22,9 @@ import {
 	sleep,
 } from 'n8n-workflow';
 
-import { keysToLowercase } from '@utils/utilities';
-
 import type { OptionsWithUri } from 'request-promise-native';
 
 import type { BodyParameter, IAuthDataSanitizeKeys } from '../GenericFunctions';
-
 import {
 	binaryContentTypes,
 	getOAuth2AdditionalParameters,
@@ -35,6 +33,7 @@ import {
 	replaceNullValues,
 	sanitizeUiMessage,
 } from '../GenericFunctions';
+import { keysToLowercase } from '@utils/utilities';
 
 function toText<T>(data: T) {
 	if (typeof data === 'object' && data !== null) {
@@ -52,7 +51,7 @@ export class HttpRequestV3 implements INodeType {
 			version: [3, 4, 4.1],
 			defaults: {
 				name: 'HTTP Request',
-				color: '#2200DD',
+				color: '#0004F5',
 			},
 			inputs: ['main'],
 			outputs: ['main'],
@@ -373,7 +372,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',
 						},
 						{
@@ -503,7 +502,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',
 										},
 										{
@@ -537,7 +536,6 @@ export class HttpRequestV3 implements INodeType {
 									displayName: 'Input Data Field Name',
 									name: 'inputDataFieldName',
 									type: 'string',
-									noDataExpression: true,
 									displayOptions: {
 										show: {
 											parameterType: ['formBinaryData'],
@@ -637,7 +635,6 @@ export class HttpRequestV3 implements INodeType {
 					displayName: 'Input Data Field Name',
 					name: 'inputDataFieldName',
 					type: 'string',
-					noDataExpression: true,
 					displayOptions: {
 						show: {
 							sendBody: [true],
@@ -928,6 +925,245 @@ 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 true when pagination is complete. More info.',
+										},
+										{
+											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: '',
+														},
+														{
+															displayName: 'Value',
+															name: 'value',
+															type: 'string',
+															default: '',
+														},
+													],
+												},
+											],
+										},
+										{
+											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. More info.',
+										},
+										{
+											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',
@@ -982,45 +1218,8 @@ export class HttpRequestV3 implements INodeType {
 		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 === 'httpCustomAuth') {
-				try {
-					httpCustomAuth = await this.getCredentials('httpCustomAuth');
-				} 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 nodeCredentialType: string | undefined;
+		let genericCredentialType: string | undefined;
 
 		type RequestOptions = OptionsWithUri & { useStream?: boolean };
 		let requestOptions: RequestOptions = {
@@ -1034,7 +1233,66 @@ 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;
+		};
+
 		for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
+			if (authentication === 'genericCredentialType') {
+				genericCredentialType = this.getNodeParameter('genericAuthType', 0) as string;
+
+				if (genericCredentialType === 'httpBasicAuth') {
+					try {
+						httpBasicAuth = await this.getCredentials('httpBasicAuth', itemIndex);
+					} catch {}
+				} else if (genericCredentialType === 'httpDigestAuth') {
+					try {
+						httpDigestAuth = await this.getCredentials('httpDigestAuth', itemIndex);
+					} catch {}
+				} else if (genericCredentialType === 'httpHeaderAuth') {
+					try {
+						httpHeaderAuth = await this.getCredentials('httpHeaderAuth', itemIndex);
+					} catch {}
+				} else if (genericCredentialType === 'httpQueryAuth') {
+					try {
+						httpQueryAuth = await this.getCredentials('httpQueryAuth', itemIndex);
+					} catch {}
+				} else if (genericCredentialType === 'httpCustomAuth') {
+					try {
+						httpCustomAuth = await this.getCredentials('httpCustomAuth', itemIndex);
+					} catch {}
+				} else if (genericCredentialType === 'oAuth1Api') {
+					try {
+						oAuth1Api = await this.getCredentials('oAuth1Api', itemIndex);
+					} catch {}
+				} else if (genericCredentialType === 'oAuth2Api') {
+					try {
+						oAuth2Api = await this.getCredentials('oAuth2Api', itemIndex);
+					} catch {}
+				}
+			} else if (authentication === 'predefinedCredentialType') {
+				try {
+					nodeCredentialType = this.getNodeParameter('nodeCredentialType', 0) as string;
+				} catch {}
+			}
+
 			const requestMethod = this.getNodeParameter('method', itemIndex) as string;
 
 			const sendQuery = this.getNodeParameter('sendQuery', itemIndex, false) as boolean;
@@ -1118,15 +1376,9 @@ 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 };
 			}
@@ -1322,7 +1574,7 @@ 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 = {};
@@ -1393,7 +1645,65 @@ export class HttpRequestV3 implements INodeType {
 			try {
 				this.sendMessageToUI(sanitizeUiMessage(requestOptions, authDataKeys));
 			} 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 = {};
+					pagination.parameters.parameters.forEach((parameter) => {
+						if (!paginationData.request[parameter.type]) {
+							paginationData.request[parameter.type] = {};
+						}
+						paginationData.request[parameter.type]![parameter.name] = parameter.value;
+					});
+				} 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,
+				);
+				requestPromises.push(requestPromise);
+			} else if (authentication === 'genericCredentialType' || authentication === 'none') {
 				if (oAuth1Api) {
 					const requestOAuth1 = this.helpers.requestOAuth1.call(this, 'oAuth1Api', requestOptions);
 					requestOAuth1.catch(() => {});
@@ -1427,25 +1737,25 @@ 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') {
-				if (response.reason.statusCode === 429) {
-					response.reason.message =
+			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 });
+					throw new NodeApiError(this.getNode(), responseData as JsonObject, { itemIndex });
 				} else {
-					removeCircularRefs(response.reason as JsonObject);
+					removeCircularRefs(responseData.reason as JsonObject);
 					// Return the actual reason as error
 					returnItems.push({
 						json: {
-							error: response.reason,
+							error: responseData.reason,
 						},
 						pairedItem: {
 							item: itemIndex,
@@ -1455,7 +1765,12 @@ export class HttpRequestV3 implements INodeType {
 				}
 			}
 
-			response = response.value;
+			let responses: any[];
+			if (Array.isArray(responseData.value)) {
+				responses = responseData.value;
+			} else {
+				responses = [responseData.value];
+			}
 
 			let responseFormat = this.getNodeParameter(
 				'options.response.response.responseFormat',
@@ -1469,172 +1784,196 @@ 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;
+			// eslint-disable-next-line prefer-const
+			for (let [index, response] of Object.entries(responses)) {
+				if (response?.request?.constructor.name === 'ClientRequest') delete response.request;
 
-					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);
-				}
-
-				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;
-				}
-				newItem.binary![outputPropertyName] = await this.helpers.prepareBinaryData(binaryData);
-
-				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: {
-							[outputPropertyName]: toText(response),
-						},
-						pairedItem: {
-							item: itemIndex,
-						},
-					});
-				}
-			} else {
-				// responseFormat: 'json'
-				if (requestOptions.resolveWithFullResponse === true) {
-					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 {
-							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,
-								},
-							}),
-						);
+				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;
+					}
+				}
+
+				if (autoDetectResponseFormat) {
+					const responseContentType = response.headers['content-type'] ?? '';
+					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;
+						}
+					}
+				}
+
+				if (autoDetectResponseFormat && !fullResponse) {
+					delete response.headers;
+					delete response.statusCode;
+					delete response.statusMessage;
+				}
+				if (!fullResponse) {
+					response = response.body;
+				}
+
+				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);
+					}
+
+					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;
+					}
+					newItem.binary![outputPropertyName] = await this.helpers.prepareBinaryData(binaryData);
+
+					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: response,
+							json: returnItem,
 							pairedItem: {
 								item: itemIndex,
 							},
 						});
+					} else {
+						returnItems.push({
+							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,
+								},
+							});
+						}
 					}
 				}
 			}
diff --git a/packages/nodes-base/nodes/HttpRequest/httprequest.svg b/packages/nodes-base/nodes/HttpRequest/httprequest.svg
new file mode 100644
index 0000000000..955eb39401
--- /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/test/node/HttpRequest.test.ts b/packages/nodes-base/nodes/HttpRequest/test/node/HttpRequest.test.ts
index 49617225e9..d594a04a19 100644
--- a/packages/nodes-base/nodes/HttpRequest/test/node/HttpRequest.test.ts
+++ b/packages/nodes-base/nodes/HttpRequest/test/node/HttpRequest.test.ts
@@ -1,3 +1,5 @@
+import { parse as parseUrl } from 'url';
+import nock from 'nock';
 import {
 	initBinaryDataService,
 	setup,
@@ -6,8 +8,6 @@ import {
 	getWorkflowFilenames,
 } from '@test/nodes/Helpers';
 
-import nock from 'nock';
-
 describe('Test HTTP Request Node', () => {
 	const workflows = getWorkflowFilenames(__dirname);
 	const tests = workflowToTests(workflows);
@@ -118,6 +118,48 @@ describe('Test HTTP Request Node', () => {
 			isDeleted: true,
 			deletedOn: '2023-02-09T05:37:31.720Z',
 		});
+
+		// Pagination - Data not identical to dummyjson.com
+		nock(baseUrl)
+			.persist()
+			.get('/users')
+			.query(true)
+			.reply(function (uri) {
+				const data = parseUrl(uri, true);
+				const skip = parseInt((data.query.skip as string) || '0', 10);
+				const limit = parseInt((data.query.limit as string) || '10', 10);
+				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',
+					},
+				];
+			});
 	});
 
 	afterAll(() => {
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 0000000000..bf3fce55e4
--- /dev/null
+++ b/packages/nodes-base/nodes/HttpRequest/test/node/workflow.pagination.json
@@ -0,0 +1,1537 @@
+{
+	"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": "062086e5-e4c9-4ef2-b506-408167e1f0a5",
+			"name": "Page Limit",
+			"type": "n8n-nodes-base.httpRequest",
+			"typeVersion": 4.1,
+			"position": [900, 0]
+		},
+		{
+			"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": "5b82121f-ec6f-4638-abc9-2c9d6cd29f41",
+			"name": "Response Empty",
+			"type": "n8n-nodes-base.httpRequest",
+			"typeVersion": 4.1,
+			"position": [900, 180]
+		},
+		{
+			"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": "4f794c3e-7f08-4d6f-8907-1216d2bea416",
+			"name": "Receive Status Code",
+			"type": "n8n-nodes-base.httpRequest",
+			"typeVersion": 4.1,
+			"position": [900, 340]
+		},
+		{
+			"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": "b0348541-a416-4a54-8ece-3a623b7b6143",
+			"name": "Complete Expression",
+			"type": "n8n-nodes-base.httpRequest",
+			"typeVersion": 4.1,
+			"position": [900, 520]
+		},
+		{
+			"parameters": {
+				"content": "### Next URL\nResponse Format: JSON",
+				"height": 223.6542431762359,
+				"width": 365.5274479049966
+			},
+			"id": "d028fb00-eac0-495e-b0a7-6a47958bf293",
+			"name": "Sticky Note",
+			"type": "n8n-nodes-base.stickyNote",
+			"typeVersion": 1,
+			"position": [840, 720]
+		},
+		{
+			"parameters": {
+				"content": "### Update a Parameter in Each Request\nResponse Format: JSON",
+				"height": 764.5257091080099,
+				"width": 354.2110090941684
+			},
+			"id": "2f48dfae-a194-4d50-9f62-e30768bc3d47",
+			"name": "Sticky Note1",
+			"type": "n8n-nodes-base.stickyNote",
+			"typeVersion": 1,
+			"position": [847.3233251176339, -78.47327800785297]
+		},
+		{
+			"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": "a53f6a9d-945f-4891-8bda-15651dc67267",
+			"name": "Response Empty - Text",
+			"type": "n8n-nodes-base.httpRequest",
+			"typeVersion": 4.1,
+			"position": [900, 1040]
+		},
+		{
+			"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": "698733fb-0a96-4aea-b249-3ecc27147232",
+			"name": "Response Empty Next with Max Pages",
+			"type": "n8n-nodes-base.httpRequest",
+			"typeVersion": 4.1,
+			"position": [900, 780]
+		},
+		{
+			"parameters": {
+				"content": "### Next URL\nResponse Format: Text",
+				"height": 388.6542431762359,
+				"width": 363.5274479049966
+			},
+			"id": "51183fa5-a558-4fdc-9aae-60bd5f9a46e9",
+			"name": "Sticky Note2",
+			"type": "n8n-nodes-base.stickyNote",
+			"typeVersion": 1,
+			"position": [840, 980]
+		},
+		{
+			"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": "b0bcca37-a24d-4a21-b513-e4cd9ad2e9cd",
+			"name": "Complete Expression - JSON",
+			"type": "n8n-nodes-base.httpRequest",
+			"typeVersion": 4.1,
+			"position": [900, -280]
+		},
+		{
+			"parameters": {
+				"content": "### Update a Parameter in Each Request\nResponse Format: JSON",
+				"height": 232.15942469988397,
+				"width": 323.21100909416833
+			},
+			"id": "74ab84c6-4e01-4d02-bdbc-e0b1a8310eb2",
+			"name": "Sticky Note3",
+			"type": "n8n-nodes-base.stickyNote",
+			"typeVersion": 1,
+			"position": [840, -347.6337155918741]
+		},
+		{
+			"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": "be7064ff-518f-4566-bd58-e588d863172d",
+			"name": "Response Empty - Include Full Response",
+			"type": "n8n-nodes-base.httpRequest",
+			"typeVersion": 4.1,
+			"position": [900, 1220]
+		},
+		{
+			"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": "7102d906-c9b7-42c8-a95d-bf277cc88b51",
+			"name": "Pagination Off",
+			"type": "n8n-nodes-base.httpRequest",
+			"typeVersion": 4.1,
+			"position": [900, 1440]
+		},
+		{
+			"parameters": {
+				"content": "### Pagination Off",
+				"height": 373,
+				"width": 363
+			},
+			"id": "34fd6eb1-c480-4336-825c-062849a0c9e4",
+			"name": "Sticky Note4",
+			"type": "n8n-nodes-base.stickyNote",
+			"typeVersion": 1,
+			"position": [840, 1400]
+		},
+		{
+			"parameters": {
+				"url": "https://dummyjson.com/users",
+				"sendQuery": true,
+				"queryParameters": {
+					"parameters": [
+						{
+							"name": "limit",
+							"value": "3"
+						}
+					]
+				},
+				"options": {
+					"response": {
+						"response": {
+							"neverError": true,
+							"responseFormat": "json"
+						}
+					}
+				}
+			},
+			"id": "d17b4ef6-b603-4c2d-a313-98f4ee0bb610",
+			"name": "Pagination Not Set",
+			"type": "n8n-nodes-base.httpRequest",
+			"typeVersion": 4.1,
+			"position": [900, 1620]
+		},
+		{
+			"parameters": {
+				"content": "### Detect identical responses\nThrow then error",
+				"height": 232.15942469988397,
+				"width": 394.89100909416834
+			},
+			"id": "f349bb03-7ee3-46c1-98e9-a88070e7f53f",
+			"name": "Sticky Note5",
+			"type": "n8n-nodes-base.stickyNote",
+			"typeVersion": 1,
+			"position": [840, 1840]
+		},
+		{
+			"parameters": {
+				"fields": {
+					"values": [
+						{
+							"name": "Error",
+							"stringValue": "={{ $json.error.name }}"
+						}
+					]
+				},
+				"include": "none",
+				"options": {}
+			},
+			"id": "3bf2681e-0c13-4998-bade-516faa1098a8",
+			"name": "Edit Fields",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 3.2,
+			"position": [1080, 1920]
+		},
+		{
+			"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": "c82cbdd8-92c6-43c8-9e27-da9f6106035e",
+			"name": "Loop",
+			"type": "n8n-nodes-base.httpRequest",
+			"typeVersion": 4.1,
+			"position": [900, 1920],
+			"continueOnFail": true
+		},
+		{
+			"parameters": {
+				"content": "### Next URL\nResponse Format: Autodetect\nActual Response Format: JSON",
+				"height": 458.3224664750446,
+				"width": 323.21100909416833
+			},
+			"id": "d0f3ef25-fdab-4d05-a913-9ac93d0c4b9c",
+			"name": "Sticky Note6",
+			"type": "n8n-nodes-base.stickyNote",
+			"typeVersion": 1,
+			"position": [820, -1280]
+		},
+		{
+			"parameters": {
+				"content": "# Response Format: Autodetect\n",
+				"width": 545.8929725020898
+			},
+			"id": "f4c57fc9-8cc4-44ee-a4e6-73b2fa24f4d7",
+			"name": "Sticky Note7",
+			"type": "n8n-nodes-base.stickyNote",
+			"typeVersion": 1,
+			"position": [200, -1272]
+		},
+		{
+			"parameters": {
+				"content": "# Response Format: set",
+				"width": 545.8929725020898
+			},
+			"id": "368400f3-3e43-4f0c-9d4b-b5e01e7f91a5",
+			"name": "Sticky Note8",
+			"type": "n8n-nodes-base.stickyNote",
+			"typeVersion": 1,
+			"position": [220, -340]
+		},
+		{
+			"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": "e4bf07be-251f-4f65-88f8-50a247530ca1",
+			"name": "Complete Expression - JSON Autodetect set",
+			"type": "n8n-nodes-base.httpRequest",
+			"typeVersion": 4.1,
+			"position": [880, -1192]
+		},
+		{
+			"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": "b8f606c8-c559-4616-8760-b110b6dbecda",
+			"name": "Complete Expression - JSON unset",
+			"type": "n8n-nodes-base.httpRequest",
+			"typeVersion": 4.1,
+			"position": [880, -1012]
+		},
+		{
+			"parameters": {},
+			"id": "bd5ecfef-05d2-4b09-906d-9989f162ecfa",
+			"name": "No Operation, do nothing1",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [420, 520]
+		},
+		{
+			"parameters": {},
+			"id": "2be55c5f-3986-4631-bb9e-54a1f87e95b9",
+			"name": "Data 2",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [120, 0]
+		},
+		{
+			"parameters": {},
+			"id": "0e5cdaf4-5766-4c0c-b89b-790951caa9b2",
+			"name": "Data 1",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [440, -1020]
+		},
+		{
+			"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": "d348ab0a-99c8-4151-bd15-fad4a247834e",
+			"name": "Response Empty - Text1",
+			"type": "n8n-nodes-base.httpRequest",
+			"typeVersion": 4.1,
+			"position": [880, -720]
+		},
+		{
+			"parameters": {
+				"content": "### Next URL\nResponse Format: Autodetect\nActual Response Format: text",
+				"height": 437.60980047313967,
+				"width": 323.31395441111135
+			},
+			"id": "4be6d042-ee89-45da-bcac-07f9c4ce4dac",
+			"name": "Sticky Note9",
+			"type": "n8n-nodes-base.stickyNote",
+			"typeVersion": 1,
+			"position": [820, -806.2261914090556]
+		},
+		{
+			"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": "5b482293-5176-4408-a56f-036a2a8b16e8",
+			"name": "Response Empty - Include Full Response1",
+			"type": "n8n-nodes-base.httpRequest",
+			"typeVersion": 4.1,
+			"position": [880, -540]
+		}
+	],
+	"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
+				}
+			}
+		]
+	},
+	"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
+					}
+				]
+			]
+		},
+		"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
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {
+		"executionOrder": "v1"
+	},
+	"versionId": "24c0feef-1565-4936-a28f-7111760e6204",
+	"id": "ZKVF9JrrzoxXbUqu",
+	"meta": {
+		"instanceId": "021d3c82ba2d3bc090cbf4fc81c9312668bcc34297e022bb3438c5c88a43a5ff"
+	},
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/Hubspot/HubspotTrigger.node.ts b/packages/nodes-base/nodes/Hubspot/HubspotTrigger.node.ts
index 8c0cd5d8ad..63bd7905fa 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,
@@ -12,8 +13,6 @@ import { NodeOperationError } from 'n8n-workflow';
 
 import { hubspotApiRequest, propertyEvents } from './V1/GenericFunctions';
 
-import { createHash } from 'crypto';
-
 export class HubspotTrigger implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'HubSpot Trigger',
diff --git a/packages/nodes-base/nodes/Hubspot/V1/GenericFunctions.ts b/packages/nodes-base/nodes/Hubspot/V1/GenericFunctions.ts
index b93c778ed2..2e9ce210c1 100644
--- a/packages/nodes-base/nodes/Hubspot/V1/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Hubspot/V1/GenericFunctions.ts
@@ -11,7 +11,7 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import moment from 'moment';
+import moment from 'moment-timezone';
 
 export async function hubspotApiRequest(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
diff --git a/packages/nodes-base/nodes/Hubspot/V1/HubspotV1.node.ts b/packages/nodes-base/nodes/Hubspot/V1/HubspotV1.node.ts
index 35d7c9f598..68d963e5f3 100644
--- a/packages/nodes-base/nodes/Hubspot/V1/HubspotV1.node.ts
+++ b/packages/nodes-base/nodes/Hubspot/V1/HubspotV1.node.ts
@@ -15,6 +15,7 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
+import { snakeCase } from 'change-case';
 import {
 	clean,
 	getAssociations,
@@ -45,8 +46,6 @@ import type { IForm } from './FormInterface';
 
 import type { IAssociation, IDeal } from './DealInterface';
 
-import { snakeCase } from 'change-case';
-
 export class HubspotV1 implements INodeType {
 	description: INodeTypeDescription;
 
diff --git a/packages/nodes-base/nodes/Hubspot/V2/CompanyDescription.ts b/packages/nodes-base/nodes/Hubspot/V2/CompanyDescription.ts
index 93361b27dd..04244059e1 100644
--- a/packages/nodes-base/nodes/Hubspot/V2/CompanyDescription.ts
+++ b/packages/nodes-base/nodes/Hubspot/V2/CompanyDescription.ts
@@ -518,7 +518,7 @@ export const companyFields: INodeProperties[] = [
 				description: 'The domain name of the company or organization',
 			},
 			{
-				displayName: 'Company Owmer Name or ID',
+				displayName: 'Company Owner Name or ID',
 				name: 'companyOwner',
 				type: 'options',
 				typeOptions: {
diff --git a/packages/nodes-base/nodes/Hubspot/V2/GenericFunctions.ts b/packages/nodes-base/nodes/Hubspot/V2/GenericFunctions.ts
index 9604dba0c6..a0a8a8f570 100644
--- a/packages/nodes-base/nodes/Hubspot/V2/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Hubspot/V2/GenericFunctions.ts
@@ -11,7 +11,7 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import moment from 'moment';
+import moment from 'moment-timezone';
 
 export async function hubspotApiRequest(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
diff --git a/packages/nodes-base/nodes/Hubspot/V2/HubspotV2.node.ts b/packages/nodes-base/nodes/Hubspot/V2/HubspotV2.node.ts
index 8ea7260900..29fc18c015 100644
--- a/packages/nodes-base/nodes/Hubspot/V2/HubspotV2.node.ts
+++ b/packages/nodes-base/nodes/Hubspot/V2/HubspotV2.node.ts
@@ -17,6 +17,8 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
+import { snakeCase } from 'change-case';
+import { generatePairedItemData } from '../../../utils/utilities';
 import {
 	clean,
 	getAssociations,
@@ -45,9 +47,6 @@ import type { IForm } from './FormInterface';
 
 import type { IAssociation, IDeal } from './DealInterface';
 
-import { snakeCase } from 'change-case';
-import { generatePairedItemData } from '../../../utils/utilities';
-
 export class HubspotV2 implements INodeType {
 	description: INodeTypeDescription;
 
@@ -2359,6 +2358,13 @@ export class HubspotV2 implements INodeType {
 									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',
diff --git a/packages/nodes-base/nodes/Hubspot/hubspot.svg b/packages/nodes-base/nodes/Hubspot/hubspot.svg
index d2ea2822e5..2b937259e9 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/ProfileDescription.ts b/packages/nodes-base/nodes/HumanticAI/ProfileDescription.ts
index f12dc4b4d4..e27350232e 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/ICalendar/ICalendar.node.json b/packages/nodes-base/nodes/ICalendar/ICalendar.node.json
index df29a9b3bc..980ffbe77f 100644
--- a/packages/nodes-base/nodes/ICalendar/ICalendar.node.json
+++ b/packages/nodes-base/nodes/ICalendar/ICalendar.node.json
@@ -6,7 +6,7 @@
 	"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/"
 			}
 		]
 	},
diff --git a/packages/nodes-base/nodes/ICalendar/ICalendar.node.ts b/packages/nodes-base/nodes/ICalendar/ICalendar.node.ts
index c08c2b72e2..f24a3644d7 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);
+
+		let returnData: INodeExecutionData[] = [];
+
 		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;
-				}
-
-				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,
-					},
-				});
-			}
+			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 0000000000..22f263a8c1
--- /dev/null
+++ b/packages/nodes-base/nodes/ICalendar/createEvent.operation.ts
@@ -0,0 +1,376 @@
+import {
+	type IExecuteFunctions,
+	type IDataObject,
+	type INodeExecutionData,
+	type INodeProperties,
+	NodeOperationError,
+} from 'n8n-workflow';
+
+import moment from 'moment-timezone';
+import * as ics from 'ics';
+import { promisify } from 'util';
+
+const createEvent = promisify(ics.createEvent);
+
+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/If/If.node.ts b/packages/nodes-base/nodes/If/If.node.ts
index cc4c6a1a37..0e0f55f21f 100644
--- a/packages/nodes-base/nodes/If/If.node.ts
+++ b/packages/nodes-base/nodes/If/If.node.ts
@@ -1,489 +1,25 @@
-import moment from 'moment';
-import type {
-	IExecuteFunctions,
-	INodeExecutionData,
-	INodeParameters,
-	INodeType,
-	INodeTypeDescription,
-	NodeParameterValue,
-} from 'n8n-workflow';
-import { NodeOperationError } from 'n8n-workflow';
+import type { INodeTypeBaseDescription, IVersionedNodeType } from 'n8n-workflow';
+import { VersionedNodeType } 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',
-			},
-		],
-	};
+import { IfV1 } from './V1/IfV1.node';
+import { IfV2 } from './V2/IfV2.node';
 
-	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);
-			},
+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 (item.pairedItem === undefined) {
-				item.pairedItem = [{ item: itemIndex }];
-			}
-
-			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 0000000000..39e340c1db
--- /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 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);
+			},
+		};
+
+		// 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 0000000000..7bc75bda48
--- /dev/null
+++ b/packages/nodes-base/nodes/If/V2/IfV2.node.ts
@@ -0,0 +1,111 @@
+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'],
+			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 to change the operator, switch ON the option 'Less Strict Type Validation', or change the type with an expression",
+						);
+					}
+					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.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/If.node.test.ts b/packages/nodes-base/nodes/If/test/v1/If.node.test.ts
similarity index 100%
rename from packages/nodes-base/nodes/If/test/If.node.test.ts
rename to packages/nodes-base/nodes/If/test/v1/If.node.test.ts
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 0000000000..97f56cb654
--- /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 0000000000..d0531ff3c2
--- /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 0000000000..3f275a3f23
--- /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 0000000000..6aa67c9272
--- /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 0000000000..b6092baa85
--- /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/Interval/Interval.node.ts b/packages/nodes-base/nodes/Interval/Interval.node.ts
index 496f3df994..b4a2f088c8 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/InvoiceNinja.node.ts b/packages/nodes-base/nodes/InvoiceNinja/InvoiceNinja.node.ts
index 63cf573123..a14643d6fe 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;
diff --git a/packages/nodes-base/nodes/InvoiceNinja/QuoteInterface.ts b/packages/nodes-base/nodes/InvoiceNinja/QuoteInterface.ts
index f1e5329e41..7784f880c7 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 22a8728ae4..752fbbf4a7 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 5e0000cd16..fb0d71c694 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 d454c14e92..e6b413ed11 100644
--- a/packages/nodes-base/nodes/ItemLists/ItemLists.node.ts
+++ b/packages/nodes-base/nodes/ItemLists/ItemLists.node.ts
@@ -12,9 +12,10 @@ 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: 3,
+			defaultVersion: 3.1,
 		};
 
 		const nodeVersions: IVersionedNodeType['nodeVersions'] = {
@@ -23,6 +24,7 @@ export class ItemLists extends VersionedNodeType {
 			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 cf6784e1d6..545b83502d 100644
--- a/packages/nodes-base/nodes/ItemLists/V1/ItemListsV1.node.ts
+++ b/packages/nodes-base/nodes/ItemLists/V1/ItemListsV1.node.ts
@@ -57,8 +57,8 @@ const shuffleArray = (array: any[]) => {
 	}
 };
 
-import * as summarize from './summarize.operation';
 import { sortByCode } from '../V3/helpers/utils';
+import * as summarize from './summarize.operation';
 
 export class ItemListsV1 implements INodeType {
 	description: INodeTypeDescription;
@@ -596,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
diff --git a/packages/nodes-base/nodes/ItemLists/V2/ItemListsV2.node.ts b/packages/nodes-base/nodes/ItemLists/V2/ItemListsV2.node.ts
index c59a0cb0ce..52ca465e49 100644
--- a/packages/nodes-base/nodes/ItemLists/V2/ItemListsV2.node.ts
+++ b/packages/nodes-base/nodes/ItemLists/V2/ItemListsV2.node.ts
@@ -58,8 +58,8 @@ const shuffleArray = (array: any[]) => {
 	}
 };
 
-import * as summarize from './summarize.operation';
 import { sortByCode } from '../V3/helpers/utils';
+import * as summarize from './summarize.operation';
 
 export class ItemListsV2 implements INodeType {
 	description: INodeTypeDescription;
@@ -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
diff --git a/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/concatenateItems.operation.ts b/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/concatenateItems.operation.ts
index 9af543ece2..138fd2d276 100644
--- a/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/concatenateItems.operation.ts
+++ b/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/concatenateItems.operation.ts
@@ -7,14 +7,13 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
-import { updateDisplayOptions } from '@utils/utilities';
-
 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[] = [
 	{
diff --git a/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/removeDuplicates.operation.ts b/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/removeDuplicates.operation.ts
index c526ec8425..8b8c7e6948 100644
--- a/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/removeDuplicates.operation.ts
+++ b/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/removeDuplicates.operation.ts
@@ -1,15 +1,14 @@
 import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
-import { updateDisplayOptions } from '@utils/utilities';
-
 import get from 'lodash/get';
 import isEqual from 'lodash/isEqual';
 import lt from 'lodash/lt';
 import pick from 'lodash/pick';
 
-import { compareItems, flattenKeys, prepareFieldsArray } from '../../helpers/utils';
+import { compareItems, flattenKeys, prepareFieldsArray, typeToNumber } from '../../helpers/utils';
 import { disableDotNotationBoolean } from '../common.descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
@@ -106,6 +105,7 @@ export async function execute(
 		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)
@@ -164,24 +164,28 @@ export async function execute(
 				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]);
+			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;
 			}
@@ -211,7 +215,7 @@ export async function execute(
 					`'${key}' field is missing from some input items`,
 				);
 			}
-			if (type !== undefined && value !== undefined && type !== typeof value) {
+			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',
 				});
diff --git a/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/sort.operation.ts b/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/sort.operation.ts
index fc67372aa3..efc979917d 100644
--- a/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/sort.operation.ts
+++ b/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/sort.operation.ts
@@ -5,7 +5,6 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
-import { updateDisplayOptions } from '@utils/utilities';
 
 import get from 'lodash/get';
 
@@ -14,6 +13,7 @@ import lt from 'lodash/lt';
 
 import { shuffleArray, sortByCode } from '../../helpers/utils';
 import { disableDotNotationBoolean } from '../common.descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
@@ -96,7 +96,7 @@ const properties: INodeProperties[] = [
 		type: 'string',
 		typeOptions: {
 			alwaysOpenEditWindow: true,
-			editor: 'code',
+			editor: 'jsEditor',
 			rows: 10,
 		},
 		default: `// The two items to compare are in the variables a and b
diff --git a/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/splitOutItems.operation.ts b/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/splitOutItems.operation.ts
index 35b162ef87..13d5bd8918 100644
--- a/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/splitOutItems.operation.ts
+++ b/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/splitOutItems.operation.ts
@@ -7,12 +7,11 @@ import type {
 } from 'n8n-workflow';
 import { deepCopy, NodeOperationError } from 'n8n-workflow';
 
-import { updateDisplayOptions } from '@utils/utilities';
-
 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[] = [
 	{
diff --git a/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/summarize.operation.ts b/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/summarize.operation.ts
index 476be2f961..059446ac0f 100644
--- a/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/summarize.operation.ts
+++ b/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/summarize.operation.ts
@@ -7,10 +7,9 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
-import { updateDisplayOptions } from '@utils/utilities';
-
 import get from 'lodash/get';
 import { disableDotNotationBoolean } from '../common.descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
 
 type AggregationType =
 	| 'append'
diff --git a/packages/nodes-base/nodes/ItemLists/V3/actions/versionDescription.ts b/packages/nodes-base/nodes/ItemLists/V3/actions/versionDescription.ts
index 728f646769..8c992a308e 100644
--- a/packages/nodes-base/nodes/ItemLists/V3/actions/versionDescription.ts
+++ b/packages/nodes-base/nodes/ItemLists/V3/actions/versionDescription.ts
@@ -10,7 +10,7 @@ export const versionDescription: INodeTypeDescription = {
 	group: ['input'],
 	subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
 	description: 'Helper for working with lists of items and transforming arrays',
-	version: 3,
+	version: [3, 3.1],
 	defaults: {
 		name: 'Item Lists',
 	},
diff --git a/packages/nodes-base/nodes/ItemLists/V3/helpers/utils.ts b/packages/nodes-base/nodes/ItemLists/V3/helpers/utils.ts
index 8f2337ec4d..49b648527d 100644
--- a/packages/nodes-base/nodes/ItemLists/V3/helpers/utils.ts
+++ b/packages/nodes-base/nodes/ItemLists/V3/helpers/utils.ts
@@ -5,8 +5,9 @@ import type {
 	IBinaryData,
 	INode,
 	INodeExecutionData,
+	GenericValue,
 } from 'n8n-workflow';
-import { NodeOperationError } from 'n8n-workflow';
+import { ApplicationError, NodeOperationError } from 'n8n-workflow';
 
 import get from 'lodash/get';
 import isEqual from 'lodash/isEqual';
@@ -61,8 +62,9 @@ export const prepareFieldsArray = (fields: string | string[], fieldName = 'Field
 	if (Array.isArray(fields)) {
 		return fields;
 	}
-	throw new Error(
+	throw new ApplicationError(
 		`The \'${fieldName}\' parameter must be a string of fields separated by commas or an array of strings.`,
+		{ level: 'warning' },
 	);
 };
 
@@ -147,3 +149,22 @@ export function addBinariesToItem(
 
 	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 56100defce..d1b86dff14 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/workflow.removeDuplicates_3_1.json b/packages/nodes-base/nodes/ItemLists/test/node/workflow.removeDuplicates_3_1.json
new file mode 100644
index 0000000000..4a37795065
--- /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/Iterable/Iterable.node.json b/packages/nodes-base/nodes/Iterable/Iterable.node.json
index 8c759c8017..bcba64b39f 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 e4d48b983a..ddc10590ba 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/jenkins.svg b/packages/nodes-base/nodes/Jenkins/jenkins.svg
index ed609c41d5..59187b8c57 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 7dbd16c86d..a646aa60bd 100644
--- a/packages/nodes-base/nodes/Jira/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Jira/GenericFunctions.ts
@@ -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.",
diff --git a/packages/nodes-base/nodes/Jira/IssueAttachmentDescription.ts b/packages/nodes-base/nodes/Jira/IssueAttachmentDescription.ts
index c0b1719033..d46a86235b 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/Jira.node.ts b/packages/nodes-base/nodes/Jira/Jira.node.ts
index 9d5826a6d0..8699125d21 100644
--- a/packages/nodes-base/nodes/Jira/Jira.node.ts
+++ b/packages/nodes-base/nodes/Jira/Jira.node.ts
@@ -183,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;
diff --git a/packages/nodes-base/nodes/Jira/jira.svg b/packages/nodes-base/nodes/Jira/jira.svg
index 760d690dac..9f50ef6ef0 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/JotFormTrigger.node.ts b/packages/nodes-base/nodes/JotForm/JotFormTrigger.node.ts
index 25f13ab4aa..0caf61d518 100644
--- a/packages/nodes-base/nodes/JotForm/JotFormTrigger.node.ts
+++ b/packages/nodes-base/nodes/JotForm/JotFormTrigger.node.ts
@@ -88,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;
diff --git a/packages/nodes-base/nodes/Kafka/Kafka.node.ts b/packages/nodes-base/nodes/Kafka/Kafka.node.ts
index 9f34b384e2..1a971f0deb 100644
--- a/packages/nodes-base/nodes/Kafka/Kafka.node.ts
+++ b/packages/nodes-base/nodes/Kafka/Kafka.node.ts
@@ -14,7 +14,7 @@ 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 {
@@ -229,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,
diff --git a/packages/nodes-base/nodes/Kafka/kafka.svg b/packages/nodes-base/nodes/Kafka/kafka.svg
index 4499e6a9cd..9ef827e234 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 7a9cdb1239..6471c1e5dc 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/Keap.node.ts b/packages/nodes-base/nodes/Keap/Keap.node.ts
index e2c646400a..746e8b9634 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',
diff --git a/packages/nodes-base/nodes/Keap/KeapTrigger.node.ts b/packages/nodes-base/nodes/Keap/KeapTrigger.node.ts
index 8933f9c6c7..9fd1f6fd7f 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/kitemaker.svg b/packages/nodes-base/nodes/Kitemaker/kitemaker.svg
index 1e26da9261..db36157041 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 8e15042e72..868d1538d7 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/koBoToolbox.svg b/packages/nodes-base/nodes/KoBoToolbox/koBoToolbox.svg
index a26f0eb303..e1e33e56e9 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/ldap.svg b/packages/nodes-base/nodes/Ldap/ldap.svg
index d26ad23af7..116934012e 100644
--- a/packages/nodes-base/nodes/Ldap/ldap.svg
+++ b/packages/nodes-base/nodes/Ldap/ldap.svg
@@ -1 +1 @@
-<svg class="svg-icon" style="width: 1em; height: 1em;vertical-align: middle;fill: currentColor;overflow: hidden;" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><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 0.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 32z"  /><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-32zM639.4 412.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-32zM40.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.4zM502.2 805.6c0-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-117z m-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.6zM585.5 664.7l-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.2z m0.1 169.5l35.3-100.6h1.3l35 100.6h-71.6zM896.3 645.5h-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.2z m45.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.6z"  /></svg>
+<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/Lemlist.node.json b/packages/nodes-base/nodes/Lemlist/Lemlist.node.json
index ea5db73535..ad4187c070 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 2d4ea625c0..2f8652655c 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',
diff --git a/packages/nodes-base/nodes/Lemlist/LemlistTrigger.node.json b/packages/nodes-base/nodes/Lemlist/LemlistTrigger.node.json
index e6940412d6..35a65a1950 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 b96f4b0d70..9905197750 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/NotificationDescription.ts b/packages/nodes-base/nodes/Line/NotificationDescription.ts
index 289a01ceb2..b4ce909de0 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/linear.svg b/packages/nodes-base/nodes/Linear/linear.svg
index 48f134ba9e..0a52e7ddb8 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/LinkedIn/LinkedIn.node.json b/packages/nodes-base/nodes/LinkedIn/LinkedIn.node.json
index a3db83c26b..01509a97af 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 89fdfadbf6..4f95de5c7d 100644
--- a/packages/nodes-base/nodes/LinkedIn/LinkedIn.node.ts
+++ b/packages/nodes-base/nodes/LinkedIn/LinkedIn.node.ts
@@ -167,6 +167,30 @@ 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;
+								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);
+								Object.assign(articleBody.content.article, { thumbnail: image });
+							}
+
 							Object.assign(body, articleBody);
 							if (description === '') {
 								delete body.description;
diff --git a/packages/nodes-base/nodes/LinkedIn/PostDescription.ts b/packages/nodes-base/nodes/LinkedIn/PostDescription.ts
index 78a4d1ce3c..8f2512f09f 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,
 	},
 	{
@@ -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 1f2df785d3..f2101a8611 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 65b698d0be..3b9dce008d 100644
--- a/packages/nodes-base/nodes/LocalFileTrigger/LocalFileTrigger.node.ts
+++ b/packages/nodes-base/nodes/LocalFileTrigger/LocalFileTrigger.node.ts
@@ -125,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',
@@ -142,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.',
 					},
-
+					{
+						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',
@@ -180,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.',
+					},
 				],
 			},
 		],
@@ -200,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) => {
diff --git a/packages/nodes-base/nodes/LoneScale/GenericFunctions.ts b/packages/nodes-base/nodes/LoneScale/GenericFunctions.ts
index 2f8767a18e..df82c7e060 100644
--- a/packages/nodes-base/nodes/LoneScale/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/LoneScale/GenericFunctions.ts
@@ -1,11 +1,12 @@
 import type { OptionsWithUri } from 'request';
 
-import type {
-	IDataObject,
-	IExecuteFunctions,
-	IHookFunctions,
-	ILoadOptionsFunctions,
-	IWebhookFunctions,
+import {
+	ApplicationError,
+	type IDataObject,
+	type IExecuteFunctions,
+	type IHookFunctions,
+	type ILoadOptionsFunctions,
+	type IWebhookFunctions,
 } from 'n8n-workflow';
 import { BASE_URL } from './constants';
 
@@ -43,7 +44,10 @@ export async function lonescaleApiRequest(
 		if (error.response) {
 			const errorMessage =
 				error.response.body.message || error.response.body.description || error.message;
-			throw new Error(`Autopilot error response [${error.statusCode}]: ${errorMessage}`);
+			throw new ApplicationError(
+				`Autopilot error response [${error.statusCode}]: ${errorMessage}`,
+				{ level: 'warning' },
+			);
 		}
 		throw error;
 	}
diff --git a/packages/nodes-base/nodes/LoneScale/lonescale-logo.svg b/packages/nodes-base/nodes/LoneScale/lonescale-logo.svg
index ecbedb6813..b8a15e6260 100644
--- a/packages/nodes-base/nodes/LoneScale/lonescale-logo.svg
+++ b/packages/nodes-base/nodes/LoneScale/lonescale-logo.svg
@@ -1,8 +1 @@
-<svg width="42" height="43" viewBox="0 0 42 43" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M13.1687 29.3144C12.153 28.2424 11.1101 27.7009 10.068 27.7009C9.78401 27.7016 9.50136 27.7404 9.22768 27.8163C7.4752 28.2933 6.0743 30.2611 5.02863 32.4115C4.80241 32.8757 4.59164 33.3527 4.39995 33.8224C3.73863 35.4596 3.20111 37.1441 2.79192 38.8618C2.7687 38.9595 2.76794 39.0611 2.78969 39.1592C2.81144 39.2572 2.85513 39.349 2.91748 39.4277C2.97983 39.5064 3.05922 39.5699 3.14966 39.6135C3.24011 39.6571 3.33927 39.6797 3.43967 39.6794C3.48536 39.6788 3.53093 39.6745 3.57595 39.6667C5.33952 39.291 7.0691 38.7705 8.74709 38.1104C9.22496 37.916 9.70464 37.7053 10.1761 37.4745C12.1576 36.507 13.9437 35.2033 14.4824 33.5344C14.9248 32.1562 14.4833 30.7353 13.1687 29.3144ZM13.2141 33.1301C12.7599 34.551 10.8303 35.7266 8.91334 36.5724C8.43638 36.7822 7.96124 36.9721 7.50881 37.1429C6.29416 37.5899 5.24485 37.886 4.80786 38.0032L4.35362 38.1259L4.48444 37.6716C4.6089 37.2374 4.9187 36.2181 5.37476 35.0325C5.54556 34.5873 5.73816 34.1158 5.9453 33.6407C6.85379 31.5956 8.12568 29.497 9.57927 29.0982C9.73266 29.0546 9.89131 29.0323 10.0508 29.0319C10.7231 29.0319 11.4426 29.4316 12.1948 30.2238C13.643 31.7882 13.3204 32.7967 13.2141 33.1274V33.1301Z" fill="#4157FF"/>
-<path d="M29.9586 9.6875C29.3957 9.6875 28.8454 9.85443 28.3773 10.1672C27.9092 10.4799 27.5444 10.9245 27.329 11.4446C27.1135 11.9647 27.0572 12.537 27.167 13.0891C27.2768 13.6412 27.5479 14.1484 27.946 14.5465C28.344 14.9445 28.8512 15.2156 29.4033 15.3254C29.9555 15.4353 30.5278 15.3789 31.0479 15.1635C31.5679 14.948 32.0125 14.5832 32.3252 14.1151C32.638 13.6471 32.8049 13.0968 32.8049 12.5338C32.8042 11.7791 32.5041 11.0556 31.9705 10.522C31.4368 9.98833 30.7133 9.68822 29.9586 9.6875ZM29.9586 14.1055C29.6475 14.1055 29.3435 14.0132 29.0848 13.8404C28.8262 13.6676 28.6246 13.4219 28.5056 13.1345C28.3866 12.8471 28.3555 12.5308 28.4163 12.2258C28.4771 11.9207 28.6269 11.6405 28.8469 11.4206C29.067 11.2007 29.3473 11.051 29.6524 10.9904C29.9575 10.9298 30.2737 10.9611 30.5611 11.0803C30.8484 11.1994 31.0939 11.4011 31.2666 11.6599C31.4393 11.9186 31.5314 12.2227 31.5312 12.5338C31.5305 12.9506 31.3645 13.3501 31.0698 13.6447C30.775 13.9393 30.3754 14.105 29.9586 14.1055Z" fill="#4157FF"/>
-<path d="M31.3685 22.5821L31.373 22.4913L31.4375 22.4241C34.4083 19.2816 36.4088 16.4734 37.737 14.0378C38.009 13.5387 38.2537 13.0563 38.4711 12.5905C41.1257 6.91789 40.0355 3.55919 39.8338 3.03681C39.7905 2.92221 39.7149 2.82258 39.6163 2.74989C39.5177 2.6772 39.4001 2.63456 39.2778 2.62708C38.9308 2.60709 38.5792 2.59619 38.2321 2.59619C35.6938 2.59619 33.0692 3.15128 30.4128 4.23148C29.9125 4.43498 29.4107 4.65726 28.9074 4.89831C25.9411 6.32101 22.9522 8.39056 20.015 11.0761C19.767 11.305 19.5226 11.5303 19.2883 11.7593L19.2256 11.8174L19.1411 11.8256C10.2914 12.8476 6.79557 16.9667 6.6493 17.1384C6.57823 17.225 6.53103 17.3286 6.51238 17.4391C6.49374 17.5495 6.50429 17.6629 6.54301 17.768C6.58171 17.8729 6.64763 17.9657 6.734 18.0367C6.82037 18.1078 6.92408 18.1546 7.0345 18.1723L12.7707 19.128L12.5309 19.4624C12.2456 19.8576 12.0857 20.0983 12.0594 20.1374C11.9778 20.2599 11.9413 20.4069 11.9561 20.5534C11.9708 20.6999 12.0359 20.8367 12.1402 20.9405L15.3681 24.1684C15.4902 24.2903 15.6521 24.364 15.8242 24.3761C15.9963 24.3881 16.167 24.3376 16.3048 24.2338L16.8326 23.8349L13.4158 20.419L13.5429 20.2437C15.0801 18.1223 21.7385 9.43714 30.3392 5.64964C30.8207 5.43705 31.3103 5.23809 31.8037 5.05912C33.8578 4.31233 36.0063 3.86626 38.2113 3.86626L38.5447 3.87172H38.7536L38.7927 4.07794C38.9871 5.18176 39.1152 7.60744 37.678 11.1324C37.4917 11.593 37.2782 12.0727 37.0338 12.5696C35.4467 15.8057 32.5822 19.8194 27.5356 24.4709C27.5356 24.4709 25.1953 22.0379 24.1251 20.9187C23.9846 20.7705 23.7913 20.6837 23.5873 20.677C23.3832 20.6704 23.1847 20.7445 23.0349 20.8832C22.2781 21.581 21.147 22.6276 21.147 22.6276C21.1254 22.6481 21.1054 22.6703 21.0871 22.6939V22.6893C21.0644 22.712 20.5992 23.2181 20.5538 23.4725C20.5542 23.4752 20.5542 23.4779 20.5538 23.4806C20.5343 23.6045 20.5436 23.7312 20.5809 23.851C20.6183 23.9707 20.6827 24.0802 20.7691 24.1711C21.0353 24.4645 23.1466 26.6749 23.9752 27.5125L23.9952 27.5334C23.4737 27.9604 22.0483 29.0779 22.0483 29.0779C21.4932 28.5246 18.1708 25.0505 18.1672 25.026C18.1445 25.0496 17.6802 25.5547 17.6339 25.8091V25.8164C17.6149 25.9406 17.6246 26.0675 17.662 26.1875C17.6995 26.3074 17.7638 26.4173 17.8501 26.5086C18.1163 26.8012 20.2276 29.0115 21.0553 29.8483L21.564 30.357C21.6223 30.417 21.6921 30.4646 21.7692 30.4969C21.8463 30.5293 21.9292 30.5456 22.0128 30.5451C22.1517 30.5449 22.2866 30.4993 22.3971 30.4152L22.9286 30.0063L23.3828 29.6538L24.3286 35.4618C24.348 35.5821 24.4016 35.6942 24.4829 35.7849C24.5643 35.8755 24.6699 35.9409 24.7874 35.9733C24.8416 35.9893 24.898 35.9972 24.9545 35.9969C25.1464 35.9866 25.3264 35.9007 25.4551 35.758C30.7543 30.4124 31.3685 22.6584 31.3685 22.5821ZM8.49081 17.1257L8.96868 16.7669C10.4059 15.6985 12.9542 14.2558 16.9334 13.459L17.7175 13.3001L17.166 13.8815C15.9604 15.1606 14.8039 16.498 13.7346 17.8643L13.6438 17.9833L8.49081 17.1257ZM24.5266 28.7453L25.248 28.1503C25.3264 28.0858 25.3907 28.0057 25.4366 27.9151C25.4826 27.8245 25.5092 27.7254 25.515 27.624C25.5207 27.5226 25.5053 27.4211 25.4698 27.3259C25.4344 27.2307 25.3795 27.1439 25.3088 27.071C24.265 25.9926 22.0964 23.7505 21.9474 23.5969C22.0719 23.4779 22.2263 23.3316 22.4089 23.1599C22.7096 22.8774 23.0867 22.524 23.5318 22.1261C23.7989 22.4177 27.462 26.2334 27.4738 26.2206L29.5451 24.3301L29.4725 25.0178C29.139 28.0985 26.9732 31.5408 25.7149 33.3196L25.3515 33.8265L24.5266 28.7453Z" fill="#090F47"/>
-<path d="M19.1122 32.4668L10.0845 23.4391C10.0124 23.3673 9.96826 23.2722 9.95993 23.1708C9.95161 23.0694 9.97968 22.9684 10.0391 22.8858L10.3843 22.4052C10.4206 22.3546 10.4675 22.3125 10.5217 22.2819C10.576 22.2512 10.6362 22.2327 10.6983 22.2277C10.7604 22.2227 10.8228 22.2313 10.8812 22.2528C10.9397 22.2744 10.9927 22.3084 11.0366 22.3525L20.1852 31.5029C20.2283 31.5461 20.2618 31.598 20.2833 31.6552C20.3048 31.7123 20.3139 31.7734 20.31 31.8344C20.306 31.8953 20.2891 31.9548 20.2604 32.0087C20.2317 32.0626 20.1918 32.1097 20.1434 32.147L19.6764 32.5022C19.5941 32.5657 19.4914 32.5971 19.3877 32.5906C19.2839 32.5841 19.186 32.5401 19.1122 32.4668Z" fill="#4157FF"/>
-<path d="M38.9937 14.4603C39.8962 16.7381 40.3586 19.1664 40.3564 21.6165C40.3564 32.3576 31.6185 41.0955 20.8747 41.0955C17.5369 41.0998 14.2547 40.2404 11.3473 38.6008C11.1444 38.7068 10.94 38.8103 10.7341 38.9115C10.437 39.0559 10.1372 39.194 9.8374 39.3276C13.1451 41.4011 16.9708 42.4991 20.8747 42.4955C32.3871 42.4955 41.7546 33.1307 41.7546 21.6183C41.7579 18.5704 41.0888 15.5593 39.795 12.7996C39.564 13.3698 39.2963 13.9246 38.9937 14.4603Z" fill="#090F47"/>
-<path d="M29.9621 2.82513C27.1317 1.44813 24.0249 0.733566 20.8772 0.7356C9.3666 0.7356 3.5185e-05 10.0994 3.5185e-05 21.6128C-0.0072466 25.5659 1.11588 29.4387 3.237 32.7745C3.36418 32.4911 3.49561 32.21 3.63128 31.9314C3.73848 31.7085 3.84902 31.4884 3.96288 31.271C2.2768 28.333 1.3915 25.0038 1.39548 21.6164C1.39548 10.8798 10.1334 2.1374 20.8745 2.1374C23.3446 2.13455 25.7924 2.6042 28.0861 3.52104C28.6684 3.28756 29.2998 3.05044 29.9621 2.82513Z" fill="#4157FF"/>
-</svg>
+<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.svg b/packages/nodes-base/nodes/MQTT/mqtt.svg
index 064a66a61a..acc6eddbd4 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 8a09f8b45b..3e3071cc75 100644
--- a/packages/nodes-base/nodes/Magento/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Magento/GenericFunctions.ts
@@ -10,7 +10,7 @@ import type {
 	INodePropertyOptions,
 	JsonObject,
 } from 'n8n-workflow';
-import { NodeApiError } from 'n8n-workflow';
+import { ApplicationError, NodeApiError } from 'n8n-workflow';
 import type { Filter, Address, Search, FilterGroup, ProductAttribute } from './types';
 
 export async function magentoApiRequest(
@@ -480,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 31590fd4a4..e23620e452 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,
@@ -37,8 +38,6 @@ import type {
 	Search,
 } from './types';
 
-import { capitalCase } from 'change-case';
-
 export class Magento2 implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Magento 2',
diff --git a/packages/nodes-base/nodes/Magento/magento.svg b/packages/nodes-base/nodes/Magento/magento.svg
index 7f18f4eeb8..6d4effc0cf 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/Mailcheck/GenericFunctions.ts b/packages/nodes-base/nodes/Mailcheck/GenericFunctions.ts
index 657c4d077f..e582627f9a 100644
--- a/packages/nodes-base/nodes/Mailcheck/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Mailcheck/GenericFunctions.ts
@@ -1,5 +1,7 @@
 import type { OptionsWithUri } from 'request';
 
+import { ApplicationError } from 'n8n-workflow';
+
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -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 e813ecc09b..5c90a04db8 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 4a2a11d88d..3ff692daab 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/Mailchimp.node.json b/packages/nodes-base/nodes/Mailchimp/Mailchimp.node.json
index 25660115fc..9706e68aa6 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 f478aae966..07d8345826 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',
diff --git a/packages/nodes-base/nodes/Mailchimp/MailchimpTrigger.node.json b/packages/nodes-base/nodes/Mailchimp/MailchimpTrigger.node.json
index 8974b1eb2a..7adc9fa014 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 15cea1fa9f..e2edbe41e0 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 a3ed0a59c7..959a3d2a1b 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/MailerLite.node.json b/packages/nodes-base/nodes/MailerLite/MailerLite.node.json
index a95b8072dc..2da2b12404 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/MailerLiteTrigger.node.json b/packages/nodes-base/nodes/MailerLite/MailerLiteTrigger.node.json
index e5b80786cf..94abbee715 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.svg b/packages/nodes-base/nodes/Mailgun/mailgun.svg
index 88267bf086..09def73c53 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/mailjet.svg b/packages/nodes-base/nodes/Mailjet/mailjet.svg
index 21fd08581d..86c3ae8d9d 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/Mandrill.node.ts b/packages/nodes-base/nodes/Mandrill/Mandrill.node.ts
index 1ca024a993..ab740ed87d 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;
diff --git a/packages/nodes-base/nodes/Mandrill/mandrill.svg b/packages/nodes-base/nodes/Mandrill/mandrill.svg
index fb88f6f302..3ec59131b4 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 3504a02b4f..b84ba873f7 100644
--- a/packages/nodes-base/nodes/ManualTrigger/ManualTrigger.node.ts
+++ b/packages/nodes-base/nodes/ManualTrigger/ManualTrigger.node.ts
@@ -16,7 +16,7 @@ export class ManualTrigger implements INodeType {
 		eventTriggerDescription: '',
 		maxNodes: 1,
 		defaults: {
-			name: 'When clicking "Execute Workflow"',
+			name: 'When clicking "Test Workflow"',
 			color: '#909298',
 		},
 
@@ -25,7 +25,7 @@ export class ManualTrigger implements INodeType {
 		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 c4bde73bf0..1c75d1093f 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.svg b/packages/nodes-base/nodes/Markdown/markdown.svg
index 24f62fb329..98de0464e1 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/Marketstack/marketstack.svg b/packages/nodes-base/nodes/Marketstack/marketstack.svg
index 25ad681cc9..8e55325a3d 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/Matrix/MediaDescription.ts b/packages/nodes-base/nodes/Matrix/MediaDescription.ts
index 38e78557a2..23f6ddeb0b 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'],
diff --git a/packages/nodes-base/nodes/Mattermost/mattermost.svg b/packages/nodes-base/nodes/Mattermost/mattermost.svg
index 9dc28e2687..d9392b30a8 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/actions/channel/index.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/channel/index.ts
index 08393603ed..26cf5301a3 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 efa2fcf1fe..433e0e95e1 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 60ba78541c..e1da062e19 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 65c25d8da6..099de6e0cd 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 e0f1c0d943..7ac78aea12 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 9dc28e2687..d9392b30a8 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/Mautic/Mautic.node.json b/packages/nodes-base/nodes/Mautic/Mautic.node.json
index c05d7f16cb..e9f83fc777 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 137c4e15a7..4925d409cc 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',
diff --git a/packages/nodes-base/nodes/Mautic/MauticTrigger.node.json b/packages/nodes-base/nodes/Mautic/MauticTrigger.node.json
index eff930493c..2becfe6148 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 0a0ac69608..ad01a3b0d3 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/Medium.node.json b/packages/nodes-base/nodes/Medium/Medium.node.json
index f3a299c3a2..6280f35f4d 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 90e758befd..1ea661f4f4 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/v2/GenericFunctions.ts b/packages/nodes-base/nodes/Merge/v2/GenericFunctions.ts
index 83d5a3deeb..5255ffa392 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,
@@ -332,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' },
 			);
 		}
 	}
@@ -362,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 502422c4fb..c246339c0d 100644
--- a/packages/nodes-base/nodes/Merge/v2/MergeV2.node.ts
+++ b/packages/nodes-base/nodes/Merge/v2/MergeV2.node.ts
@@ -37,7 +37,7 @@ const versionDescription: INodeTypeDescription = {
 	group: ['transform'],
 	version: [2, 2.1, 2.2],
 	subtitle: '={{$parameter["mode"]}}',
-	description: 'Merges data of multiple streams once data from both is available',
+	description: 'Merge data of two inputs once data from both is available',
 	defaults: {
 		name: 'Merge',
 		color: '#00bbcc',
diff --git a/packages/nodes-base/nodes/MessageBird/messagebird.svg b/packages/nodes-base/nodes/MessageBird/messagebird.svg
index 6c4caa7ff3..52b9d8fbed 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 6771aaff68..c533dc74c7 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/MicrosoftDynamicsCrm.node.json b/packages/nodes-base/nodes/Microsoft/Dynamics/MicrosoftDynamicsCrm.node.json
index 7709b0d0bc..48483e1767 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/dynamicsCrm.svg b/packages/nodes-base/nodes/Microsoft/Dynamics/dynamicsCrm.svg
index 7df712843c..03652f8c9b 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/MicrosoftExcel.node.json b/packages/nodes-base/nodes/Microsoft/Excel/MicrosoftExcel.node.json
index b915e85f90..10fbad6b1a 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/excel.svg b/packages/nodes-base/nodes/Microsoft/Excel/excel.svg
index d6a2e5117e..58629f15d6 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
index 2cc7645b04..22d9c91505 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/addTable.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/addTable.test.ts
@@ -1,13 +1,11 @@
 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';
 
-import * as transport from '../../../../v2/transport';
-
-import nock from 'nock';
-
 jest.mock('../../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../../v2/transport');
 	return {
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/append.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/append.test.ts
index 343a978aab..1b7a8ca77d 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/append.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/append.test.ts
@@ -1,13 +1,11 @@
 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';
 
-import * as transport from '../../../../v2/transport';
-
-import nock from 'nock';
-
 jest.mock('../../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../../v2/transport');
 	return {
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/convertToRange.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/convertToRange.test.ts
index 1e76d16cff..90a4b78e3e 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/convertToRange.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/convertToRange.test.ts
@@ -1,13 +1,11 @@
 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';
 
-import * as transport from '../../../../v2/transport';
-
-import nock from 'nock';
-
 jest.mock('../../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../../v2/transport');
 	return {
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/deleteTable.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/deleteTable.test.ts
index fc6acff7ee..80b2d95631 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/deleteTable.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/deleteTable.test.ts
@@ -1,13 +1,11 @@
 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';
 
-import * as transport from '../../../../v2/transport';
-
-import nock from 'nock';
-
 jest.mock('../../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../../v2/transport');
 	return {
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/getColumns.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/getColumns.test.ts
index 87def7c507..1fe39281c3 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/getColumns.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/getColumns.test.ts
@@ -1,13 +1,11 @@
 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';
 
-import * as transport from '../../../../v2/transport';
-
-import nock from 'nock';
-
 jest.mock('../../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../../v2/transport');
 	return {
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/getRows.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/getRows.test.ts
index 890692d879..a80565d582 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/getRows.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/getRows.test.ts
@@ -1,13 +1,11 @@
 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';
 
-import * as transport from '../../../../v2/transport';
-
-import nock from 'nock';
-
 jest.mock('../../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../../v2/transport');
 	return {
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/lookup.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/lookup.test.ts
index 50bcdd89b1..5c1987e200 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/lookup.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/lookup.test.ts
@@ -1,13 +1,11 @@
 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';
 
-import * as transport from '../../../../v2/transport';
-
-import nock from 'nock';
-
 jest.mock('../../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../../v2/transport');
 	return {
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/workbook/addWorksheet.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/workbook/addWorksheet.test.ts
index cf42f7815b..286742018d 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/workbook/addWorksheet.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/workbook/addWorksheet.test.ts
@@ -1,13 +1,11 @@
 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';
 
-import * as transport from '../../../../v2/transport';
-
-import nock from 'nock';
-
 jest.mock('../../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../../v2/transport');
 	return {
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/workbook/deleteWorkbook.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/workbook/deleteWorkbook.test.ts
index e6be58dae1..e8b8f267b0 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/workbook/deleteWorkbook.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/workbook/deleteWorkbook.test.ts
@@ -1,13 +1,11 @@
 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';
 
-import * as transport from '../../../../v2/transport';
-
-import nock from 'nock';
-
 jest.mock('../../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../../v2/transport');
 	return {
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/workbook/getAll.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/workbook/getAll.test.ts
index 55f14e99bd..0af0d596ad 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/workbook/getAll.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/workbook/getAll.test.ts
@@ -1,13 +1,11 @@
 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';
 
-import * as transport from '../../../../v2/transport';
-
-import nock from 'nock';
-
 jest.mock('../../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../../v2/transport');
 	return {
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/append.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/append.test.ts
index f554ed1a4d..0516c329cc 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/append.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/append.test.ts
@@ -1,6 +1,5 @@
-import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers';
-
 import nock from 'nock';
+import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers';
 
 jest.mock('../../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../../v2/transport');
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/clear.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/clear.test.ts
index ed4ee37e20..d018e6dc58 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/clear.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/clear.test.ts
@@ -1,13 +1,11 @@
 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';
 
-import * as transport from '../../../../v2/transport';
-
-import nock from 'nock';
-
 jest.mock('../../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../../v2/transport');
 	return {
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/deleteWorksheet.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/deleteWorksheet.test.ts
index 615887b98f..482fc8fa97 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/deleteWorksheet.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/deleteWorksheet.test.ts
@@ -1,13 +1,11 @@
 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';
 
-import * as transport from '../../../../v2/transport';
-
-import nock from 'nock';
-
 jest.mock('../../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../../v2/transport');
 	return {
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/getAll.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/getAll.test.ts
index c4f98c42ee..5dd8c4feec 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/getAll.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/getAll.test.ts
@@ -1,13 +1,11 @@
 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';
 
-import * as transport from '../../../../v2/transport';
-
-import nock from 'nock';
-
 jest.mock('../../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../../v2/transport');
 	return {
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/readRows.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/readRows.test.ts
index 1f36d50e39..6202e62e89 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/readRows.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/readRows.test.ts
@@ -1,6 +1,5 @@
-import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers';
-
 import nock from 'nock';
+import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers';
 
 jest.mock('../../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../../v2/transport');
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/update.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/update.test.ts
index 55fde1b0f6..9736fb8162 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/update.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/update.test.ts
@@ -1,6 +1,5 @@
-import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers';
-
 import nock from 'nock';
+import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers';
 
 jest.mock('../../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../../v2/transport');
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/upsert.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/upsert.test.ts
index 70308b5a2c..20e2831a06 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/upsert.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/upsert.test.ts
@@ -1,6 +1,5 @@
-import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers';
-
 import nock from 'nock';
+import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers';
 
 jest.mock('../../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../../v2/transport');
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v1/MicrosoftExcelV1.node.ts b/packages/nodes-base/nodes/Microsoft/Excel/v1/MicrosoftExcelV1.node.ts
index d810badc5c..6f9c2a3f81 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/v1/MicrosoftExcelV1.node.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v1/MicrosoftExcelV1.node.ts
@@ -12,6 +12,7 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
+import { generatePairedItemData } from '../../../../utils/utilities';
 import {
 	microsoftApiRequest,
 	microsoftApiRequestAllItems,
@@ -25,7 +26,6 @@ import { worksheetFields, worksheetOperations } from './WorksheetDescription';
 import { tableFields, tableOperations } from './TableDescription';
 
 import { oldVersionNotice } from '@utils/descriptions';
-import { generatePairedItemData } from '../../../../utils/utilities';
 
 const versionDescription: INodeTypeDescription = {
 	displayName: 'Microsoft Excel',
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/addTable.operation.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/addTable.operation.ts
index c678137809..6ab2109211 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/addTable.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/addTable.operation.ts
@@ -4,9 +4,9 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
-import { updateDisplayOptions } from '@utils/utilities';
 import { microsoftApiRequest } from '../../transport';
 import { workbookRLC, worksheetRLC } from '../common.descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	workbookRLC,
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/append.operation.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/append.operation.ts
index 81e8d35f0a..0e542e0d90 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/append.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/append.operation.ts
@@ -4,11 +4,11 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
-import { generatePairedItemData, processJsonInput, updateDisplayOptions } from '@utils/utilities';
 import type { ExcelResponse } from '../../helpers/interfaces';
 import { prepareOutput } from '../../helpers/utils';
 import { microsoftApiRequest } from '../../transport';
 import { tableRLC, workbookRLC, worksheetRLC } from '../common.descriptions';
+import { generatePairedItemData, processJsonInput, updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	workbookRLC,
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/convertToRange.operation.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/convertToRange.operation.ts
index 4d94549866..9b20ab77c3 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/convertToRange.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/convertToRange.operation.ts
@@ -4,9 +4,9 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
-import { updateDisplayOptions } from '@utils/utilities';
 import { microsoftApiRequest } from '../../transport';
 import { tableRLC, workbookRLC, worksheetRLC } from '../common.descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [workbookRLC, worksheetRLC, tableRLC];
 
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/deleteTable.operation.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/deleteTable.operation.ts
index 8d3ff97536..5e1ec86f4f 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/deleteTable.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/deleteTable.operation.ts
@@ -1,7 +1,7 @@
 import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
-import { updateDisplayOptions } from '@utils/utilities';
 import { microsoftApiRequest } from '../../transport';
 import { tableRLC, workbookRLC, worksheetRLC } from '../common.descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [workbookRLC, worksheetRLC, tableRLC];
 
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/getColumns.operation.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/getColumns.operation.ts
index 86bda1a5de..e91596a402 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/getColumns.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/getColumns.operation.ts
@@ -4,9 +4,9 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
-import { updateDisplayOptions } from '@utils/utilities';
 import { microsoftApiRequest, microsoftApiRequestAllItemsSkip } from '../../transport';
 import { tableRLC, workbookRLC, worksheetRLC } from '../common.descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	workbookRLC,
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/getRows.operation.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/getRows.operation.ts
index b3e12c3cd3..4d87b71292 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/getRows.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/getRows.operation.ts
@@ -4,9 +4,9 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
-import { updateDisplayOptions } from '@utils/utilities';
 import { microsoftApiRequest, microsoftApiRequestAllItemsSkip } from '../../transport';
 import { tableRLC, workbookRLC, worksheetRLC } from '../common.descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	workbookRLC,
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/lookup.operation.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/lookup.operation.ts
index 45c1482a36..1c3ed93e58 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/lookup.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/lookup.operation.ts
@@ -6,9 +6,9 @@ import type {
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
-import { updateDisplayOptions } from '@utils/utilities';
 import { microsoftApiRequestAllItemsSkip } from '../../transport';
 import { tableRLC, workbookRLC, worksheetRLC } from '../common.descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	workbookRLC,
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/versionDescription.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/versionDescription.ts
index 128c25231e..76deccbad3 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/versionDescription.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/versionDescription.ts
@@ -27,7 +27,7 @@ export const versionDescription: INodeTypeDescription = {
 	properties: [
 		{
 			displayName:
-				'This node connects to the Microsoft 365 cloud platform. Use the \'Spreadsheet File\' node to directly manipulate spreadsheet files (.xls, .csv, etc). <a href="/templates/890" target="_blank">More info</a>.',
+				'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: '',
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/workbook/addWorksheet.operation.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/workbook/addWorksheet.operation.ts
index 91fb988e37..7b93949c53 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/workbook/addWorksheet.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/workbook/addWorksheet.operation.ts
@@ -4,9 +4,9 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
-import { updateDisplayOptions } from '@utils/utilities';
 import { microsoftApiRequest } from '../../transport';
 import { workbookRLC } from '../common.descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	workbookRLC,
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/workbook/deleteWorkbook.operation.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/workbook/deleteWorkbook.operation.ts
index 9366c43a4a..297fbc37c4 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/workbook/deleteWorkbook.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/workbook/deleteWorkbook.operation.ts
@@ -1,8 +1,8 @@
 import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
-import { updateDisplayOptions } from '@utils/utilities';
 import { microsoftApiRequest } from '../../transport';
 import { workbookRLC } from '../common.descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [workbookRLC];
 
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/workbook/getAll.operation.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/workbook/getAll.operation.ts
index 1533b5afa5..81a2081572 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/workbook/getAll.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/workbook/getAll.operation.ts
@@ -4,8 +4,8 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
-import { updateDisplayOptions } from '@utils/utilities';
 import { microsoftApiRequest, microsoftApiRequestAllItems } from '../../transport';
+import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/append.operation.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/append.operation.ts
index e2807861b2..05247e6780 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/append.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/append.operation.ts
@@ -4,11 +4,11 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
-import { processJsonInput, updateDisplayOptions } from '@utils/utilities';
 import type { ExcelResponse } from '../../helpers/interfaces';
 import { prepareOutput } from '../../helpers/utils';
 import { microsoftApiRequest } from '../../transport';
 import { workbookRLC, worksheetRLC } from '../common.descriptions';
+import { processJsonInput, updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	workbookRLC,
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/clear.operation.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/clear.operation.ts
index b298ed2247..8299ee18b1 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/clear.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/clear.operation.ts
@@ -1,7 +1,7 @@
 import type { INodeExecutionData, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
-import { updateDisplayOptions } from '@utils/utilities';
 import { microsoftApiRequest } from '../../transport';
 import { workbookRLC, worksheetRLC } from '../common.descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	workbookRLC,
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/deleteWorksheet.operation.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/deleteWorksheet.operation.ts
index 5fb00083fa..0ecae73b46 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/deleteWorksheet.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/deleteWorksheet.operation.ts
@@ -1,7 +1,7 @@
 import type { INodeExecutionData, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
-import { updateDisplayOptions } from '@utils/utilities';
 import { microsoftApiRequest } from '../../transport';
 import { workbookRLC, worksheetRLC } from '../common.descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [workbookRLC, worksheetRLC];
 
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/getAll.operation.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/getAll.operation.ts
index 296613b149..3681b60270 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/getAll.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/getAll.operation.ts
@@ -4,9 +4,9 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
-import { updateDisplayOptions } from '@utils/utilities';
 import { microsoftApiRequest, microsoftApiRequestAllItems } from '../../transport';
 import { workbookRLC } from '../common.descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	workbookRLC,
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/readRows.operation.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/readRows.operation.ts
index bbfa6629a4..883139dcc3 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/readRows.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/readRows.operation.ts
@@ -4,11 +4,11 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
-import { updateDisplayOptions } from '@utils/utilities';
 import type { ExcelResponse } from '../../helpers/interfaces';
 import { prepareOutput } from '../../helpers/utils';
 import { microsoftApiRequest } from '../../transport';
 import { workbookRLC, worksheetRLC } from '../common.descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	workbookRLC,
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/update.operation.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/update.operation.ts
index 863a0c4fcf..b87951dbfd 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/update.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/update.operation.ts
@@ -5,11 +5,11 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
-import { generatePairedItemData, processJsonInput, updateDisplayOptions } from '@utils/utilities';
 import type { ExcelResponse, UpdateSummary } from '../../helpers/interfaces';
 import { 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,
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/upsert.operation.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/upsert.operation.ts
index 75484d7783..0db6facace 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/upsert.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/upsert.operation.ts
@@ -5,11 +5,11 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
-import { generatePairedItemData, processJsonInput, updateDisplayOptions } from '@utils/utilities';
 import type { ExcelResponse, UpdateSummary } from '../../helpers/interfaces';
 import { 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,
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/methods/listSearch.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/methods/listSearch.ts
index b47d49c3c2..fa30a1ead5 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/v2/methods/listSearch.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/methods/listSearch.ts
@@ -69,7 +69,7 @@ export async function getWorksheetsList(
 ): Promise<INodeListSearchResult> {
 	const workbookRLC = this.getNodeParameter('workbook') as IDataObject;
 	const workbookId = workbookRLC.value as string;
-	let workbookURL = workbookRLC.cachedResultUrl as string;
+	let workbookURL = (workbookRLC.cachedResultUrl as string) ?? '';
 
 	if (workbookURL.includes('1drv.ms')) {
 		workbookURL = `https://onedrive.live.com/edit.aspx?resid=${workbookId}`;
@@ -91,7 +91,9 @@ export async function getWorksheetsList(
 		results: (response.value as IDataObject[]).map((worksheet: IDataObject) => ({
 			name: worksheet.name as string,
 			value: worksheet.id as string,
-			url: `${workbookURL}&activeCell=${encodeURIComponent(worksheet.name as string)}!A1`,
+			url: workbookURL
+				? `${workbookURL}&activeCell=${encodeURIComponent(worksheet.name as string)}!A1`
+				: undefined,
 		})),
 	};
 }
@@ -101,7 +103,7 @@ export async function getWorksheetTables(
 ): Promise<INodeListSearchResult> {
 	const workbookRLC = this.getNodeParameter('workbook') as IDataObject;
 	const workbookId = workbookRLC.value as string;
-	let workbookURL = workbookRLC.cachedResultUrl as string;
+	let workbookURL = (workbookRLC.cachedResultUrl as string) ?? '';
 
 	if (workbookURL.includes('1drv.ms')) {
 		workbookURL = `https://onedrive.live.com/edit.aspx?resid=${workbookId}`;
@@ -138,9 +140,12 @@ export async function getWorksheetTables(
 
 		const [sheetName, sheetRange] = address.split('!' as string);
 
-		const url = `${workbookURL}&activeCell=${encodeURIComponent(sheetName as string)}${
-			sheetRange ? '!' + (sheetRange as string) : ''
-		}`;
+		let url;
+		if (workbookURL) {
+			url = `${workbookURL}&activeCell=${encodeURIComponent(sheetName as string)}${
+				sheetRange ? '!' + (sheetRange as string) : ''
+			}`;
+		}
 
 		results.push({ name, value, url });
 	}
diff --git a/packages/nodes-base/nodes/Microsoft/GraphSecurity/microsoftGraph.svg b/packages/nodes-base/nodes/Microsoft/GraphSecurity/microsoftGraph.svg
index a490f454d3..76837d5539 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 93b1dbcefd..80e6a71bc5 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/oneDrive.svg b/packages/nodes-base/nodes/Microsoft/OneDrive/oneDrive.svg
index 915d439ed2..ac97d110a8 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/outlook.svg b/packages/nodes-base/nodes/Microsoft/Outlook/outlook.svg
index 6dc221484f..9272b53503 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/v1/MessageAttachmentDescription.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v1/MessageAttachmentDescription.ts
index 7669c2d890..b374a7c1f7 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v1/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
index fa5b5d53e5..a490489c72 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v1/MessageDescription.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v1/MessageDescription.ts
@@ -559,9 +559,9 @@ export const messageFields: 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/v2/MicrosoftOutlookV2.node.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/MicrosoftOutlookV2.node.ts
index ac4cc3eb1b..d1e115f5de 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/MicrosoftOutlookV2.node.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/MicrosoftOutlookV2.node.ts
@@ -1,5 +1,3 @@
-/* eslint-disable n8n-nodes-base/node-filename-against-convention */
-
 import type {
 	IExecuteFunctions,
 	INodeType,
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/calendar/delete.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/calendar/delete.operation.ts
index 087e1b9864..1110077676 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/calendar/delete.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/calendar/delete.operation.ts
@@ -1,7 +1,7 @@
 import type { IExecuteFunctions, INodeProperties } from 'n8n-workflow';
 import { microsoftApiRequest } from '../../transport';
-import { updateDisplayOptions } from '@utils/utilities';
 import { calendarRLC } from '../../descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
 
 export const properties: INodeProperties[] = [calendarRLC];
 
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/calendar/get.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/calendar/get.operation.ts
index a0963c9218..826147db03 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/calendar/get.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/calendar/get.operation.ts
@@ -1,7 +1,7 @@
 import type { IDataObject, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
 import { microsoftApiRequest } from '../../transport';
-import { updateDisplayOptions } from '@utils/utilities';
 import { calendarRLC } from '../../descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
 
 export const properties: INodeProperties[] = [calendarRLC];
 
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/calendar/getAll.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/calendar/getAll.operation.ts
index 9fe31434a3..e122863905 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/calendar/getAll.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/calendar/getAll.operation.ts
@@ -1,7 +1,7 @@
 import type { IDataObject, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
 import { microsoftApiRequest, microsoftApiRequestAllItems } from '../../transport';
-import { updateDisplayOptions } from '@utils/utilities';
 import { returnAllOrLimit } from '../../descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
 
 export const properties: INodeProperties[] = [
 	...returnAllOrLimit,
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/calendar/update.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/calendar/update.operation.ts
index 267bccc7d3..0564a5dc9e 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/calendar/update.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/calendar/update.operation.ts
@@ -1,7 +1,7 @@
 import type { IDataObject, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
 import { microsoftApiRequest } from '../../transport';
-import { updateDisplayOptions } from '@utils/utilities';
 import { calendarRLC } from '../../descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
 
 export const properties: INodeProperties[] = [
 	calendarRLC,
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/contact/delete.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/contact/delete.operation.ts
index 5e2be1dcb0..1037021149 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/contact/delete.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/contact/delete.operation.ts
@@ -1,7 +1,7 @@
 import type { IExecuteFunctions, INodeProperties } from 'n8n-workflow';
 import { microsoftApiRequest } from '../../transport';
-import { updateDisplayOptions } from '@utils/utilities';
 import { contactRLC } from '../../descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
 
 export const properties: INodeProperties[] = [contactRLC];
 
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/contact/get.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/contact/get.operation.ts
index 3bd192ad66..6849d04d46 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/contact/get.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/contact/get.operation.ts
@@ -1,8 +1,8 @@
 import type { IDataObject, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
 import { contactFields } from '../../helpers/utils';
 import { microsoftApiRequest } from '../../transport';
-import { updateDisplayOptions } from '@utils/utilities';
 import { contactRLC } from '../../descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
 
 export const properties: INodeProperties[] = [
 	contactRLC,
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/contact/getAll.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/contact/getAll.operation.ts
index 4217b82b4c..dec28b9dd7 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/contact/getAll.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/contact/getAll.operation.ts
@@ -1,8 +1,8 @@
 import type { IDataObject, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
 import { contactFields } from '../../helpers/utils';
 import { microsoftApiRequest, microsoftApiRequestAllItems } from '../../transport';
-import { updateDisplayOptions } from '@utils/utilities';
 import { returnAllOrLimit } from '../../descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
 
 export const properties: INodeProperties[] = [
 	...returnAllOrLimit,
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/draft/delete.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/draft/delete.operation.ts
index 3bf4f95716..1ff992d821 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/draft/delete.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/draft/delete.operation.ts
@@ -1,7 +1,7 @@
 import type { IExecuteFunctions, INodeProperties } from 'n8n-workflow';
 import { microsoftApiRequest } from '../../transport';
-import { updateDisplayOptions } from '@utils/utilities';
 import { draftRLC } from '../../descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
 
 export const properties: INodeProperties[] = [draftRLC];
 
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/draft/get.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/draft/get.operation.ts
index be252ae435..3e69d91f5b 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/draft/get.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/draft/get.operation.ts
@@ -6,8 +6,8 @@ import type {
 } from 'n8n-workflow';
 import { messageFields, simplifyOutputMessages } from '../../helpers/utils';
 import { downloadAttachments, microsoftApiRequest } from '../../transport';
-import { updateDisplayOptions } from '@utils/utilities';
 import { draftRLC } from '../../descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
 
 export const properties: INodeProperties[] = [
 	draftRLC,
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/draft/send.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/draft/send.operation.ts
index 4cbb353bb4..a97d8a12c5 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/draft/send.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/draft/send.operation.ts
@@ -1,8 +1,8 @@
 import type { IExecuteFunctions, INodeProperties } from 'n8n-workflow';
 import { makeRecipient } from '../../helpers/utils';
 import { microsoftApiRequest } from '../../transport';
-import { updateDisplayOptions } from '@utils/utilities';
 import { draftRLC } from '../../descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
 
 export const properties: INodeProperties[] = [
 	draftRLC,
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/draft/update.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/draft/update.operation.ts
index 70d0ca0306..bc5a03564e 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/draft/update.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/draft/update.operation.ts
@@ -1,8 +1,8 @@
 import type { IDataObject, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
 import { createMessage } from '../../helpers/utils';
 import { microsoftApiRequest } from '../../transport';
-import { updateDisplayOptions } from '@utils/utilities';
 import { draftRLC } from '../../descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
 
 export const properties: INodeProperties[] = [
 	draftRLC,
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/event/create.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/event/create.operation.ts
index 2b7fd8fef3..dd4c7f7bc4 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/event/create.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/event/create.operation.ts
@@ -1,11 +1,10 @@
 import type { IDataObject, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
-import { microsoftApiRequest } from '../../transport';
-import { updateDisplayOptions } from '@utils/utilities';
-
 import { DateTime } from 'luxon';
-import { calendarRLC } from '../../descriptions';
 import moment from 'moment-timezone';
+import { microsoftApiRequest } from '../../transport';
+import { calendarRLC } from '../../descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
 
 export const properties: INodeProperties[] = [
 	calendarRLC,
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/event/delete.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/event/delete.operation.ts
index bcebd39e10..b211ef8c1c 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/event/delete.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/event/delete.operation.ts
@@ -1,8 +1,8 @@
 import type { IExecuteFunctions, INodeProperties } from 'n8n-workflow';
 import { microsoftApiRequest } from '../../transport';
-import { updateDisplayOptions } from '@utils/utilities';
 import { calendarRLC, eventRLC } from '../../descriptions';
 import { decodeOutlookId } from '../../helpers/utils';
+import { updateDisplayOptions } from '@utils/utilities';
 
 export const properties: INodeProperties[] = [calendarRLC, eventRLC];
 
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/event/get.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/event/get.operation.ts
index e0b17cf767..54f32d7935 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/event/get.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/event/get.operation.ts
@@ -1,8 +1,8 @@
 import type { IDataObject, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
 import { decodeOutlookId, eventfields } from '../../helpers/utils';
 import { microsoftApiRequest } from '../../transport';
-import { updateDisplayOptions } from '@utils/utilities';
 import { calendarRLC, eventRLC } from '../../descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
 
 export const properties: INodeProperties[] = [
 	calendarRLC,
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/event/getAll.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/event/getAll.operation.ts
index db234045bc..60246daffa 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/event/getAll.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/event/getAll.operation.ts
@@ -1,8 +1,8 @@
 import type { IDataObject, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
 import { eventfields } from '../../helpers/utils';
 import { microsoftApiRequest, microsoftApiRequestAllItems } from '../../transport';
-import { updateDisplayOptions } from '@utils/utilities';
 import { calendarRLC, returnAllOrLimit } from '../../descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
 
 export const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/event/update.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/event/update.operation.ts
index 014475a3f9..ab3336fd8b 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/event/update.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/event/update.operation.ts
@@ -1,10 +1,10 @@
 import type { IDataObject, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
-import { microsoftApiRequest } from '../../transport';
-import { updateDisplayOptions } from '@utils/utilities';
 
 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,
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folder/create.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folder/create.operation.ts
index 7ae12135a0..ad4d1ef4f1 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folder/create.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folder/create.operation.ts
@@ -1,8 +1,8 @@
 import type { IDataObject, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
 import { microsoftApiRequest } from '../../transport';
-import { updateDisplayOptions } from '@utils/utilities';
 import { folderRLC } from '../../descriptions';
 import { decodeOutlookId } from '../../helpers/utils';
+import { updateDisplayOptions } from '@utils/utilities';
 
 export const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folder/delete.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folder/delete.operation.ts
index 7be79a9adb..2441cf69e4 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folder/delete.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folder/delete.operation.ts
@@ -1,8 +1,8 @@
 import type { IExecuteFunctions, INodeProperties } from 'n8n-workflow';
 import { microsoftApiRequest } from '../../transport';
-import { updateDisplayOptions } from '@utils/utilities';
 import { folderRLC } from '../../descriptions';
 import { decodeOutlookId } from '../../helpers/utils';
+import { updateDisplayOptions } from '@utils/utilities';
 
 export const properties: INodeProperties[] = [folderRLC];
 
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folder/get.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folder/get.operation.ts
index abc38fd81a..6ea2867a4f 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folder/get.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folder/get.operation.ts
@@ -1,8 +1,8 @@
 import type { IDataObject, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
 import { microsoftApiRequest } from '../../transport';
-import { updateDisplayOptions } from '@utils/utilities';
 import { folderFields, folderRLC } from '../../descriptions';
 import { decodeOutlookId } from '../../helpers/utils';
+import { updateDisplayOptions } from '@utils/utilities';
 
 export const properties: INodeProperties[] = [
 	folderRLC,
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folder/getAll.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folder/getAll.operation.ts
index 9d9c7f3b64..91df451340 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folder/getAll.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folder/getAll.operation.ts
@@ -1,7 +1,7 @@
 import type { IDataObject, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
 import { getSubfolders, microsoftApiRequest, microsoftApiRequestAllItems } from '../../transport';
-import { updateDisplayOptions } from '@utils/utilities';
 import { folderFields, folderRLC, returnAllOrLimit } from '../../descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
 
 export const properties: INodeProperties[] = [
 	...returnAllOrLimit,
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folder/update.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folder/update.operation.ts
index 1a4e2e1bb4..41322e4961 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folder/update.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folder/update.operation.ts
@@ -1,8 +1,8 @@
 import type { IDataObject, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
 import { microsoftApiRequest } from '../../transport';
-import { updateDisplayOptions } from '@utils/utilities';
 import { folderRLC } from '../../descriptions';
 import { decodeOutlookId } from '../../helpers/utils';
+import { updateDisplayOptions } from '@utils/utilities';
 
 export const properties: INodeProperties[] = [
 	folderRLC,
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folderMessage/getAll.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folderMessage/getAll.operation.ts
index 027f5122eb..7d3b57c7e0 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folderMessage/getAll.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folderMessage/getAll.operation.ts
@@ -16,8 +16,8 @@ import {
 	microsoftApiRequestAllItems,
 } from '../../transport';
 
-import { updateDisplayOptions } from '@utils/utilities';
 import { folderRLC, returnAllOrLimit } from '../../descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
 
 export const properties: INodeProperties[] = [
 	folderRLC,
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/getAll.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/getAll.operation.ts
index ad266f4313..6991118e14 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/getAll.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/getAll.operation.ts
@@ -10,8 +10,8 @@ import {
 	microsoftApiRequest,
 	microsoftApiRequestAllItems,
 } from '../../transport';
-import { updateDisplayOptions } from '@utils/utilities';
 import { returnAllOrLimit } from '../../descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
 
 export const properties: INodeProperties[] = [
 	...returnAllOrLimit,
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/messageAttachment/add.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/messageAttachment/add.operation.ts
index c4532ba6ac..dd3f596197 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/messageAttachment/add.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/messageAttachment/add.operation.ts
@@ -8,8 +8,8 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 import { microsoftApiRequest } from '../../transport';
-import { updateDisplayOptions } from '@utils/utilities';
 import { messageRLC } from '../../descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
 
 export const properties: INodeProperties[] = [
 	messageRLC,
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/messageAttachment/download.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/messageAttachment/download.operation.ts
index 3a6fbde5e1..3c5d7d81a9 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/messageAttachment/download.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/messageAttachment/download.operation.ts
@@ -1,7 +1,7 @@
 import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
 import { microsoftApiRequest } from '../../transport';
-import { updateDisplayOptions } from '@utils/utilities';
 import { attachmentRLC, messageRLC } from '../../descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
 
 export const properties: INodeProperties[] = [
 	messageRLC,
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/messageAttachment/get.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/messageAttachment/get.operation.ts
index cbc6466cac..16d1b4e749 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/messageAttachment/get.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/messageAttachment/get.operation.ts
@@ -1,7 +1,7 @@
 import type { IDataObject, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
 import { microsoftApiRequest } from '../../transport';
-import { updateDisplayOptions } from '@utils/utilities';
 import { attachmentRLC, messageRLC } from '../../descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
 
 export const properties: INodeProperties[] = [
 	messageRLC,
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/messageAttachment/getAll.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/messageAttachment/getAll.operation.ts
index f0de6687d6..81df8d111a 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/messageAttachment/getAll.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/messageAttachment/getAll.operation.ts
@@ -1,7 +1,7 @@
 import type { IDataObject, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
 import { microsoftApiRequest, microsoftApiRequestAllItems } from '../../transport';
-import { updateDisplayOptions } from '@utils/utilities';
 import { messageRLC, returnAllOrLimit } from '../../descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
 
 export const properties: INodeProperties[] = [
 	messageRLC,
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/helpers/utils.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/helpers/utils.ts
index 3ea607c1d2..85ebecdd9f 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/helpers/utils.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/helpers/utils.ts
@@ -5,7 +5,7 @@ import type {
 	ILoadOptionsFunctions,
 	JsonObject,
 } from 'n8n-workflow';
-import { jsonParse, NodeApiError } from 'n8n-workflow';
+import { ApplicationError, jsonParse, NodeApiError } from 'n8n-workflow';
 
 export const messageFields = [
 	'bccRecipients',
@@ -157,7 +157,9 @@ export function createMessage(fields: IDataObject) {
 			} else if (typeof value === 'string') {
 				message[key] = value.split(',').map((recipient: string) => makeRecipient(recipient.trim()));
 			} else {
-				throw new Error(`The "${key}" field must be a string or an array of strings`);
+				throw new ApplicationError(`The "${key}" field must be a string or an array of strings`, {
+					level: 'warning',
+				});
 			}
 			continue;
 		}
diff --git a/packages/nodes-base/nodes/Microsoft/Sql/GenericFunctions.ts b/packages/nodes-base/nodes/Microsoft/Sql/GenericFunctions.ts
index 6ed51a3190..3e743b07a7 100644
--- a/packages/nodes-base/nodes/Microsoft/Sql/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Microsoft/Sql/GenericFunctions.ts
@@ -1,8 +1,8 @@
 import type { IDataObject, INodeExecutionData } from 'n8n-workflow';
 import { deepCopy } from 'n8n-workflow';
+import mssql from 'mssql';
 import type { ITables, OperationInputData } from './interfaces';
 import { chunk, flatten } from '@utils/utilities';
-import mssql from 'mssql';
 
 /**
  * Returns a copy of the item which only contains the json data and
@@ -111,6 +111,15 @@ export function configurePool(credentials: IDataObject) {
 	return new mssql.ConnectionPool(config);
 }
 
+const escapeTableName = (table: string) => {
+	table = table.trim();
+	if (table.startsWith('[') && table.endsWith(']')) {
+		return table;
+	} else {
+		return `[${table}]`;
+	}
+};
+
 export async function insertOperation(tables: ITables, pool: mssql.ConnectionPool) {
 	return executeQueryQueue(
 		tables,
@@ -128,7 +137,7 @@ export async function insertOperation(tables: ITables, pool: mssql.ConnectionPoo
 					}
 				}
 
-				const query = `INSERT INTO [${table}] (${formatColumns(
+				const query = `INSERT INTO ${escapeTableName(table)} (${formatColumns(
 					columnString,
 				)}) VALUES ${valuesPlaceholder.join(', ')};`;
 
@@ -155,7 +164,9 @@ export async function updateOperation(tables: ITables, pool: mssql.ConnectionPoo
 					request.input(`v${index}`, item[col]);
 				}
 
-				const query = `UPDATE [${table}] SET ${setValues.join(', ')} WHERE ${condition};`;
+				const query = `UPDATE ${escapeTableName(table)} SET ${setValues.join(
+					', ',
+				)} WHERE ${condition};`;
 
 				return request.query(query);
 			});
@@ -182,9 +193,9 @@ export async function deleteOperation(tables: ITables, pool: mssql.ConnectionPoo
 						request.input(`v${index}`, entry[deleteKey]);
 					}
 
-					const query = `DELETE FROM [${table}] WHERE [${deleteKey}] IN (${valuesPlaceholder.join(
-						', ',
-					)});`;
+					const query = `DELETE FROM ${escapeTableName(
+						table,
+					)} WHERE [${deleteKey}] IN (${valuesPlaceholder.join(', ')});`;
 
 					return request.query(query);
 				});
diff --git a/packages/nodes-base/nodes/Microsoft/Sql/MicrosoftSql.node.ts b/packages/nodes-base/nodes/Microsoft/Sql/MicrosoftSql.node.ts
index 4105a7ea2d..b5ad6843c4 100644
--- a/packages/nodes-base/nodes/Microsoft/Sql/MicrosoftSql.node.ts
+++ b/packages/nodes-base/nodes/Microsoft/Sql/MicrosoftSql.node.ts
@@ -36,6 +36,7 @@ export class MicrosoftSql implements INodeType {
 		},
 		inputs: ['main'],
 		outputs: ['main'],
+		parameterPane: 'wide',
 		credentials: [
 			{
 				name: 'microsoftSql',
@@ -88,7 +89,6 @@ export class MicrosoftSql implements INodeType {
 				noDataExpression: true,
 				typeOptions: {
 					editor: 'sqlEditor',
-					rows: 5,
 					sqlDialect: 'MSSQL',
 				},
 				displayOptions: {
@@ -248,7 +248,6 @@ export class MicrosoftSql implements INodeType {
 		const pool = configurePool(credentials);
 		await pool.connect();
 
-		const returnItems: INodeExecutionData[] = [];
 		let responseData: IDataObject | IDataObject[] = [];
 
 		const items = this.getInputData();
@@ -327,12 +326,11 @@ export class MicrosoftSql implements INodeType {
 
 		const itemData = generatePairedItemData(items.length);
 
-		const executionData = this.helpers.constructExecutionMetaData(
+		const returnItems = this.helpers.constructExecutionMetaData(
 			this.helpers.returnJsonArray(responseData),
 			{ itemData },
 		);
 
-		returnItems.push(...executionData);
 		return [returnItems];
 	}
 }
diff --git a/packages/nodes-base/nodes/Microsoft/Sql/mssql.svg b/packages/nodes-base/nodes/Microsoft/Sql/mssql.svg
index 79f8183d8b..2baedc0208 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/Teams/teams.svg b/packages/nodes-base/nodes/Microsoft/Teams/teams.svg
index 33eb50158c..98d3ab7326 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/ToDo/MicrosoftToDo.node.ts b/packages/nodes-base/nodes/Microsoft/ToDo/MicrosoftToDo.node.ts
index 9dfee22438..1b4eded7d1 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',
diff --git a/packages/nodes-base/nodes/Microsoft/ToDo/todo.svg b/packages/nodes-base/nodes/Microsoft/ToDo/todo.svg
index b97f166e23..d8aa68e87c 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/Mindee.node.ts b/packages/nodes-base/nodes/Mindee/Mindee.node.ts
index d42b1f8f8c..e6fefcbd1b 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 d1c6951422..8b9022370b 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 7e50a2816b..2034d8ee8d 100644
--- a/packages/nodes-base/nodes/Misp/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Misp/GenericFunctions.ts
@@ -1,3 +1,4 @@
+import { URL } from 'url';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -10,8 +11,6 @@ import type { OptionsWithUri } from 'request';
 
 import type { MispCredentials } from './types';
 
-import { URL } from 'url';
-
 export async function mispApiRequest(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
 	method: string,
diff --git a/packages/nodes-base/nodes/Misp/misp.svg b/packages/nodes-base/nodes/Misp/misp.svg
index f7c43f7723..71559e3443 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/Mocean/mocean.svg b/packages/nodes-base/nodes/Mocean/mocean.svg
index ed5d0de24e..406a00e517 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/GenericFunctions.ts b/packages/nodes-base/nodes/MondayCom/GenericFunctions.ts
index c9d39eb71e..07f017ff1b 100644
--- a/packages/nodes-base/nodes/MondayCom/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/MondayCom/GenericFunctions.ts
@@ -14,34 +14,31 @@ 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 = {
 		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');
+		let credentialType = 'mondayComApi';
 
-			options.headers = { Authorization: `Bearer ${credentials.apiToken}` };
-
-			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 +47,6 @@ export async function mondayComApiRequest(
 export async function mondayComApiRequestAllItems(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
 	propertyName: string,
-
 	body: any = {},
 ): Promise<any> {
 	const returnData: IDataObject[] = [];
@@ -66,3 +62,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 dd4e10dfad..2056616caa 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
 									}
diff --git a/packages/nodes-base/nodes/MondayCom/mondayCom.svg b/packages/nodes-base/nodes/MondayCom/mondayCom.svg
index e327f8e0c4..ad1ba496e8 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 1be1332537..3dc6be03ab 100644
--- a/packages/nodes-base/nodes/MongoDb/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/MongoDb/GenericFunctions.ts
@@ -8,13 +8,16 @@ import { NodeOperationError } from 'n8n-workflow';
 
 import get from 'lodash/get';
 import set from 'lodash/set';
-import { ObjectId } from 'mongodb';
+import { MongoClient, ObjectId } from 'mongodb';
 import type {
 	IMongoCredentials,
 	IMongoCredentialsType,
 	IMongoParametricCredentials,
 } from './mongoDb.types';
 
+import { createSecureContext } from 'tls';
+import { formatPrivateKey } from '../../utils/utilities';
+
 /**
  * Standard way of building the MongoDB connection string, unless overridden with a provided string
  *
@@ -140,3 +143,30 @@ export function stringifyObjectIDs(items: IDataObject[]) {
 		}
 	});
 }
+
+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 b8a99573f3..f506b26d55 100644
--- a/packages/nodes-base/nodes/MongoDb/MongoDb.node.ts
+++ b/packages/nodes-base/nodes/MongoDb/MongoDb.node.ts
@@ -9,7 +9,7 @@ import type {
 	INodeTypeDescription,
 	JsonObject,
 } from 'n8n-workflow';
-import { NodeOperationError } from 'n8n-workflow';
+import { ApplicationError, NodeOperationError } from 'n8n-workflow';
 
 import type {
 	FindOneAndReplaceOptions,
@@ -17,11 +17,13 @@ import type {
 	UpdateOptions,
 	Sort,
 } from 'mongodb';
-import { MongoClient, ObjectId } from 'mongodb';
+import { ObjectId } from 'mongodb';
+import { generatePairedItemData } from '../../utils/utilities';
 import { nodeProperties } from './MongoDbProperties';
 
 import {
 	buildParameterizedConnString,
+	connectMongoClient,
 	prepareFields,
 	prepareItems,
 	stringifyObjectIDs,
@@ -29,7 +31,6 @@ import {
 } from './GenericFunctions';
 
 import type { IMongoParametricCredentials } from './mongoDb.types';
-import { generatePairedItemData } from '../../utils/utilities';
 
 export class MongoDb implements INodeType {
 	description: INodeTypeDescription = {
@@ -74,13 +75,15 @@ 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) {
@@ -98,12 +101,10 @@ 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);
 
diff --git a/packages/nodes-base/nodes/MongoDb/mongodb.svg b/packages/nodes-base/nodes/MongoDb/mongodb.svg
index d9f0144262..8a5e3e04cb 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/MoveBinaryData/MoveBinaryData.node.json b/packages/nodes-base/nodes/MoveBinaryData/MoveBinaryData.node.json
index b574ff5aad..79435854ea 100644
--- a/packages/nodes-base/nodes/MoveBinaryData/MoveBinaryData.node.json
+++ b/packages/nodes-base/nodes/MoveBinaryData/MoveBinaryData.node.json
@@ -6,7 +6,7 @@
 	"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/"
 			}
 		]
 	},
diff --git a/packages/nodes-base/nodes/MoveBinaryData/MoveBinaryData.node.ts b/packages/nodes-base/nodes/MoveBinaryData/MoveBinaryData.node.ts
index 1467ba4d47..e4c536250a 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 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,11 +42,12 @@ encodeDecodeOptions.sort((a, b) => {
 
 export class MoveBinaryData implements INodeType {
 	description: INodeTypeDescription = {
+		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: {
@@ -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',
@@ -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);
+
+						if (!mimeType) {
+							mimeType = 'application/json';
+						}
 					}
 
-					convertedValue.fileSize = prettyBytes(value.length);
-
-					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 8abf8e2db5..698284f9be 100644
--- a/packages/nodes-base/nodes/MoveBinaryData/test/MoveBinaryData.test.ts
+++ b/packages/nodes-base/nodes/MoveBinaryData/test/MoveBinaryData.test.ts
@@ -1,8 +1,8 @@
 /* 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';
-import path from 'path';
 
 describe('Test Move Binary Data Node', () => {
 	beforeEach(async () => {
@@ -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/MySql/MySql.node.ts b/packages/nodes-base/nodes/MySql/MySql.node.ts
index 80b8e8ba3d..bb82d3e4ca 100644
--- a/packages/nodes-base/nodes/MySql/MySql.node.ts
+++ b/packages/nodes-base/nodes/MySql/MySql.node.ts
@@ -13,6 +13,7 @@ export class MySql extends VersionedNodeType {
 			group: ['input'],
 			defaultVersion: 2.2,
 			description: 'Get, add and update data in MySQL',
+			parameterPane: 'wide',
 		};
 
 		const nodeVersions: IVersionedNodeType['nodeVersions'] = {
diff --git a/packages/nodes-base/nodes/MySql/mysql.svg b/packages/nodes-base/nodes/MySql/mysql.svg
index aa7836e3a3..165fd30c82 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/v2/runQueries.test.ts b/packages/nodes-base/nodes/MySql/test/v2/runQueries.test.ts
index 86dda585e6..cdcf00fd07 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',
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 15c7bd2847..1f98b9adf2 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,7 @@ import {
 	addWhereClauses,
 	addSortRules,
 	replaceEmptyStringsByNulls,
+	escapeSqlIdentifier,
 } from '../../v2/helpers/utils';
 
 const mySqlMockNode: INode = {
@@ -148,3 +149,29 @@ 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`');
+	});
+});
diff --git a/packages/nodes-base/nodes/MySql/v1/MySqlV1.node.ts b/packages/nodes-base/nodes/MySql/v1/MySqlV1.node.ts
index 79d8112ed9..ae3def25eb 100644
--- a/packages/nodes-base/nodes/MySql/v1/MySqlV1.node.ts
+++ b/packages/nodes-base/nodes/MySql/v1/MySqlV1.node.ts
@@ -79,7 +79,6 @@ const versionDescription: INodeTypeDescription = {
 			noDataExpression: true,
 			typeOptions: {
 				editor: 'sqlEditor',
-				rows: 5,
 				sqlDialect: 'MySQL',
 			},
 			displayOptions: {
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 88e93664e0..90e07ae7d2 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 7467558563..3b72573977 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
@@ -13,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[] = [
 	{
@@ -99,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') {
@@ -115,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 c8c04c4a4f..ee173f45aa 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
@@ -26,7 +26,6 @@ const properties: INodeProperties[] = [
 		noDataExpression: true,
 		typeOptions: {
 			editor: 'sqlEditor',
-			rows: 5,
 			sqlDialect: 'MySQL',
 		},
 		hint: 'Consider using query parameters to prevent SQL injection attacks. Add them in the options below',
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 8773b597f1..f3578f8d99 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
@@ -14,11 +14,10 @@ import type {
 
 import { AUTO_MAP, BATCH_MODE, 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[] = [
 	{
@@ -43,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',
@@ -172,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[]),
@@ -215,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 ab00688e8a..7b16574f75 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
@@ -13,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,
@@ -23,6 +21,7 @@ import {
 	selectRowsFixedCollection,
 	combineConditionsCollection,
 } from '../common.descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
@@ -92,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 c613461550..22bc332548 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
@@ -8,11 +8,10 @@ import type {
 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[] = [
 	{
@@ -37,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',
@@ -183,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 157cbcd855..eccc36c0fe 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
@@ -8,11 +8,10 @@ import type {
 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[] = [
 	{
@@ -37,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',
@@ -178,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;
 
@@ -190,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 4528ffcdbe..f5d75347cd 100644
--- a/packages/nodes-base/nodes/MySql/v2/actions/router.ts
+++ b/packages/nodes-base/nodes/MySql/v2/actions/router.ts
@@ -3,13 +3,12 @@ import { NodeOperationError } from 'n8n-workflow';
 
 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[] = [];
diff --git a/packages/nodes-base/nodes/MySql/v2/helpers/utils.ts b/packages/nodes-base/nodes/MySql/v2/helpers/utils.ts
index 5ab326c4e1..4ac1f9b3d5 100644
--- a/packages/nodes-base/nodes/MySql/v2/helpers/utils.ts
+++ b/packages/nodes-base/nodes/MySql/v2/helpers/utils.ts
@@ -9,6 +9,7 @@ import type {
 
 import { NodeOperationError } from 'n8n-workflow';
 
+import { generatePairedItemData } from '../../../../utils/utilities';
 import type {
 	Mysql2Pool,
 	QueryMode,
@@ -19,7 +20,22 @@ import type {
 } from './interfaces';
 
 import { BATCH_MODE } from './interfaces';
-import { generatePairedItemData } from '../../../../utils/utilities';
+
+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 `\`${trimmedPart}\``;
+		})
+		.join('.');
+}
 
 export const prepareQueryAndReplacements = (rawQuery: string, replacements?: QueryValues) => {
 	if (replacements === undefined) {
@@ -35,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, '?');
@@ -379,7 +395,9 @@ export function addWhereClauses(
 
 		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)];
@@ -398,7 +416,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 916d87e7af..b4310480d7 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 b5eb1526d1..2b6db1db0e 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 635329b6ef..7576d7c85c 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 9df57bb846..5abf51a21e 100644
--- a/packages/nodes-base/nodes/MySql/v2/transport/index.ts
+++ b/packages/nodes-base/nodes/MySql/v2/transport/index.ts
@@ -1,10 +1,11 @@
+import { ApplicationError } from 'n8n-workflow';
 import type { ICredentialDataDecryptedObject, IDataObject } from 'n8n-workflow';
-import { formatPrivateKey } from '@utils/utilities';
 
 import mysql2 from 'mysql2/promise';
 import type { Client, ConnectConfig } from 'ssh2';
 
 import type { Mysql2Pool } from '../helpers/interfaces';
+import { formatPrivateKey } from '@utils/utilities';
 
 async function createSshConnectConfig(credentials: IDataObject) {
 	if (credentials.sshAuthenticateWith === 'password') {
@@ -36,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,
@@ -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);
diff --git a/packages/nodes-base/nodes/N8n/ExecutionDescription.ts b/packages/nodes-base/nodes/N8n/ExecutionDescription.ts
index e40317af1e..eb951e19c2 100644
--- a/packages/nodes-base/nodes/N8n/ExecutionDescription.ts
+++ b/packages/nodes-base/nodes/N8n/ExecutionDescription.ts
@@ -1,5 +1,5 @@
-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/N8n.node.json b/packages/nodes-base/nodes/N8n/N8n.node.json
index 34fe502361..b46b1cbfba 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/n8n.svg b/packages/nodes-base/nodes/N8n/n8n.svg
index 17ba54479a..bfee2f544b 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 9e896d3aa0..6d1797cb2e 100644
--- a/packages/nodes-base/nodes/N8n/test/node/N8n.test.ts
+++ b/packages/nodes-base/nodes/N8n/test/node/N8n.test.ts
@@ -1,12 +1,11 @@
+import nock from 'nock';
+import type { INodeTypes } from 'n8n-workflow';
 import { setup, workflowToTests, getWorkflowFilenames } from '@test/nodes/Helpers';
 
-import nock from 'nock';
 import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 
 import type { WorkflowTestData } from '@test/nodes/types';
 
-import type { INodeTypes } from 'n8n-workflow';
-
 describe('Test N8n Node, expect base_url to be received from credentials', () => {
 	const workflows = getWorkflowFilenames(__dirname);
 	const tests = workflowToTests(workflows);
diff --git a/packages/nodes-base/nodes/N8nTrainingCustomerDatastore/n8nTrainingCustomerDatastore.svg b/packages/nodes-base/nodes/N8nTrainingCustomerDatastore/n8nTrainingCustomerDatastore.svg
index 1b053772f7..3e20ed4539 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.svg b/packages/nodes-base/nodes/N8nTrainingCustomerMessenger/n8nTrainingCustomerMessenger.svg
index c3165491c1..800416c3b5 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 17ba54479a..bfee2f544b 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/Nasa.node.ts b/packages/nodes-base/nodes/Nasa/Nasa.node.ts
index 33d32ddc79..ed8c825154 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
diff --git a/packages/nodes-base/nodes/Netlify/NetlifyTrigger.node.ts b/packages/nodes-base/nodes/Netlify/NetlifyTrigger.node.ts
index 5a00a7f5ba..fe506f1fb8 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 8d4e9d77e1..9848c69653 100644
--- a/packages/nodes-base/nodes/Netlify/netlify.svg
+++ b/packages/nodes-base/nodes/Netlify/netlify.svg
@@ -1,16 +1 @@
-<svg width="128" height="113" viewBox="0 0 128 113" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_236_138)">
-<path d="M34.593 94.0509H33.3844L27.3514 88.0179V86.8094L36.5743 77.5866H42.9639L43.8158 78.4385V84.8281L34.593 94.0509Z" fill="#05BDBA"/>
-<path d="M27.3514 25.816V24.6074L33.3844 18.5744H34.593L43.8158 27.7972V34.1868L42.9639 35.0388H36.5743L27.3514 25.816Z" fill="#05BDBA"/>
-<path d="M80.4594 74.6047H71.6824L70.9493 73.8717V53.3259C70.9493 49.6705 69.5129 46.8372 65.1046 46.7382C62.836 46.6787 60.2405 46.7382 57.4668 46.8471L57.0507 47.2731V73.8618L56.3176 74.5948H47.5406L46.8075 73.8618V38.7636L47.5406 38.0305H67.2939C74.9713 38.0305 81.1925 44.2517 81.1925 51.9291V73.8717L80.4594 74.6047Z" fill="#014847"/>
-<path d="M35.8412 61.4491H0.73307L0 60.716V51.9192L0.73307 51.1861H35.8412L36.5743 51.9192V60.716L35.8412 61.4491Z" fill="#05BDBA"/>
-<path d="M127.277 61.4491H92.1687L91.4356 60.716V51.9192L92.1687 51.1861H127.277L128.01 51.9192V60.716L127.277 61.4491Z" fill="#05BDBA"/>
-<path d="M58.9428 27.0642V0.73307L59.6759 0H68.4727L69.2058 0.73307V27.0642L68.4727 27.7972H59.6759L58.9428 27.0642Z" fill="#05BDBA"/>
-<path d="M58.9428 111.902V85.5711L59.6759 84.838H68.4727L69.2058 85.5711V111.902L68.4727 112.635H59.6759L58.9428 111.902Z" fill="#05BDBA"/>
-</g>
-<defs>
-<clipPath id="clip0_236_138">
-<rect width="128" height="112.635" fill="white"/>
-</clipPath>
-</defs>
-</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 e1ba3be8f8..159ece886f 100644
--- a/packages/nodes-base/nodes/NextCloud/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/NextCloud/GenericFunctions.ts
@@ -1,4 +1,4 @@
-import type { IExecuteFunctions, IHookFunctions } from 'n8n-workflow';
+import { NodeOperationError, type IExecuteFunctions, type IHookFunctions } from 'n8n-workflow';
 
 import type { OptionsWithUri } from 'request';
 
@@ -52,5 +52,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 47228f7d20..510dffbc0e 100644
--- a/packages/nodes-base/nodes/NextCloud/NextCloud.node.ts
+++ b/packages/nodes-base/nodes/NextCloud/NextCloud.node.ts
@@ -1,3 +1,4 @@
+import { URLSearchParams } from 'url';
 import type {
 	IBinaryKeyData,
 	IDataObject,
@@ -9,12 +10,10 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
-import { URLSearchParams } from 'url';
-
 import { parseString } from 'xml2js';
 
-import { nextCloudApiRequest } from './GenericFunctions';
 import { wrapData } from '../../utils/utilities';
+import { nextCloudApiRequest } from './GenericFunctions';
 
 export class NextCloud implements INodeType {
 	description: INodeTypeDescription = {
@@ -351,7 +350,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',
@@ -362,7 +361,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',
 			},
 
 			// ----------------------------------
@@ -385,7 +384,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,
@@ -413,7 +412,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',
@@ -426,8 +425,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',
 			},
 
 			// ----------------------------------
diff --git a/packages/nodes-base/nodes/NextCloud/nextcloud.svg b/packages/nodes-base/nodes/NextCloud/nextcloud.svg
index 716c7b0ef9..82a9410c63 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/NocoDB/GenericFunctions.ts b/packages/nodes-base/nodes/NocoDB/GenericFunctions.ts
index 2bc6821244..4ca66f7818 100644
--- a/packages/nodes-base/nodes/NocoDB/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/NocoDB/GenericFunctions.ts
@@ -16,6 +16,7 @@ interface IAttachment {
 	title: string;
 	mimetype: string;
 	size: number;
+	signedUrl?: string;
 }
 
 /**
@@ -42,12 +43,15 @@ export async function apiRequest(
 
 	query = query || {};
 
+	if (!uri) {
+		uri = baseUrl.endsWith('/') ? `${baseUrl.slice(0, -1)}${endpoint}` : `${baseUrl}${endpoint}`;
+	}
+
 	const options: OptionsWithUri = {
 		method,
 		body,
 		qs: query,
-		uri:
-			uri || baseUrl.endsWith('/') ? `${baseUrl.slice(0, -1)}${endpoint}` : `${baseUrl}${endpoint}`,
+		uri,
 		json: true,
 	};
 
@@ -109,11 +113,14 @@ export async function downloadRecordAttachments(
 		const element: INodeExecutionData = { json: {}, binary: {} };
 		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 b1eddae550..fd010508f0 100644
--- a/packages/nodes-base/nodes/NocoDB/NocoDB.node.ts
+++ b/packages/nodes-base/nodes/NocoDB/NocoDB.node.ts
@@ -20,7 +20,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 +54,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 +69,6 @@ export class NocoDB implements INodeType {
 				displayName: 'API Version',
 				name: 'version',
 				type: 'options',
-				displayOptions: {
-					show: {
-						'@version': [1],
-					},
-				},
 				isNodeSetting: true,
 				options: [
 					{
@@ -84,18 +79,22 @@ 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',
-				displayOptions: {
-					show: {
-						'@version': [2],
-					},
-				},
 				isNodeSetting: true,
 				options: [
 					{
@@ -106,9 +105,44 @@ export class NocoDB implements INodeType {
 						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: [
+					{
+						name: 'Before v0.90.0',
+						value: 1,
+					},
+					{
+						name: 'v0.90.0 Onwards',
+						value: 2,
+					},
+					{
+						name: 'v0.200.0 Onwards',
+						value: 3,
+					},
+				],
+				displayOptions: {
+					show: {
+						'@version': [3],
+					},
+				},
+				default: 3,
+			},
 			{
 				displayName: 'Resource',
 				name: 'resource',
@@ -172,26 +206,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 +260,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!`,
+					);
 				}
 			},
 		},
@@ -223,7 +285,7 @@ export class NocoDB implements INodeType {
 
 		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 +293,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 +342,7 @@ export class NocoDB implements INodeType {
 									},
 									json: JSON.stringify({
 										api: 'xcAttachmentUpload',
-										project_id: projectId,
+										project_id: baseId,
 										dbAlias: 'db',
 										args: {},
 									}),
@@ -289,6 +353,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 +362,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 +379,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);
+						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);
+					}
 				} catch (error) {
 					if (this.continueOnFail()) {
 						returnData.push({ error: error.toString() });
@@ -331,9 +407,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 +432,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 +454,8 @@ export class NocoDB implements INodeType {
 								};
 							}),
 						);
+					} else if (version === 3) {
+						returnData.push(...responseData);
 					}
 				} catch (error) {
 					if (this.continueOnFail()) {
@@ -394,9 +473,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 +502,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;
 							}
 						}
@@ -468,9 +549,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);
@@ -542,22 +625,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 +681,7 @@ export class NocoDB implements INodeType {
 									},
 									json: JSON.stringify({
 										api: 'xcAttachmentUpload',
-										project_id: projectId,
+										project_id: baseId,
 										dbAlias: 'db',
 										args: {},
 									}),
@@ -606,19 +691,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 +716,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 +739,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 be2be114ed..0d1b7ec743 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 42a90146ba..9c4381ec14 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,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
-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/Notion/BlockDescription.ts b/packages/nodes-base/nodes/Notion/BlockDescription.ts
index 00e0241921..f8de52cada 100644
--- a/packages/nodes-base/nodes/Notion/BlockDescription.ts
+++ b/packages/nodes-base/nodes/Notion/BlockDescription.ts
@@ -199,4 +199,19 @@ export const blockFields: INodeProperties[] = [
 		},
 		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/DatabaseDescription.ts b/packages/nodes-base/nodes/Notion/DatabaseDescription.ts
index d5932e9765..aee9c8d886 100644
--- a/packages/nodes-base/nodes/Notion/DatabaseDescription.ts
+++ b/packages/nodes-base/nodes/Notion/DatabaseDescription.ts
@@ -8,9 +8,11 @@ export const databaseOperations: INodeProperties[] = [
 		noDataExpression: true,
 		displayOptions: {
 			show: {
-				'@version': [2],
 				resource: ['database'],
 			},
+			hide: {
+				'@version': [1],
+			},
 		},
 		options: [
 			{
@@ -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/DatabasePageDescription.ts
index 4ab8e42313..6ecf6d7b94 100644
--- a/packages/nodes-base/nodes/Notion/DatabasePageDescription.ts
+++ b/packages/nodes-base/nodes/Notion/DatabasePageDescription.ts
@@ -14,9 +14,11 @@ export const databasePageOperations: INodeProperties[] = [
 		noDataExpression: true,
 		displayOptions: {
 			show: {
-				'@version': [2],
 				resource: ['databasePage'],
 			},
+			hide: {
+				'@version': [1],
+			},
 		},
 		options: [
 			{
@@ -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: [
@@ -1097,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',
 	},
@@ -1110,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',
@@ -1254,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",
diff --git a/packages/nodes-base/nodes/Notion/GenericFunctions.ts b/packages/nodes-base/nodes/Notion/GenericFunctions.ts
index 2f625f6c13..54f872b91d 100644
--- a/packages/nodes-base/nodes/Notion/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Notion/GenericFunctions.ts
@@ -16,11 +16,10 @@ 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';
+import { filters } from './Filters';
 
 function uuidValidateWithoutDashes(this: IExecuteFunctions, value: string) {
 	if (uuidValidate(value)) return true;
@@ -40,6 +39,7 @@ export type SortData = { key: string; type: string; direction: string; timestamp
 const apiVersion: { [key: number]: string } = {
 	1: '2021-05-13',
 	2: '2021-08-16',
+	2.1: '2021-08-16',
 };
 
 export async function notionApiRequest(
@@ -892,7 +892,7 @@ export async function downloadFiles(this: IExecuteFunctions | IPollFunctions, re
 	return elements;
 }
 
-export function extractPageId(page: string) {
+export function extractPageId(page = '') {
 	if (page.includes('p=')) {
 		return page.split('p=')[1];
 	} else if (page.includes('-') && page.includes('https')) {
@@ -936,10 +936,12 @@ export function getSearchFilters(resource: string) {
 			],
 			displayOptions: {
 				show: {
-					'@version': [2],
 					resource: [resource],
 					operation: ['getAll'],
 				},
+				hide: {
+					'@version': [1],
+				},
 			},
 			default: 'none',
 		},
@@ -959,11 +961,13 @@ export function getSearchFilters(resource: string) {
 			],
 			displayOptions: {
 				show: {
-					'@version': [2],
 					resource: [resource],
 					operation: ['getAll'],
 					filterType: ['manual'],
 				},
+				hide: {
+					'@version': [1],
+				},
 			},
 			default: 'anyFilter',
 		},
@@ -976,11 +980,13 @@ export function getSearchFilters(resource: string) {
 			},
 			displayOptions: {
 				show: {
-					'@version': [2],
 					resource: [resource],
 					operation: ['getAll'],
 					filterType: ['manual'],
 				},
+				hide: {
+					'@version': [1],
+				},
 			},
 			default: {},
 			placeholder: 'Add Condition',
@@ -999,11 +1005,13 @@ export function getSearchFilters(resource: string) {
 			type: 'notice',
 			displayOptions: {
 				show: {
-					'@version': [2],
 					resource: [resource],
 					operation: ['getAll'],
 					filterType: ['json'],
 				},
+				hide: {
+					'@version': [1],
+				},
 			},
 			default: '',
 		},
@@ -1013,11 +1021,13 @@ export function getSearchFilters(resource: string) {
 			type: 'string',
 			displayOptions: {
 				show: {
-					'@version': [2],
 					resource: [resource],
 					operation: ['getAll'],
 					filterType: ['json'],
 				},
+				hide: {
+					'@version': [1],
+				},
 			},
 			default: '',
 		},
@@ -1068,3 +1078,45 @@ export function extractDatabaseMentionRLC(blockValues: IDataObject[]) {
 		}
 	});
 }
+
+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;
+}
diff --git a/packages/nodes-base/nodes/Notion/Notion.node.ts b/packages/nodes-base/nodes/Notion/Notion.node.ts
index 9ea6e41f8c..293c386ec0 100644
--- a/packages/nodes-base/nodes/Notion/Notion.node.ts
+++ b/packages/nodes-base/nodes/Notion/Notion.node.ts
@@ -13,12 +13,13 @@ export class Notion extends VersionedNodeType {
 			group: ['output'],
 			subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
 			description: 'Consume Notion API',
-			defaultVersion: 2,
+			defaultVersion: 2.1,
 		};
 
 		const nodeVersions: IVersionedNodeType['nodeVersions'] = {
 			1: new NotionV1(baseDescription),
 			2: new NotionV2(baseDescription),
+			2.1: 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 b7c84cc42a..5c3576402a 100644
--- a/packages/nodes-base/nodes/Notion/NotionTrigger.node.ts
+++ b/packages/nodes-base/nodes/Notion/NotionTrigger.node.ts
@@ -6,9 +6,9 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 
+import moment from 'moment-timezone';
 import { notionApiRequest, simplifyObjects } from './GenericFunctions';
 
-import moment from 'moment';
 import { getDatabases } from './SearchFunctions';
 
 export class NotionTrigger implements INodeType {
diff --git a/packages/nodes-base/nodes/Notion/PageDescription.ts b/packages/nodes-base/nodes/Notion/PageDescription.ts
index 41dd8a0706..d0abb0f3f0 100644
--- a/packages/nodes-base/nodes/Notion/PageDescription.ts
+++ b/packages/nodes-base/nodes/Notion/PageDescription.ts
@@ -43,9 +43,11 @@ export const pageOperations: INodeProperties[] = [
 		noDataExpression: true,
 		displayOptions: {
 			show: {
-				'@version': [2],
 				resource: ['page'],
 			},
+			hide: {
+				'@version': [1],
+			},
 		},
 		options: [
 			{
@@ -127,10 +129,12 @@ export const pageFields: INodeProperties[] = [
 		],
 		displayOptions: {
 			show: {
-				'@version': [2],
 				resource: ['page'],
 				operation: ['archive'],
 			},
+			hide: {
+				'@version': [1],
+			},
 		},
 		description: 'The Notion Page to archive',
 	},
@@ -140,10 +144,12 @@ export const pageFields: INodeProperties[] = [
 		type: 'boolean',
 		displayOptions: {
 			show: {
-				'@version': [2],
 				resource: ['page'],
 				operation: ['archive'],
 			},
+			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/notion.svg b/packages/nodes-base/nodes/Notion/notion.svg
index 8cf8adc1e7..f2af3da9b2 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/v1/NotionV1.node.ts b/packages/nodes-base/nodes/Notion/v1/NotionV1.node.ts
index 13c3c1b7cb..2363f2556f 100644
--- a/packages/nodes-base/nodes/Notion/v1/NotionV1.node.ts
+++ b/packages/nodes-base/nodes/Notion/v1/NotionV1.node.ts
@@ -9,6 +9,7 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 
+import moment from 'moment-timezone';
 import type { SortData } from '../GenericFunctions';
 import {
 	extractDatabaseId,
@@ -25,10 +26,8 @@ import {
 	simplifyObjects,
 } from '../GenericFunctions';
 
-import moment from 'moment-timezone';
-
-import { versionDescription } from './VersionDescription';
 import { getDatabases } from '../SearchFunctions';
+import { versionDescription } from './VersionDescription';
 
 export class NotionV1 implements INodeType {
 	description: INodeTypeDescription;
diff --git a/packages/nodes-base/nodes/Notion/v1/VersionDescription.ts b/packages/nodes-base/nodes/Notion/v1/VersionDescription.ts
index 08e9a54cb0..af7d7c1065 100644
--- a/packages/nodes-base/nodes/Notion/v1/VersionDescription.ts
+++ b/packages/nodes-base/nodes/Notion/v1/VersionDescription.ts
@@ -1,4 +1,5 @@
 /* eslint-disable n8n-nodes-base/node-filename-against-convention */
+import type { INodeTypeDescription } from 'n8n-workflow';
 import { databaseFields, databaseOperations } from '../DatabaseDescription';
 
 import { userFields, userOperations } from '../UserDescription';
@@ -9,8 +10,6 @@ import { blockFields, blockOperations } from '../BlockDescription';
 
 import { databasePageFields, databasePageOperations } from '../DatabasePageDescription';
 
-import type { INodeTypeDescription } from 'n8n-workflow';
-
 export const versionDescription: INodeTypeDescription = {
 	displayName: 'Notion',
 	name: 'notion',
diff --git a/packages/nodes-base/nodes/Notion/v2/NotionV2.node.ts b/packages/nodes-base/nodes/Notion/v2/NotionV2.node.ts
index 9b5067c6a1..4bb9afca54 100644
--- a/packages/nodes-base/nodes/Notion/v2/NotionV2.node.ts
+++ b/packages/nodes-base/nodes/Notion/v2/NotionV2.node.ts
@@ -10,6 +10,7 @@ import type {
 } from 'n8n-workflow';
 import { jsonParse, NodeApiError } from 'n8n-workflow';
 
+import moment from 'moment-timezone';
 import type { SortData, FileRecord } from '../GenericFunctions';
 import {
 	downloadFiles,
@@ -25,14 +26,13 @@ import {
 	notionApiRequest,
 	notionApiRequestAllItems,
 	notionApiRequestGetBlockChildrens,
+	simplifyBlocksOutput,
 	simplifyObjects,
 	validateJSON,
 } from '../GenericFunctions';
 
-import moment from 'moment-timezone';
-
-import { versionDescription } from './VersionDescription';
 import { getDatabases } from '../SearchFunctions';
+import { versionDescription } from './VersionDescription';
 
 export class NotionV2 implements INodeType {
 	description: INodeTypeDescription;
@@ -313,6 +313,16 @@ export class NotionV2 implements INodeType {
 						..._data,
 					}));
 
+					const nodeVersion = this.getNode().typeVersion;
+
+					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 } },
diff --git a/packages/nodes-base/nodes/Notion/v2/VersionDescription.ts b/packages/nodes-base/nodes/Notion/v2/VersionDescription.ts
index 0ba2fffdd9..4917fa9f34 100644
--- a/packages/nodes-base/nodes/Notion/v2/VersionDescription.ts
+++ b/packages/nodes-base/nodes/Notion/v2/VersionDescription.ts
@@ -1,4 +1,5 @@
 /* eslint-disable n8n-nodes-base/node-filename-against-convention */
+import type { INodeTypeDescription } from 'n8n-workflow';
 import { databaseFields, databaseOperations } from '../DatabaseDescription';
 
 import { userFields, userOperations } from '../UserDescription';
@@ -9,14 +10,12 @@ import { blockFields, blockOperations } from '../BlockDescription';
 
 import { databasePageFields, databasePageOperations } from '../DatabasePageDescription';
 
-import type { INodeTypeDescription } from 'n8n-workflow';
-
 export const versionDescription: INodeTypeDescription = {
 	displayName: 'Notion',
 	name: 'notion',
 	icon: 'file:notion.svg',
 	group: ['output'],
-	version: 2,
+	version: [2, 2.1],
 	subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
 	description: 'Consume Notion API',
 	defaults: {
@@ -73,6 +72,12 @@ export const versionDescription: INodeTypeDescription = {
 			type: 'notice',
 			default: '',
 		},
+		{
+			displayName: '',
+			name: 'Credentials',
+			type: 'credentials',
+			default: '',
+		},
 		{
 			displayName: 'Resource',
 			name: 'resource',
diff --git a/packages/nodes-base/nodes/Npm/npm.svg b/packages/nodes-base/nodes/Npm/npm.svg
index 1c1bfc69bf..2fc5e4ee7b 100644
--- a/packages/nodes-base/nodes/Npm/npm.svg
+++ b/packages/nodes-base/nodes/Npm/npm.svg
@@ -1,4 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2500 2500">
-  <path d="M0 0h2500v2500H0z" fill="#c00"/>
-  <path d="M1241.5 268.5h-973v1962.9h972.9V763.5h495v1467.9h495V268.5z" fill="#fff"/>
-</svg>
+<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/Odoo/GenericFunctions.ts b/packages/nodes-base/nodes/Odoo/GenericFunctions.ts
index 8cecc59cc9..3bd8a214d1 100644
--- a/packages/nodes-base/nodes/Odoo/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Odoo/GenericFunctions.ts
@@ -235,7 +235,7 @@ export async function odooGet(
 					password,
 					mapOdooResources[resource] || resource,
 					mapOperationToJSONRPC[operation],
-					[+itemsID] || [],
+					itemsID ? [+itemsID] : [],
 					fieldsToReturn || [],
 				],
 			},
@@ -326,7 +326,7 @@ export async function odooUpdate(
 					password,
 					mapOdooResources[resource] || resource,
 					mapOperationToJSONRPC[operation],
-					[+itemsID] || [],
+					itemsID ? [+itemsID] : [],
 					fieldsToUpdate,
 				],
 			},
@@ -369,7 +369,7 @@ export async function odooDelete(
 					password,
 					mapOdooResources[resource] || resource,
 					mapOperationToJSONRPC[operation],
-					[+itemsID] || [],
+					itemsID ? [+itemsID] : [],
 				],
 			},
 			id: Math.floor(Math.random() * 100),
diff --git a/packages/nodes-base/nodes/Odoo/Odoo.node.ts b/packages/nodes-base/nodes/Odoo/Odoo.node.ts
index 925579c8f6..4b271efa25 100644
--- a/packages/nodes-base/nodes/Odoo/Odoo.node.ts
+++ b/packages/nodes-base/nodes/Odoo/Odoo.node.ts
@@ -14,6 +14,7 @@ import type {
 } from 'n8n-workflow';
 import { deepCopy } from 'n8n-workflow';
 
+import { capitalCase } from 'change-case';
 import {
 	contactDescription,
 	contactOperations,
@@ -39,7 +40,6 @@ import {
 	processNameValueFields,
 } from './GenericFunctions';
 
-import { capitalCase } from 'change-case';
 export class Odoo implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Odoo',
diff --git a/packages/nodes-base/nodes/Odoo/odoo.svg b/packages/nodes-base/nodes/Odoo/odoo.svg
index 9efc0d87c0..9e549ae84e 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/onesimpleapi.svg b/packages/nodes-base/nodes/OneSimpleApi/onesimpleapi.svg
index 9a918f0a9c..9507ab28f8 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/Onfleet.node.ts b/packages/nodes-base/nodes/Onfleet/Onfleet.node.ts
index 494879723b..eb79ebf7a0 100644
--- a/packages/nodes-base/nodes/Onfleet/Onfleet.node.ts
+++ b/packages/nodes-base/nodes/Onfleet/Onfleet.node.ts
@@ -9,6 +9,7 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 
+import type { OptionsWithUri } from 'request';
 import { taskFields, taskOperations } from './descriptions/TaskDescription';
 
 import { destinationFields, destinationOperations } from './descriptions/DestinationDescription';
@@ -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 = {
diff --git a/packages/nodes-base/nodes/Onfleet/Onfleet.svg b/packages/nodes-base/nodes/Onfleet/Onfleet.svg
index a8e2b261c1..6b0b9406f9 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 26dc787379..b5c17186c5 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 4e05427eea..6bbea27f16 100644
--- a/packages/nodes-base/nodes/OpenAi/ChatDescription.ts
+++ b/packages/nodes-base/nodes/OpenAi/ChatDescription.ts
@@ -42,6 +42,7 @@ const completeOperations: INodeProperties[] = [
 			show: {
 				operation: ['complete'],
 				resource: ['chat'],
+				'@version': [1],
 			},
 		},
 		typeOptions: {
@@ -62,7 +63,69 @@ 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') }}",
 								},
 							},
 							{
diff --git a/packages/nodes-base/nodes/OpenAi/ImageDescription.ts b/packages/nodes-base/nodes/OpenAi/ImageDescription.ts
index 9e552144ee..ca26967525 100644
--- a/packages/nodes-base/nodes/OpenAi/ImageDescription.ts
+++ b/packages/nodes-base/nodes/OpenAi/ImageDescription.ts
@@ -65,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',
@@ -79,7 +199,7 @@ const createOperations: INodeProperties[] = [
 		},
 		options: [
 			{
-				name: 'Binary Data',
+				name: 'Binary File',
 				value: 'binaryData',
 			},
 			{
@@ -150,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',
@@ -168,6 +315,11 @@ const createOperations: INodeProperties[] = [
 						value: '1024x1024',
 					},
 				],
+				displayOptions: {
+					show: {
+						'/model': ['dall-e-2'],
+					},
+				},
 				routing: {
 					send: {
 						type: 'body',
@@ -176,6 +328,64 @@ const createOperations: INodeProperties[] = [
 				},
 				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',
+						property: 'size',
+					},
+				},
+				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.ts b/packages/nodes-base/nodes/OpenAi/OpenAi.node.ts
index 4f7fcc4672..a0aacffe65 100644
--- a/packages/nodes-base/nodes/OpenAi/OpenAi.node.ts
+++ b/packages/nodes-base/nodes/OpenAi/OpenAi.node.ts
@@ -9,7 +9,7 @@ export class OpenAi implements INodeType {
 		name: 'openAi',
 		icon: 'file:openAi.svg',
 		group: ['transform'],
-		version: 1,
+		version: [1, 1.1],
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
 		description: 'Consume Open AI',
 		defaults: {
@@ -28,6 +28,13 @@ export class OpenAi implements INodeType {
 			baseURL: 'https://api.openai.com',
 		},
 		properties: [
+			{
+				displayName:
+					'For more advanced uses, consider using an <a data-action="openSelectiveNodeCreator" data-action-parameter-creatorview="AI">advanced AI</a> node',
+				name: 'noticeAdvanceAi',
+				type: 'notice',
+				default: '',
+			},
 			{
 				displayName: 'Resource',
 				name: 'resource',
diff --git a/packages/nodes-base/nodes/OpenAi/TextDescription.ts b/packages/nodes-base/nodes/OpenAi/TextDescription.ts
index e3e532ba2d..22d8b6a18c 100644
--- a/packages/nodes-base/nodes/OpenAi/TextDescription.ts
+++ b/packages/nodes-base/nodes/OpenAi/TextDescription.ts
@@ -88,7 +88,7 @@ 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') }}",
 								},
 							},
 							{
@@ -115,7 +115,7 @@ const completeOperations: INodeProperties[] = [
 				property: 'model',
 			},
 		},
-		default: 'text-davinci-003',
+		default: 'gpt-3.5-turbo-instruct',
 	},
 	{
 		displayName: 'Prompt',
diff --git a/packages/nodes-base/nodes/OpenAi/openAi.svg b/packages/nodes-base/nodes/OpenAi/openAi.svg
index d9445723ff..4f8812da72 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/Orbit/Orbit.node.ts b/packages/nodes-base/nodes/Orbit/Orbit.node.ts
index 46a199fed4..f5faa28220 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 {
diff --git a/packages/nodes-base/nodes/Orbit/orbit.svg b/packages/nodes-base/nodes/Orbit/orbit.svg
index ea0e0d1567..a52b999c6b 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/Oura.node.ts b/packages/nodes-base/nodes/Oura/Oura.node.ts
index d7cc845ec4..ecadcb9fcc 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 190442d3d9..85ddf3fd29 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/Paddle.node.ts b/packages/nodes-base/nodes/Paddle/Paddle.node.ts
index 334b1df2cd..3f335307fe 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',
diff --git a/packages/nodes-base/nodes/PagerDuty/PagerDuty.node.ts b/packages/nodes-base/nodes/PagerDuty/PagerDuty.node.ts
index e5a8154ad8..fa7591d1e8 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',
diff --git a/packages/nodes-base/nodes/PagerDuty/pagerDuty.svg b/packages/nodes-base/nodes/PagerDuty/pagerDuty.svg
index f43bdae4cb..f2852b5917 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/paypal.svg b/packages/nodes-base/nodes/PayPal/paypal.svg
index a1cbd86d47..1301cc6c6e 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 222b4bac00..0000000000
--- a/packages/nodes-base/nodes/Peekalink/GenericFunctions.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import type { OptionsWithUri } from 'request';
-
-import type {
-	JsonObject,
-	IExecuteFunctions,
-	IHookFunctions,
-	ILoadOptionsFunctions,
-	IDataObject,
-} from 'n8n-workflow';
-import { NodeApiError } from 'n8n-workflow';
-
-export async function peekalinkApiRequest(
-	this: IHookFunctions | IExecuteFunctions | 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 920564fb5a..638ca9f409 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);
+	async execute(context: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		const items = context.getInputData();
+		const operation = context.getNodeParameter('operation', 0) as Operation;
+		const credentials = await context.getCredentials('peekalinkApi');
 
-		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);
+		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);
 				}
-				if (operation === 'preview') {
-					const url = this.getNodeParameter('url', i) as string;
-					const body: IDataObject = {
-						link: url,
-					};
-
-					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;
-				}
-				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 0000000000..f1262863ce
--- /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/Phantombuster.node.json b/packages/nodes-base/nodes/Phantombuster/Phantombuster.node.json
index 1b5407627f..b0f15495ed 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/Pipedrive/Pipedrive.node.ts b/packages/nodes-base/nodes/Pipedrive/Pipedrive.node.ts
index e3fe26861e..a3ed0da589 100644
--- a/packages/nodes-base/nodes/Pipedrive/Pipedrive.node.ts
+++ b/packages/nodes-base/nodes/Pipedrive/Pipedrive.node.ts
@@ -1890,7 +1890,7 @@ export class Pipedrive implements INodeType {
 			//         file:create
 			// ----------------------------------
 			{
-				displayName: 'Binary Property',
+				displayName: 'Input Binary Field',
 				name: 'binaryPropertyName',
 				type: 'string',
 				default: 'data',
@@ -1902,8 +1902,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',
@@ -1996,7 +1995,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,
@@ -2007,8 +2006,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',
 			},
 
 			// ----------------------------------
diff --git a/packages/nodes-base/nodes/Pipedrive/PipedriveTrigger.node.ts b/packages/nodes-base/nodes/Pipedrive/PipedriveTrigger.node.ts
index 60c0c2f316..fa523ac9c5 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/plivo.svg b/packages/nodes-base/nodes/Plivo/plivo.svg
index fb428c04f1..1eba709d76 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 daea1576f6..5aec12fcea 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/PostHog.node.ts b/packages/nodes-base/nodes/PostHog/PostHog.node.ts
index c05cd71917..b1452310b7 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 8f0c42e17d..26cde1631e 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 fae684f450..103c8a82e3 100644
--- a/packages/nodes-base/nodes/Postgres/Postgres.node.ts
+++ b/packages/nodes-base/nodes/Postgres/Postgres.node.ts
@@ -13,6 +13,7 @@ export class Postgres extends VersionedNodeType {
 			group: ['input'],
 			defaultVersion: 2.3,
 			description: 'Get, add and update data in Postgres',
+			parameterPane: 'wide',
 		};
 
 		const nodeVersions: IVersionedNodeType['nodeVersions'] = {
diff --git a/packages/nodes-base/nodes/Postgres/PostgresTrigger.functions.ts b/packages/nodes-base/nodes/Postgres/PostgresTrigger.functions.ts
index e27b863b42..46bf31dba1 100644
--- a/packages/nodes-base/nodes/Postgres/PostgresTrigger.functions.ts
+++ b/packages/nodes-base/nodes/Postgres/PostgresTrigger.functions.ts
@@ -1,3 +1,4 @@
+import { ApplicationError } from 'n8n-workflow';
 import type {
 	ITriggerFunctions,
 	IDataObject,
@@ -26,7 +27,7 @@ export function prepareNames(id: string, mode: string, additionalFields: IDataOb
 	const channelName = (additionalFields.channelName as string) || `n8n_channel_${suffix}`;
 
 	if (channelName.includes('-')) {
-		throw new Error('Channel name cannot contain hyphens (-)');
+		throw new ApplicationError('Channel name cannot contain hyphens (-)', { level: 'warning' });
 	}
 
 	return { functionName, triggerName, channelName };
@@ -63,7 +64,7 @@ export async function pgTriggerFunction(
 	const whichData = firesOn === 'DELETE' ? 'old' : 'new';
 
 	if (channelName.includes('-')) {
-		throw new Error('Channel name cannot contain hyphens (-)');
+		throw new ApplicationError('Channel name cannot contain hyphens (-)', { level: 'warning' });
 	}
 
 	const replaceIfExists = additionalFields.replaceIfExists ?? false;
@@ -78,7 +79,7 @@ export async function pgTriggerFunction(
 		await db.any(trigger, [target, functionName, firesOn, triggerName]);
 	} catch (error) {
 		if ((error as Error).message.includes('near "-"')) {
-			throw new Error('Names cannot contain hyphens (-)');
+			throw new ApplicationError('Names cannot contain hyphens (-)', { level: 'warning' });
 		}
 		throw error;
 	}
@@ -132,7 +133,7 @@ export async function searchTables(this: ILoadOptionsFunctions): Promise<INodeLi
 			[schema.value],
 		);
 	} catch (error) {
-		throw new Error(error as string);
+		throw new ApplicationError(error as string);
 	}
 	const results: INodeListSearchItems[] = (tableList as IDataObject[]).map((s) => ({
 		name: s.table_name as string,
diff --git a/packages/nodes-base/nodes/Postgres/PostgresTrigger.node.ts b/packages/nodes-base/nodes/Postgres/PostgresTrigger.node.ts
index b58c8f2708..e5a2891cb4 100644
--- a/packages/nodes-base/nodes/Postgres/PostgresTrigger.node.ts
+++ b/packages/nodes-base/nodes/Postgres/PostgresTrigger.node.ts
@@ -307,7 +307,7 @@ export class PostgresTrigger implements INodeType {
 							})(),
 						),
 					);
-				}, 30000);
+				}, 60000);
 				connection.client.on('notification', async (data: IDataObject) => {
 					if (data.payload) {
 						try {
diff --git a/packages/nodes-base/nodes/Postgres/postgres.svg b/packages/nodes-base/nodes/Postgres/postgres.svg
index 9f4598c180..da7be289e2 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 bebf8af487..61484e54a1 100644
--- a/packages/nodes-base/nodes/Postgres/test/v2/operations.test.ts
+++ b/packages/nodes-base/nodes/Postgres/test/v2/operations.test.ts
@@ -6,9 +6,8 @@ import type {
 	INodeParameters,
 } from 'n8n-workflow';
 
-import type { ColumnInfo, PgpDatabase, QueriesRunner } from '../../v2/helpers/interfaces';
-
 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';
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 a61b1c9bed..d8dc12b01f 100644
--- a/packages/nodes-base/nodes/Postgres/test/v2/runQueries.test.ts
+++ b/packages/nodes-base/nodes/Postgres/test/v2/runQueries.test.ts
@@ -1,10 +1,9 @@
 import type { IDataObject, IExecuteFunctions, INode } from 'n8n-workflow';
 
-import type { PgpDatabase } from '../../v2/helpers/interfaces';
-import { configureQueryRunner } from '../../v2/helpers/utils';
-
 import pgPromise from 'pg-promise';
 import { mock } from 'jest-mock-extended';
+import type { PgpDatabase } from '../../v2/helpers/interfaces';
+import { configureQueryRunner } from '../../v2/helpers/utils';
 
 const node: INode = {
 	id: '1',
diff --git a/packages/nodes-base/nodes/Postgres/v1/PostgresV1.node.ts b/packages/nodes-base/nodes/Postgres/v1/PostgresV1.node.ts
index 19ef5ca287..f4b780f423 100644
--- a/packages/nodes-base/nodes/Postgres/v1/PostgresV1.node.ts
+++ b/packages/nodes-base/nodes/Postgres/v1/PostgresV1.node.ts
@@ -77,7 +77,6 @@ const versionDescription: INodeTypeDescription = {
 			noDataExpression: true,
 			typeOptions: {
 				editor: 'sqlEditor',
-				rows: 5,
 				sqlDialect: 'PostgreSQL',
 			},
 			displayOptions: {
diff --git a/packages/nodes-base/nodes/Postgres/v1/genericFunctions.ts b/packages/nodes-base/nodes/Postgres/v1/genericFunctions.ts
index edf4f02a62..1f858abcd4 100644
--- a/packages/nodes-base/nodes/Postgres/v1/genericFunctions.ts
+++ b/packages/nodes-base/nodes/Postgres/v1/genericFunctions.ts
@@ -1,3 +1,4 @@
+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';
@@ -160,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(
@@ -259,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',
+	});
 }
 
 /**
@@ -348,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',
+	});
 }
 
 /**
@@ -456,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',
+	});
 }
 
 /**
@@ -582,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',
+	});
 }
 
 /**
@@ -713,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/actions/database/deleteTable.operation.ts b/packages/nodes-base/nodes/Postgres/v2/actions/database/deleteTable.operation.ts
index 321f3fecc7..c0c367dcc7 100644
--- a/packages/nodes-base/nodes/Postgres/v2/actions/database/deleteTable.operation.ts
+++ b/packages/nodes-base/nodes/Postgres/v2/actions/database/deleteTable.operation.ts
@@ -6,8 +6,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
-import { updateDisplayOptions } from '@utils/utilities';
-
 import type {
 	PgpDatabase,
 	QueriesRunner,
@@ -23,6 +21,7 @@ import {
 	optionsCollection,
 	whereFixedCollection,
 } from '../common.descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Postgres/v2/actions/database/executeQuery.operation.ts b/packages/nodes-base/nodes/Postgres/v2/actions/database/executeQuery.operation.ts
index de78fd571d..e61ed0a72a 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
@@ -26,7 +26,6 @@ const properties: INodeProperties[] = [
 			"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: {
 			editor: 'sqlEditor',
-			rows: 5,
 			sqlDialect: 'PostgreSQL',
 		},
 		hint: 'Consider using query parameters to prevent SQL injection attacks. Add them in the options below',
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 fd4e84552f..d712222b03 100644
--- a/packages/nodes-base/nodes/Postgres/v2/actions/database/insert.operation.ts
+++ b/packages/nodes-base/nodes/Postgres/v2/actions/database/insert.operation.ts
@@ -5,8 +5,6 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 
-import { updateDisplayOptions } from '@utils/utilities';
-
 import type {
 	PgpDatabase,
 	QueriesRunner,
@@ -24,6 +22,7 @@ import {
 } from '../../helpers/utils';
 
 import { optionsCollection } from '../common.descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
@@ -53,7 +52,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',
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 e1140d5df9..0a6d3cfa14 100644
--- a/packages/nodes-base/nodes/Postgres/v2/actions/database/select.operation.ts
+++ b/packages/nodes-base/nodes/Postgres/v2/actions/database/select.operation.ts
@@ -5,8 +5,6 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 
-import { updateDisplayOptions } from '@utils/utilities';
-
 import type {
 	PgpDatabase,
 	QueriesRunner,
@@ -24,6 +22,7 @@ import {
 	sortFixedCollection,
 	whereFixedCollection,
 } from '../common.descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Postgres/v2/actions/database/update.operation.ts b/packages/nodes-base/nodes/Postgres/v2/actions/database/update.operation.ts
index 3a26ab9bf9..e9f9da6825 100644
--- a/packages/nodes-base/nodes/Postgres/v2/actions/database/update.operation.ts
+++ b/packages/nodes-base/nodes/Postgres/v2/actions/database/update.operation.ts
@@ -6,8 +6,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
-import { updateDisplayOptions } from '@utils/utilities';
-
 import type {
 	PgpDatabase,
 	QueriesRunner,
@@ -26,6 +24,7 @@ import {
 } from '../../helpers/utils';
 
 import { optionsCollection } from '../common.descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
@@ -55,7 +54,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',
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 4040798da0..8af21b9c37 100644
--- a/packages/nodes-base/nodes/Postgres/v2/actions/database/upsert.operation.ts
+++ b/packages/nodes-base/nodes/Postgres/v2/actions/database/upsert.operation.ts
@@ -6,8 +6,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
-import { updateDisplayOptions } from '@utils/utilities';
-
 import type {
 	PgpDatabase,
 	QueriesRunner,
@@ -25,6 +23,7 @@ import {
 } from '../../helpers/utils';
 
 import { optionsCollection } from '../common.descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
@@ -54,7 +53,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',
diff --git a/packages/nodes-base/nodes/Postgres/v2/helpers/interfaces.ts b/packages/nodes-base/nodes/Postgres/v2/helpers/interfaces.ts
index 13f731a02a..57d5c6b22a 100644
--- a/packages/nodes-base/nodes/Postgres/v2/helpers/interfaces.ts
+++ b/packages/nodes-base/nodes/Postgres/v2/helpers/interfaces.ts
@@ -17,6 +17,8 @@ export type ColumnInfo = {
 	is_nullable: string;
 	udt_name?: string;
 	column_default?: string;
+	is_generated?: 'ALWAYS' | 'NEVER';
+	identity_generation?: 'ALWAYS' | 'NEVER';
 };
 export type EnumInfo = {
 	typname: string;
diff --git a/packages/nodes-base/nodes/Postgres/v2/helpers/utils.ts b/packages/nodes-base/nodes/Postgres/v2/helpers/utils.ts
index 175458bfa7..7367a62af4 100644
--- a/packages/nodes-base/nodes/Postgres/v2/helpers/utils.ts
+++ b/packages/nodes-base/nodes/Postgres/v2/helpers/utils.ts
@@ -7,6 +7,7 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
+import { generatePairedItemData } from '../../../../utils/utilities';
 import type {
 	ColumnInfo,
 	EnumInfo,
@@ -18,7 +19,6 @@ import type {
 	SortRule,
 	WhereClause,
 } from './interfaces';
-import { generatePairedItemData } from '../../../../utils/utilities';
 
 export function wrapData(data: IDataObject | IDataObject[]): INodeExecutionData[] {
 	if (!Array.isArray(data)) {
@@ -376,13 +376,45 @@ 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, udt_name, column_default 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],
 	);
 
diff --git a/packages/nodes-base/nodes/Postgres/v2/methods/credentialTest.ts b/packages/nodes-base/nodes/Postgres/v2/methods/credentialTest.ts
index 0e2a4e3e3e..f107c83ebf 100644
--- a/packages/nodes-base/nodes/Postgres/v2/methods/credentialTest.ts
+++ b/packages/nodes-base/nodes/Postgres/v2/methods/credentialTest.ts
@@ -5,9 +5,9 @@ import type {
 	INodeCredentialTestResult,
 } from 'n8n-workflow';
 
+import { Client } from 'ssh2';
 import { configurePostgres } from '../transport';
 
-import { Client } from 'ssh2';
 import type { PgpClient } from '../helpers/interfaces';
 
 export async function postgresConnectionTest(
diff --git a/packages/nodes-base/nodes/Postgres/v2/methods/resourceMapping.ts b/packages/nodes-base/nodes/Postgres/v2/methods/resourceMapping.ts
index ce2e29c513..cad0923b05 100644
--- a/packages/nodes-base/nodes/Postgres/v2/methods/resourceMapping.ts
+++ b/packages/nodes-base/nodes/Postgres/v2/methods/resourceMapping.ts
@@ -62,7 +62,7 @@ export async function getMappingColumns(
 	}) as string;
 
 	try {
-		const columns = await getTableSchema(db, schema, table);
+		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(
@@ -72,12 +72,14 @@ export async function getMappingColumns(
 				const type = mapPostgresType(col.data_type);
 				const options =
 					type === 'options' ? getEnumValues(enumInfo, col.udt_name as string) : undefined;
-				const isAutoIncrement = col.column_default?.startsWith('nextval');
+				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: col.is_nullable !== 'YES' && !isAutoIncrement,
-					defaultMatch: col.column_name === 'id',
+					required: !nullable && !hasDefault && !isGenerated,
+					defaultMatch: (col.column_name === 'id' && canBeUsedToMatch) || false,
 					display: true,
 					type,
 					canBeUsedToMatch,
diff --git a/packages/nodes-base/nodes/Postgres/v2/transport/index.ts b/packages/nodes-base/nodes/Postgres/v2/transport/index.ts
index 1e60ebf7f1..267c52fc6f 100644
--- a/packages/nodes-base/nodes/Postgres/v2/transport/index.ts
+++ b/packages/nodes-base/nodes/Postgres/v2/transport/index.ts
@@ -1,14 +1,13 @@
-import type { IDataObject } from 'n8n-workflow';
-import { formatPrivateKey } from '@utils/utilities';
-
+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 type { PgpDatabase } from '../helpers/interfaces';
+import { formatPrivateKey } from '@utils/utilities';
 
 async function createSshConnectConfig(credentials: IDataObject) {
 	if (credentials.sshAuthenticateWith === 'password') {
@@ -45,7 +44,7 @@ export async function configurePostgres(
 		noWarnings: true,
 	});
 
-	if (typeof options.nodeVersion == 'number' && options.nodeVersion >= 2.1) {
+	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) => {
diff --git a/packages/nodes-base/nodes/Pushbullet/Pushbullet.node.ts b/packages/nodes-base/nodes/Pushbullet/Pushbullet.node.ts
index 8db4890d50..ff4d4770c2 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',
diff --git a/packages/nodes-base/nodes/Pushbullet/pushbullet.svg b/packages/nodes-base/nodes/Pushbullet/pushbullet.svg
index b51a3fd61f..a5b5905521 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/Pushover/Pushover.node.ts b/packages/nodes-base/nodes/Pushover/Pushover.node.ts
index ed3774a5dc..fab8ecdf80 100644
--- a/packages/nodes-base/nodes/Pushover/Pushover.node.ts
+++ b/packages/nodes-base/nodes/Pushover/Pushover.node.ts
@@ -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',
 									},
 								],
 							},
diff --git a/packages/nodes-base/nodes/Pushover/pushover.svg b/packages/nodes-base/nodes/Pushover/pushover.svg
index 4d262ce497..9d9d8fffd3 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 1ea8bf887e..ad065b1d1d 100644
--- a/packages/nodes-base/nodes/QuestDb/QuestDb.node.ts
+++ b/packages/nodes-base/nodes/QuestDb/QuestDb.node.ts
@@ -24,6 +24,7 @@ export class QuestDb implements INodeType {
 		},
 		inputs: ['main'],
 		outputs: ['main'],
+		parameterPane: 'wide',
 		credentials: [
 			{
 				name: 'questDb',
@@ -63,7 +64,6 @@ export class QuestDb implements INodeType {
 				noDataExpression: true,
 				typeOptions: {
 					editor: 'sqlEditor',
-					rows: 5,
 					sqlDialect: 'PostgreSQL',
 				},
 				displayOptions: {
diff --git a/packages/nodes-base/nodes/QuickBase/FileDescription.ts b/packages/nodes-base/nodes/QuickBase/FileDescription.ts
index 343f23cdfe..89e7716c3a 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/QuickBase.node.ts b/packages/nodes-base/nodes/QuickBase/QuickBase.node.ts
index 6a77677a93..55e081553c 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,
@@ -23,7 +24,6 @@ import { fileFields, fileOperations } from './FileDescription';
 import { recordFields, recordOperations } from './RecordDescription';
 
 import { reportFields, reportOperations } from './ReportDescription';
-import { generatePairedItemData } from '../../utils/utilities';
 
 export class QuickBase implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/QuickBooks/GenericFunctions.ts b/packages/nodes-base/nodes/QuickBooks/GenericFunctions.ts
index 0cf69aadf2..dca9ee5702 100644
--- a/packages/nodes-base/nodes/QuickBooks/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/QuickBooks/GenericFunctions.ts
@@ -9,14 +9,13 @@ import type {
 } 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 type { OptionsWithUri } from 'request';
+import type { CustomField, GeneralAddress, Ref } from './descriptions/Shared.interface';
 
 import type { DateFieldsUi, Option, QuickBooksOAuth2Credentials, TransactionReport } from './types';
 
diff --git a/packages/nodes-base/nodes/QuickBooks/QuickBooks.node.ts b/packages/nodes-base/nodes/QuickBooks/QuickBooks.node.ts
index 24c954ad3d..c804a64bb8 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 {
diff --git a/packages/nodes-base/nodes/QuickBooks/descriptions/Estimate/EstimateDescription.ts b/packages/nodes-base/nodes/QuickBooks/descriptions/Estimate/EstimateDescription.ts
index b286dfeb04..6c19bd7743 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 0e9c7c0e27..d15cd417f9 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 ff338841bc..faeec56d4a 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 f4e89f3a83..450c707a95 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/QuickChart/QuickChart.node.json b/packages/nodes-base/nodes/QuickChart/QuickChart.node.json
index 364fbf6f4d..3d8ea22e1d 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.svg b/packages/nodes-base/nodes/QuickChart/quickChart.svg
index 0f2ae092a6..1f177b55b7 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 94ea8cc6bd..b46bc920c0 100644
--- a/packages/nodes-base/nodes/QuickChart/test/QuickChart.node.test.ts
+++ b/packages/nodes-base/nodes/QuickChart/test/QuickChart.node.test.ts
@@ -1,8 +1,8 @@
 /* eslint-disable @typescript-eslint/no-loop-func */
+import nock from 'nock';
 import * as Helpers from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
 import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
-import nock from 'nock';
 
 describe('Test QuickChart Node', () => {
 	beforeEach(async () => {
diff --git a/packages/nodes-base/nodes/RabbitMQ/GenericFunctions.ts b/packages/nodes-base/nodes/RabbitMQ/GenericFunctions.ts
index f268c01bc2..a48e9707b1 100644
--- a/packages/nodes-base/nodes/RabbitMQ/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/RabbitMQ/GenericFunctions.ts
@@ -1,8 +1,7 @@
 import type { IDataObject, IExecuteFunctions, ITriggerFunctions } from 'n8n-workflow';
 import { sleep } from 'n8n-workflow';
-import { formatPrivateKey } from '@utils/utilities';
-
 import * as amqplib from 'amqplib';
+import { formatPrivateKey } from '@utils/utilities';
 
 export async function rabbitmqConnect(
 	this: IExecuteFunctions | ITriggerFunctions,
@@ -77,6 +76,19 @@ export async function rabbitmqConnectQueue(
 	return new Promise(async (resolve, reject) => {
 		try {
 			await channel.assertQueue(queue, options);
+
+			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);
diff --git a/packages/nodes-base/nodes/RabbitMQ/RabbitMQTrigger.node.ts b/packages/nodes-base/nodes/RabbitMQ/RabbitMQTrigger.node.ts
index 09781ac3fa..7d8dd7c398 100644
--- a/packages/nodes-base/nodes/RabbitMQ/RabbitMQTrigger.node.ts
+++ b/packages/nodes-base/nodes/RabbitMQ/RabbitMQTrigger.node.ts
@@ -139,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 (
diff --git a/packages/nodes-base/nodes/Raindrop/raindrop.svg b/packages/nodes-base/nodes/Raindrop/raindrop.svg
index 3ea52bc0fe..6490efb8aa 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 eded0c4e88..73b50bbc64 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/test/ReadBinaryFile.test.ts b/packages/nodes-base/nodes/ReadBinaryFile/test/ReadBinaryFile.test.ts
index 8590bf61fc..c94feb97cf 100644
--- a/packages/nodes-base/nodes/ReadBinaryFile/test/ReadBinaryFile.test.ts
+++ b/packages/nodes-base/nodes/ReadBinaryFile/test/ReadBinaryFile.test.ts
@@ -1,8 +1,8 @@
 /* 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';
-import path from 'path';
 
 describe('Test Read Binary File Node', () => {
 	beforeEach(async () => {
diff --git a/packages/nodes-base/nodes/ReadBinaryFiles/ReadBinaryFiles.node.json b/packages/nodes-base/nodes/ReadBinaryFiles/ReadBinaryFiles.node.json
index 467151be71..b9c9911ab2 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 1368de2066..a1f0939c9e 100644
--- a/packages/nodes-base/nodes/ReadBinaryFiles/ReadBinaryFiles.node.ts
+++ b/packages/nodes-base/nodes/ReadBinaryFiles/ReadBinaryFiles.node.ts
@@ -10,6 +10,7 @@ import { generatePairedItemData } from '../../utils/utilities';
 
 export class ReadBinaryFiles implements INodeType {
 	description: INodeTypeDescription = {
+		hidden: true,
 		displayName: 'Read Binary Files',
 		name: 'readBinaryFiles',
 		icon: 'fa:file-import',
diff --git a/packages/nodes-base/nodes/ReadBinaryFiles/test/ReadBinaryFiles.test.ts b/packages/nodes-base/nodes/ReadBinaryFiles/test/ReadBinaryFiles.test.ts
index d4bf87f045..76235ae1e2 100644
--- a/packages/nodes-base/nodes/ReadBinaryFiles/test/ReadBinaryFiles.test.ts
+++ b/packages/nodes-base/nodes/ReadBinaryFiles/test/ReadBinaryFiles.test.ts
@@ -1,8 +1,8 @@
 /* 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';
-import path from 'path';
 
 describe('Test Read Binary Files Node', () => {
 	beforeEach(async () => {
diff --git a/packages/nodes-base/nodes/ReadPdf/ReadPDF.node.json b/packages/nodes-base/nodes/ReadPdf/ReadPDF.node.json
index e3c4a8723b..e1bc6666fa 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 b638862970..ff882dfca5 100644
--- a/packages/nodes-base/nodes/ReadPdf/ReadPDF.node.ts
+++ b/packages/nodes-base/nodes/ReadPdf/ReadPDF.node.ts
@@ -1,35 +1,15 @@
 import {
-	BINARY_ENCODING,
+	NodeOperationError,
 	type IExecuteFunctions,
 	type INodeExecutionData,
 	type INodeType,
 	type INodeTypeDescription,
 } from 'n8n-workflow';
-
-import { getDocument as readPDF, version as pdfJsVersion } from 'pdfjs-dist';
-
-type Document = Awaited<ReturnType<Awaited<typeof readPDF>>['promise']>;
-type Page = Awaited<ReturnType<Awaited<Document['getPage']>>>;
-type TextContent = Awaited<ReturnType<Page['getTextContent']>>;
-
-const parseText = (textContent: TextContent) => {
-	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('');
-};
+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',
@@ -45,7 +25,7 @@ export class ReadPDF implements INodeType {
 		outputs: ['main'],
 		properties: [
 			{
-				displayName: 'Binary Property',
+				displayName: 'Input Binary Field',
 				name: 'binaryPropertyName',
 				type: 'string',
 				default: 'data',
@@ -84,46 +64,26 @@ export class ReadPDF implements INodeType {
 		for (let itemIndex = 0; itemIndex < length; itemIndex++) {
 			try {
 				const binaryPropertyName = this.getNodeParameter('binaryPropertyName', itemIndex);
-				const binaryData = this.helpers.assertBinaryData(itemIndex, binaryPropertyName);
-
-				const params: { password?: string; url?: URL; data?: ArrayBuffer } = {};
 
+				let password;
 				if (this.getNodeParameter('encrypted', itemIndex) === true) {
-					params.password = this.getNodeParameter('password', itemIndex) as string;
+					password = this.getNodeParameter('password', itemIndex) as string;
 				}
 
-				if (binaryData.id) {
-					const binaryPath = this.helpers.getBinaryPath(binaryData.id);
-					params.url = new URL(`file://${binaryPath}`);
-				} 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 = [];
-				for (let i = 1; i <= document.numPages; i++) {
-					const page = await document.getPage(i);
-					const text = await page.getTextContent().then(parseText);
-					pages.push(text);
-				}
+				const json = await extractDataFromPDF.call(
+					this,
+					binaryPropertyName,
+					password,
+					undefined,
+					undefined,
+					itemIndex,
+				);
 
 				returnData.push({
 					binary: items[itemIndex].binary,
-					json: {
-						numpages: document.numPages,
-						numrender: document.numPages,
-						info,
-						metadata: metadata?.getAll(),
-						text: pages.join('\n\n'),
-						version: pdfJsVersion,
-					},
+					json,
 				});
 			} catch (error) {
-				console.log(error);
 				if (this.continueOnFail()) {
 					returnData.push({
 						json: {
@@ -135,7 +95,7 @@ export class ReadPDF implements INodeType {
 					});
 					continue;
 				}
-				throw error;
+				throw new NodeOperationError(this.getNode(), error, { itemIndex });
 			}
 		}
 		return [returnData];
diff --git a/packages/nodes-base/nodes/Reddit/reddit.svg b/packages/nodes-base/nodes/Reddit/reddit.svg
index 810345c370..36fe20f49f 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 c63bea78a7..9d7a3fc65b 100644
--- a/packages/nodes-base/nodes/Redis/Redis.node.ts
+++ b/packages/nodes-base/nodes/Redis/Redis.node.ts
@@ -1,6 +1,6 @@
+import util from 'util';
 import type {
 	IExecuteFunctions,
-	GenericValue,
 	ICredentialDataDecryptedObject,
 	ICredentialsDecrypted,
 	ICredentialTestFunctions,
@@ -15,8 +15,6 @@ import { NodeOperationError } from 'n8n-workflow';
 import set from 'lodash/set';
 import redis from 'redis';
 
-import util from 'util';
-
 export class Redis implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Redis',
@@ -758,17 +756,8 @@ export class Redis implements INodeType {
 									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];
+									item.json[keyName] = await getValue(client, keyName);
 								}
 								returnItems.push(item);
 							} else if (operation === 'set') {
diff --git a/packages/nodes-base/nodes/Redis/RedisTrigger.node.ts b/packages/nodes-base/nodes/Redis/RedisTrigger.node.ts
index 2224ee652d..39622f0c0c 100644
--- a/packages/nodes-base/nodes/Redis/RedisTrigger.node.ts
+++ b/packages/nodes-base/nodes/Redis/RedisTrigger.node.ts
@@ -118,7 +118,7 @@ export class RedisTrigger implements INodeType {
 		};
 
 		if (this.getMode() === 'trigger') {
-			await manualTriggerFunction();
+			void manualTriggerFunction();
 		}
 
 		async function closeFunction() {
diff --git a/packages/nodes-base/nodes/Redis/redis.svg b/packages/nodes-base/nodes/Redis/redis.svg
index 6e8301d99d..beb6ad40da 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/RenameKeys/RenameKeys.node.ts b/packages/nodes-base/nodes/RenameKeys/RenameKeys.node.ts
index cbc44fbef7..d3a8d1ba71 100644
--- a/packages/nodes-base/nodes/RenameKeys/RenameKeys.node.ts
+++ b/packages/nodes-base/nodes/RenameKeys/RenameKeys.node.ts
@@ -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/RespondToWebhook/RespondToWebhook.node.json b/packages/nodes-base/nodes/RespondToWebhook/RespondToWebhook.node.json
index 0df99d6aba..19044f48dd 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 9d4b81d455..ca16a82b04 100644
--- a/packages/nodes-base/nodes/RespondToWebhook/RespondToWebhook.node.ts
+++ b/packages/nodes-base/nodes/RespondToWebhook/RespondToWebhook.node.ts
@@ -9,6 +9,7 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 import { jsonParse, BINARY_ENCODING, NodeOperationError } from 'n8n-workflow';
+import set from 'lodash/set';
 
 export class RespondToWebhook implements INodeType {
 	description: INodeTypeDescription = {
@@ -25,30 +26,52 @@ export class RespondToWebhook implements INodeType {
 		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: '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: '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',
@@ -56,7 +79,7 @@ export class RespondToWebhook implements INodeType {
 			},
 			{
 				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: {
@@ -66,6 +89,21 @@ export class RespondToWebhook implements INodeType {
 				},
 				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',
@@ -75,9 +113,11 @@ 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: 'Response Body',
@@ -88,9 +128,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',
@@ -146,7 +189,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',
@@ -181,6 +224,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',
+					},
 				],
 			},
 		],
@@ -202,6 +258,7 @@ export class RespondToWebhook implements INodeType {
 			}
 		}
 
+		let statusCode = (options.responseCode as number) || 200;
 		let responseBody: IN8nHttpResponse | Readable;
 		if (respondWith === 'json') {
 			const responseBodyParameter = this.getNodeParameter('responseBody', 0) as string;
@@ -209,13 +266,26 @@ export class RespondToWebhook implements INodeType {
 				if (typeof responseBodyParameter === 'object') {
 					responseBody = responseBodyParameter;
 				} else {
-					responseBody = jsonParse(responseBodyParameter, {
-						errorMessage: "Invalid JSON in 'Response Body' field",
-					});
+					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 === 'allIncomingItems') {
+			const respondItems = items.map((item) => item.json);
+			responseBody = options.responseKey
+				? set({}, options.responseKey as string, respondItems)
+				: respondItems;
 		} else if (respondWith === 'firstIncomingItem') {
-			responseBody = items[0].json;
+			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') {
@@ -250,6 +320,9 @@ export class RespondToWebhook implements INodeType {
 			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(),
@@ -260,7 +333,7 @@ export class RespondToWebhook implements INodeType {
 		const response: IN8nHttpFullResponse = {
 			body: responseBody,
 			headers,
-			statusCode: (options.responseCode as number) || 200,
+			statusCode,
 		};
 
 		this.sendResponse(response);
diff --git a/packages/nodes-base/nodes/RespondToWebhook/webhook.svg b/packages/nodes-base/nodes/RespondToWebhook/webhook.svg
index a59b318554..110ebbef60 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/rocketchat.svg b/packages/nodes-base/nodes/Rocketchat/rocketchat.svg
index 5a72e53f7e..008e5de182 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 234ca92da9..f465f25e1d 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 8152b49b38..615e21e4ee 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,7 +9,6 @@ import type {
 import { NodeOperationError } from 'n8n-workflow';
 
 import Parser from 'rss-parser';
-import { URL } from 'url';
 import { generatePairedItemData } from '../../utils/utilities';
 
 // Utility function
diff --git a/packages/nodes-base/nodes/RssFeedRead/RssFeedReadTrigger.node.ts b/packages/nodes-base/nodes/RssFeedRead/RssFeedReadTrigger.node.ts
index 9f7c00ae64..366b5d07b8 100644
--- a/packages/nodes-base/nodes/RssFeedRead/RssFeedReadTrigger.node.ts
+++ b/packages/nodes-base/nodes/RssFeedRead/RssFeedReadTrigger.node.ts
@@ -7,7 +7,7 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 import Parser from 'rss-parser';
-import moment from 'moment';
+import moment from 'moment-timezone';
 
 export class RssFeedReadTrigger implements INodeType {
 	description: INodeTypeDescription = {
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 b1040c13d1..442fc6eb69 100644
--- a/packages/nodes-base/nodes/RssFeedRead/test/node/RssFeedRead.test.ts
+++ b/packages/nodes-base/nodes/RssFeedRead/test/node/RssFeedRead.test.ts
@@ -1,6 +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>`;
diff --git a/packages/nodes-base/nodes/S3/GenericFunctions.ts b/packages/nodes-base/nodes/S3/GenericFunctions.ts
index cccfd927a9..ee57c29191 100644
--- a/packages/nodes-base/nodes/S3/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/S3/GenericFunctions.ts
@@ -1,3 +1,4 @@
+import { URL } from 'url';
 import type { Request } from 'aws4';
 import { sign } from 'aws4';
 
@@ -17,8 +18,6 @@ import type {
 } 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))
diff --git a/packages/nodes-base/nodes/S3/S3.node.ts b/packages/nodes-base/nodes/S3/S3.node.ts
index 9532a35e9f..d7844ba9a4 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';
 
diff --git a/packages/nodes-base/nodes/Salesforce/AttachmentDescription.ts b/packages/nodes-base/nodes/Salesforce/AttachmentDescription.ts
index d26a97d68b..0a6c17968c 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/DocumentDescription.ts b/packages/nodes-base/nodes/Salesforce/DocumentDescription.ts
index b2232fc3bd..20b4062a47 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/Salesforce.node.ts b/packages/nodes-base/nodes/Salesforce/Salesforce.node.ts
index 168075b9c5..a05844e7fd 100644
--- a/packages/nodes-base/nodes/Salesforce/Salesforce.node.ts
+++ b/packages/nodes-base/nodes/Salesforce/Salesforce.node.ts
@@ -2854,7 +2854,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 {
@@ -2887,7 +2887,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 {
diff --git a/packages/nodes-base/nodes/Salesforce/salesforce.svg b/packages/nodes-base/nodes/Salesforce/salesforce.svg
index 2a7c9a54d7..44774c54cd 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/Schedule/GenericFunctions.ts b/packages/nodes-base/nodes/Schedule/GenericFunctions.ts
index 7b8dc463ee..3e7b37146c 100644
--- a/packages/nodes-base/nodes/Schedule/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Schedule/GenericFunctions.ts
@@ -1,6 +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,
diff --git a/packages/nodes-base/nodes/Schedule/ScheduleTrigger.node.json b/packages/nodes-base/nodes/Schedule/ScheduleTrigger.node.json
index 4f9755e438..fd6aa494fb 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 10a9a4ae6e..920e4e6373 100644
--- a/packages/nodes-base/nodes/Schedule/ScheduleTrigger.node.ts
+++ b/packages/nodes-base/nodes/Schedule/ScheduleTrigger.node.ts
@@ -8,7 +8,7 @@ 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 { convertToUnixFormat, recurencyCheck } from './GenericFunctions';
 
@@ -33,7 +33,7 @@ export class ScheduleTrigger 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/SeaTable/SeaTableTrigger.node.ts b/packages/nodes-base/nodes/SeaTable/SeaTableTrigger.node.ts
index d27e55144a..41f497497f 100644
--- a/packages/nodes-base/nodes/SeaTable/SeaTableTrigger.node.ts
+++ b/packages/nodes-base/nodes/SeaTable/SeaTableTrigger.node.ts
@@ -5,6 +5,8 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 
+import moment from 'moment-timezone';
+
 import { seaTableApiRequest, simplify_new, enrichColumns } from './v2/GenericFunctions';
 
 import type {
@@ -19,8 +21,6 @@ import type {
 	IColumnDigitalSignature,
 } from './v2/actions/Interfaces';
 
-import moment from 'moment';
-
 import { loadOptions } from './v2/methods';
 
 export class SeaTableTrigger implements INodeType {
diff --git a/packages/nodes-base/nodes/SeaTable/seatable.svg b/packages/nodes-base/nodes/SeaTable/seatable.svg
index 472598576d..437e33c87a 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/v1/types.ts b/packages/nodes-base/nodes/SeaTable/v1/types.ts
index cc8ee249fe..876342b368 100644
--- a/packages/nodes-base/nodes/SeaTable/v1/types.ts
+++ b/packages/nodes-base/nodes/SeaTable/v1/types.ts
@@ -9,8 +9,8 @@ export type TSeaTableServerEdition = 'enterprise edition';
 //         dtable
 // ----------------------------------
 
-import type { IDtableMetadataColumn, IDtableMetadataTable, TDtableViewColumn } from './Interfaces';
 import type { ICredentialDataDecryptedObject } from 'n8n-workflow';
+import type { IDtableMetadataColumn, IDtableMetadataTable, TDtableViewColumn } from './Interfaces';
 
 export type TInheritColumnTypeTime = 'ctime' | 'mtime';
 export type TInheritColumnTypeUser = 'creator' | 'last-modifier';
diff --git a/packages/nodes-base/nodes/SecurityScorecard/SecurityScorecard.node.ts b/packages/nodes-base/nodes/SecurityScorecard/SecurityScorecard.node.ts
index 3e2d491a78..978135609e 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',
diff --git a/packages/nodes-base/nodes/SecurityScorecard/descriptions/ReportDescription.ts b/packages/nodes-base/nodes/SecurityScorecard/descriptions/ReportDescription.ts
index 805e6a7d7c..f856770225 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 dd1d2a6bfa..d60c4f05db 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/Segment.node.ts b/packages/nodes-base/nodes/Segment/Segment.node.ts
index f83db44a1f..850df9bd40 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 05ce1a787a..97a92bbb93 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/SendGrid.node.json b/packages/nodes-base/nodes/SendGrid/SendGrid.node.json
index 3e5fdccc37..0bccd6cf99 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 772fc3c924..c343239128 100644
--- a/packages/nodes-base/nodes/SendGrid/SendGrid.node.ts
+++ b/packages/nodes-base/nodes/SendGrid/SendGrid.node.ts
@@ -8,6 +8,7 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 
+import moment from 'moment-timezone';
 import { listFields, listOperations } from './ListDescription';
 
 import { contactFields, contactOperations } from './ContactDescription';
@@ -17,8 +18,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',
diff --git a/packages/nodes-base/nodes/SendGrid/sendGrid.svg b/packages/nodes-base/nodes/SendGrid/sendGrid.svg
index f8ba825549..c7d0a5481b 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/Sendy/Sendy.node.json b/packages/nodes-base/nodes/Sendy/Sendy.node.json
index f3c54f179f..b65a74caac 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/SentryIo/sentryio.svg b/packages/nodes-base/nodes/SentryIo/sentryio.svg
index 60643b76f6..1988b93ff0 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/servicenow.svg b/packages/nodes-base/nodes/ServiceNow/servicenow.svg
index e5567e562c..95186a8ae6 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 ec62590cae..d6f5a78a97 100644
--- a/packages/nodes-base/nodes/Set/Set.node.json
+++ b/packages/nodes-base/nodes/Set/Set.node.json
@@ -121,7 +121,7 @@
 			}
 		]
 	},
-	"alias": ["Set", "JSON", "Filter", "Transform", "Map"],
+	"alias": ["Set", "JS", "JSON", "Filter", "Transform", "Map"],
 	"subcategories": {
 		"Core Nodes": ["Data Transformation"]
 	}
diff --git a/packages/nodes-base/nodes/Set/v2/SetV2.node.ts b/packages/nodes-base/nodes/Set/v2/SetV2.node.ts
index 62a8601401..1076c0d2d1 100644
--- a/packages/nodes-base/nodes/Set/v2/SetV2.node.ts
+++ b/packages/nodes-base/nodes/Set/v2/SetV2.node.ts
@@ -22,7 +22,7 @@ const versionDescription: INodeTypeDescription = {
 	icon: 'fa:pen',
 	group: ['input'],
 	version: [3, 3.1, 3.2],
-	description: 'Change the structure of your items',
+	description: 'Modify, add, or remove item fields',
 	subtitle: '={{$parameter["mode"]}}',
 	defaults: {
 		name: 'Edit Fields',
@@ -157,7 +157,7 @@ const versionDescription: INodeTypeDescription = {
 			default: {},
 			options: [
 				{
-					displayName: 'Include Binary Data',
+					displayName: 'Include Binary File',
 					name: 'includeBinary',
 					type: 'boolean',
 					default: true,
diff --git a/packages/nodes-base/nodes/Set/v2/helpers/utils.ts b/packages/nodes-base/nodes/Set/v2/helpers/utils.ts
index 9a27ba44c0..31943b0fbf 100644
--- a/packages/nodes-base/nodes/Set/v2/helpers/utils.ts
+++ b/packages/nodes-base/nodes/Set/v2/helpers/utils.ts
@@ -5,15 +5,21 @@ import type {
 	INode,
 	INodeExecutionData,
 } from 'n8n-workflow';
-import { deepCopy, NodeOperationError, jsonParse, validateFieldType } from 'n8n-workflow';
+import {
+	deepCopy,
+	NodeOperationError,
+	jsonParse,
+	validateFieldType,
+	ApplicationError,
+} from 'n8n-workflow';
 
 import set from 'lodash/set';
 import get from 'lodash/get';
 import unset from 'lodash/unset';
 
+import { getResolvables } from '../../../../utils/utilities';
 import type { SetNodeOptions, SetField } from './interfaces';
 import { INCLUDE } from './interfaces';
-import { getResolvables } from '../../../../utils/utilities';
 
 const configureFieldHelper = (dotNotation?: boolean) => {
 	if (dotNotation !== false) {
@@ -29,15 +35,28 @@ const configureFieldHelper = (dotNotation?: boolean) => {
 			},
 		};
 	} else {
+		const sanitazeKey = (item: IDataObject, key: string) => {
+			if (item[key] !== undefined) {
+				return key;
+			}
+
+			if (key.startsWith("['") && key.endsWith("']")) {
+				key = key.slice(2, -2);
+				if (item[key] !== undefined) {
+					return key;
+				}
+			}
+			return key;
+		};
 		return {
 			set: (item: IDataObject, key: string, value: IDataObject) => {
-				item[key] = value;
+				item[sanitazeKey(item, key)] = value;
 			},
 			get: (item: IDataObject, key: string) => {
-				return item[key];
+				return item[sanitazeKey(item, key)];
 			},
 			unset: (item: IDataObject, key: string) => {
-				delete item[key];
+				delete item[sanitazeKey(item, key)];
 			},
 		};
 	}
@@ -101,7 +120,9 @@ export function composeReturnItem(
 		case INCLUDE.NONE:
 			break;
 		default:
-			throw new Error(`The include option "${options.include}" is not known!`);
+			throw new ApplicationError(`The include option "${options.include}" is not known!`, {
+				level: 'warning',
+			});
 	}
 
 	for (const key of Object.keys(newFields)) {
diff --git a/packages/nodes-base/nodes/Set/v2/manual.mode.ts b/packages/nodes-base/nodes/Set/v2/manual.mode.ts
index c1411d1463..42eb3e2a7d 100644
--- a/packages/nodes-base/nodes/Set/v2/manual.mode.ts
+++ b/packages/nodes-base/nodes/Set/v2/manual.mode.ts
@@ -7,6 +7,7 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
+import { updateDisplayOptions } from '../../../utils/utilities';
 import {
 	parseJsonParameter,
 	validateEntry,
@@ -14,7 +15,6 @@ import {
 	resolveRawData,
 } from './helpers/utils';
 import type { SetField, SetNodeOptions } from './helpers/interfaces';
-import { updateDisplayOptions } from '../../../utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
@@ -139,11 +139,9 @@ const properties: INodeProperties[] = [
 					{
 						displayName: 'Value',
 						name: 'objectValue',
-						type: 'string',
+						type: 'json',
 						default: '={}',
 						typeOptions: {
-							editor: 'json',
-							editorLanguage: 'json',
 							rows: 2,
 						},
 						displayOptions: {
diff --git a/packages/nodes-base/nodes/Set/v2/raw.mode.ts b/packages/nodes-base/nodes/Set/v2/raw.mode.ts
index eb73534720..dfb723916c 100644
--- a/packages/nodes-base/nodes/Set/v2/raw.mode.ts
+++ b/packages/nodes-base/nodes/Set/v2/raw.mode.ts
@@ -7,21 +7,19 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
+import { updateDisplayOptions } from '../../../utils/utilities';
 import { parseJsonParameter, composeReturnItem, resolveRawData } from './helpers/utils';
 import type { SetNodeOptions } from './helpers/interfaces';
-import { updateDisplayOptions } from '../../../utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
 		displayName: 'JSON Output',
 		name: 'jsonOutput',
-		type: 'string',
+		type: 'json',
 		typeOptions: {
-			editor: 'json',
-			editorLanguage: 'json',
 			rows: 5,
 		},
-		default: '{\n  "my_field_1": "value",\n  "my_field_2": 1\n}',
+		default: '{\n  "my_field_1": "value",\n  "my_field_2": 1\n}\n',
 		validateType: 'object',
 		ignoreValidationDuringExecution: true,
 	},
diff --git a/packages/nodes-base/nodes/Shopify/ShopifyTrigger.node.ts b/packages/nodes-base/nodes/Shopify/ShopifyTrigger.node.ts
index 3fef89e3a5..c640e7c9f8 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 bf03ea8778..48dfc778b5 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/Slack/V1/FileDescription.ts b/packages/nodes-base/nodes/Slack/V1/FileDescription.ts
index e22ad88882..57ffb0ac1a 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/SlackV1.node.ts b/packages/nodes-base/nodes/Slack/V1/SlackV1.node.ts
index a855ec257a..b247a0b810 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';
@@ -24,8 +25,6 @@ import type { IAttachment } from './MessageInterface';
 
 import { oldVersionNotice } from '@utils/descriptions';
 
-import moment from 'moment';
-
 interface Attachment {
 	fields: {
 		item?: object[];
diff --git a/packages/nodes-base/nodes/Slack/V2/FileDescription.ts b/packages/nodes-base/nodes/Slack/V2/FileDescription.ts
index fdd1aaf9be..aecf8e2bfb 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,
@@ -66,7 +66,7 @@ export const fileFields: INodeProperties[] = [
 		placeholder: '',
 	},
 	{
-		displayName: 'Binary Property',
+		displayName: 'File Property',
 		name: 'binaryPropertyName',
 		type: 'string',
 		default: 'data',
diff --git a/packages/nodes-base/nodes/Slack/V2/GenericFunctions.ts b/packages/nodes-base/nodes/Slack/V2/GenericFunctions.ts
index bba64ba395..73870d9ec7 100644
--- a/packages/nodes-base/nodes/Slack/V2/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Slack/V2/GenericFunctions.ts
@@ -64,6 +64,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') {
@@ -72,6 +73,7 @@ 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',
 				},
 			);
 		}
diff --git a/packages/nodes-base/nodes/Slack/V2/SlackV2.node.ts b/packages/nodes-base/nodes/Slack/V2/SlackV2.node.ts
index b707be5d31..5f66519b45 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';
@@ -31,8 +32,6 @@ import {
 	getMessageContent,
 } from './GenericFunctions';
 
-import moment from 'moment';
-
 export class SlackV2 implements INodeType {
 	description: INodeTypeDescription;
 
@@ -1173,6 +1172,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();
diff --git a/packages/nodes-base/nodes/Slack/V2/UserDescription.ts b/packages/nodes-base/nodes/Slack/V2/UserDescription.ts
index 1ced8d7dae..fc69e0eeb2 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 29072dc62a..12747e2eec 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/seven.svg b/packages/nodes-base/nodes/Sms77/seven.svg
index d6024ffc87..4689cec4ff 100644
--- a/packages/nodes-base/nodes/Sms77/seven.svg
+++ b/packages/nodes-base/nodes/Sms77/seven.svg
@@ -1 +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.48 37.48 0 0 0-4.14-2.95h117.06c2.22 0 3.26.31 3.71.52-.23.3-.7.76-1.62 1.38z"/></svg>
+<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/Snowflake/Snowflake.node.ts b/packages/nodes-base/nodes/Snowflake/Snowflake.node.ts
index a2edd9d368..a2d33e95f3 100644
--- a/packages/nodes-base/nodes/Snowflake/Snowflake.node.ts
+++ b/packages/nodes-base/nodes/Snowflake/Snowflake.node.ts
@@ -6,9 +6,9 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 
+import snowflake from 'snowflake-sdk';
 import { connect, destroy, execute } from './GenericFunctions';
 
-import snowflake from 'snowflake-sdk';
 import { getResolvables } from '@utils/utilities';
 
 export class Snowflake implements INodeType {
@@ -24,6 +24,7 @@ export class Snowflake implements INodeType {
 		},
 		inputs: ['main'],
 		outputs: ['main'],
+		parameterPane: 'wide',
 		credentials: [
 			{
 				name: 'snowflake',
@@ -69,7 +70,6 @@ export class Snowflake implements INodeType {
 				noDataExpression: true,
 				typeOptions: {
 					editor: 'sqlEditor',
-					rows: 5,
 				},
 				displayOptions: {
 					show: {
diff --git a/packages/nodes-base/nodes/Snowflake/snowflake.svg b/packages/nodes-base/nodes/Snowflake/snowflake.svg
index be59081ae9..8d20a49feb 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/Splunk/Splunk.node.ts b/packages/nodes-base/nodes/Splunk/Splunk.node.ts
index 7fbbab14fb..371ab8abb2 100644
--- a/packages/nodes-base/nodes/Splunk/Splunk.node.ts
+++ b/packages/nodes-base/nodes/Splunk/Splunk.node.ts
@@ -10,6 +10,7 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 
+import type { OptionsWithUri } from 'request';
 import {
 	formatFeed,
 	formatResults,
@@ -35,8 +36,6 @@ import {
 
 import type { SplunkCredentials, SplunkFeedResponse } from './types';
 
-import type { OptionsWithUri } from 'request';
-
 export class Splunk implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Splunk',
diff --git a/packages/nodes-base/nodes/Splunk/splunk.svg b/packages/nodes-base/nodes/Splunk/splunk.svg
index 808255d4fb..8e79edc812 100644
--- a/packages/nodes-base/nodes/Splunk/splunk.svg
+++ b/packages/nodes-base/nodes/Splunk/splunk.svg
@@ -1,3 +1 @@
-<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>
+<svg xmlns="http://www.w3.org/2000/svg" width="200" height="136" fill="none" viewBox="2 25 102 16"><path fill="#0C1724" d="M12.928 21.802a5 5 0 0 1-.509 2.236 5.1 5.1 0 0 1-1.423 1.736q-.918.718-2.176 1.113-1.26.396-2.761.396c-1.197 0-2.271-.16-3.213-.49C1.903 26.472.952 25.924 0 25.17l1.574-2.557q1.128.948 2.044 1.387a4.2 4.2 0 0 0 1.866.434c.782 0 1.404-.198 1.885-.604.48-.405.706-.943.706-1.632 0-.292-.047-.566-.132-.82-.084-.255-.245-.52-.47-.793a6.4 6.4 0 0 0-.952-.877 47 47 0 0 0-1.555-1.17c-.48-.34-.961-.698-1.423-1.057a11.5 11.5 0 0 1-1.263-1.17 5.3 5.3 0 0 1-.914-1.396 4.3 4.3 0 0 1-.348-1.755c0-.754.16-1.453.47-2.075A4.8 4.8 0 0 1 2.78 9.49c.546-.444 1.196-.783 1.97-1.029a8.1 8.1 0 0 1 2.496-.368 9.9 9.9 0 0 1 2.752.378 9.3 9.3 0 0 1 2.468 1.113l-1.422 2.302c-.971-.68-1.998-1.029-3.072-1.029-.65 0-1.197.17-1.621.51s-.64.764-.64 1.283c0 .49.188.934.565 1.32.377.397 1.027.935 1.95 1.652a42 42 0 0 1 2.309 1.792c.612.51 1.093 1 1.45 1.453.359.453.595.906.736 1.377.141.481.207.99.207 1.557m16.16-4.311q0 1.06-.226 2.292a7.9 7.9 0 0 1-.754 2.274c-.358.698-.82 1.273-1.394 1.717-.575.452-1.31.679-2.186.679-1.47 0-2.63-.585-3.477-1.764-.848-1.17-1.272-2.783-1.272-4.83 0-2.104.424-3.765 1.29-5 .858-1.236 2.026-1.85 3.496-1.85 1.395 0 2.497.585 3.308 1.736.81 1.16 1.215 2.746 1.215 4.746m5.107-.18c0-1.368-.197-2.613-.584-3.726-.396-1.123-.942-2.085-1.668-2.896a7.7 7.7 0 0 0-2.563-1.887q-1.484-.68-3.279-.68c-1.319 0-2.478.255-3.477.746-.999.5-1.931 1.283-2.78 2.358l-.028-2.67h-4.702V36h4.693V24.406c.462.537.904.99 1.338 1.358.424.368.857.67 1.3.896.443.227.905.397 1.395.491s1.017.142 1.573.142a8.3 8.3 0 0 0 3.487-.746 8.2 8.2 0 0 0 2.789-2.104 10.2 10.2 0 0 0 1.837-3.16c.453-1.207.67-2.538.67-3.972m2.092 9.538h4.825V0h-4.825zm25.404.01V8.537h-4.824v9.858q0 1.317-.113 2.038a5.4 5.4 0 0 1-.368 1.302c-.678 1.51-1.932 2.273-3.75 2.273-1.423 0-2.412-.509-2.978-1.537a3.9 3.9 0 0 1-.462-1.321c-.084-.49-.131-1.198-.131-2.132V8.538H44.24v10.405c0 .708.01 1.312.019 1.793a12.6 12.6 0 0 0 .264 2.311c.056.293.15.576.273.84.443 1.122 1.15 1.971 2.139 2.547.99.575 2.205.858 3.637.858 1.291 0 2.431-.226 3.411-.679s1.932-1.189 2.855-2.217l.01 2.453zm20.787-.01V16.462c0-.707-.01-1.311-.019-1.811-.01-.5-.038-.934-.094-1.302a9 9 0 0 0-.18-.962q-.113-.425-.254-.821c-.442-1.094-1.15-1.943-2.139-2.538s-2.205-.896-3.646-.896c-1.291 0-2.431.226-3.411.68-.98.452-1.932 1.197-2.855 2.216l-.01-2.453h-4.853V26.86h4.863v-9.87c0-.85.028-1.52.094-1.991.056-.472.179-.915.349-1.34a3.4 3.4 0 0 1 1.45-1.66c.65-.377 1.423-.566 2.328-.566 1.423 0 2.412.51 2.978 1.538.216.386.367.83.452 1.311s.132 1.198.132 2.123V26.84zm19.957-1.207-7.35-9.142 6.21-6.66-3.656-1.576-6.464 7.5h-.509V0h-4.862v26.85h4.862v-9.727l7.275 10.094zm18.79-6.566v-2.991l-14.615-7.34v3.293l11.326 5.519-11.326 5.594v3.217zM108.023 4c-.895 0-1.621.736-1.621 1.642 0 .924.726 1.65 1.621 1.65.905 0 1.621-.726 1.621-1.65A1.62 1.62 0 0 0 108.023 4m.01.255c.725 0 1.309.622 1.309 1.396s-.584 1.396-1.309 1.387c-.735 0-1.32-.613-1.32-1.396 0-.765.585-1.387 1.32-1.387m-.311 1.556h.197c.236 0 .349.085.396.321.038.245.085.406.123.462h.311c-.029-.056-.076-.17-.113-.452-.038-.274-.142-.416-.311-.444V5.68c.198-.056.358-.207.358-.443 0-.17-.057-.302-.17-.378-.113-.084-.292-.141-.565-.141a2.6 2.6 0 0 0-.518.047v1.83h.292zm0-.849a1 1 0 0 1 .207-.019c.33 0 .443.16.443.321 0 .227-.208.311-.443.311h-.207z"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Spontit/Spontit.node.ts b/packages/nodes-base/nodes/Spontit/Spontit.node.ts
index b54cd906e2..a2e9475f9e 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/spotify.svg b/packages/nodes-base/nodes/Spotify/spotify.svg
index 96c9e3a6dc..b0389fa7cf 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 5eb36aaa97..7f4260ba45 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 e59692b423..d1333c7a25 100644
--- a/packages/nodes-base/nodes/SpreadsheetFile/SpreadsheetFile.node.ts
+++ b/packages/nodes-base/nodes/SpreadsheetFile/SpreadsheetFile.node.ts
@@ -7,6 +7,7 @@ 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',
diff --git a/packages/nodes-base/nodes/SpreadsheetFile/description.ts b/packages/nodes-base/nodes/SpreadsheetFile/description.ts
index 903245fc61..78c8952b90 100644
--- a/packages/nodes-base/nodes/SpreadsheetFile/description.ts
+++ b/packages/nodes-base/nodes/SpreadsheetFile/description.ts
@@ -1,97 +1,41 @@
 import type { INodeProperties } from 'n8n-workflow';
 
-export const operationProperties: 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 fromFileProperties: INodeProperties[] = [
-	{
-		displayName: 'Binary Property',
-		name: 'binaryPropertyName',
-		type: 'string',
-		default: 'data',
-		required: true,
-		displayOptions: {
-			show: {
-				operation: ['fromFile'],
-			},
+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',
 		},
-		placeholder: '',
-		description:
-			'Name of the binary property from which to read the binary data of the spreadsheet file',
-	},
-];
-
-export const fromFileV2Properties: INodeProperties[] = [
-	{
-		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',
-		displayOptions: {
-			show: {
-				operation: ['fromFile'],
-			},
+		{
+			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'],
 		},
-		description: 'The format of the binary data to read from',
 	},
-];
+};
 
 export const toFileProperties: INodeProperties[] = [
 	{
@@ -139,7 +83,7 @@ export const toFileProperties: INodeProperties[] = [
 		description: 'The format of the file to save the data as',
 	},
 	{
-		displayName: 'Binary Property',
+		displayName: 'Put Output File in Field',
 		name: 'binaryPropertyName',
 		type: 'string',
 		default: 'data',
@@ -150,189 +94,176 @@ export const toFileProperties: INodeProperties[] = [
 			},
 		},
 		placeholder: '',
-		description:
-			'Name of the binary property in which to save the binary data of the spreadsheet file',
+		hint: 'The name of the output binary field to put the file in',
 	},
 ];
 
-export const optionsProperties: INodeProperties[] = [
-	{
-		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: 'Delimiter',
-				name: 'delimiter',
-				type: 'string',
-				displayOptions: {
-					show: {
-						'/operation': ['fromFile'],
-						'/fileFormat': ['csv'],
-					},
-				},
-				default: ',',
-				description: 'Set the field delimiter',
-			},
-			{
-				displayName: 'Starting Line',
-				name: 'fromLine',
-				type: 'number',
-				displayOptions: {
-					show: {
-						'/operation': ['fromFile'],
-						'/fileFormat': ['csv'],
-					},
-				},
-				default: 0,
-				description: 'Start handling records from the requested line number',
-			},
-			{
-				displayName: 'Max Number of Rows to Load',
-				name: 'maxRowCount',
-				type: 'number',
-				displayOptions: {
-					show: {
-						'/operation': ['fromFile'],
-						'/fileFormat': ['csv'],
-					},
-				},
-				default: -1,
-				description: 'Stop handling records after the requested number of rows are read',
-			},
-			{
-				displayName: 'Exclude Byte Order Mark (BOM)',
-				name: 'enableBOM',
-				type: 'boolean',
-				displayOptions: {
-					show: {
-						'/operation': ['fromFile'],
-						'/fileFormat': ['csv'],
-					},
-				},
-				default: false,
-				description:
-					'Whether to detect and exclude the byte-order-mark from the CSV Input if present',
-			},
-			{
-				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',
-			},
-		],
+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 55e64e2e23..f4779fb77e 100644
--- a/packages/nodes-base/nodes/SpreadsheetFile/test/SpreadsheetFile.test.ts
+++ b/packages/nodes-base/nodes/SpreadsheetFile/test/SpreadsheetFile.test.ts
@@ -178,6 +178,22 @@ describe('Execute Spreadsheet File Node', () => {
 				},
 			},
 		},
+		{
+			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/utf8.csv b/packages/nodes-base/nodes/SpreadsheetFile/test/utf8.csv
new file mode 100644
index 0000000000..4ea2755e56
--- /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.utf8.json b/packages/nodes-base/nodes/SpreadsheetFile/test/workflow.utf8.json
new file mode 100644
index 0000000000..de88e69319
--- /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
index 35ff2f80bb..3a57d58c23 100644
--- a/packages/nodes-base/nodes/SpreadsheetFile/v1/SpreadsheetFileV1.node.ts
+++ b/packages/nodes-base/nodes/SpreadsheetFile/v1/SpreadsheetFileV1.node.ts
@@ -1,4 +1,3 @@
-/* eslint-disable n8n-nodes-base/node-filename-against-convention */
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -24,10 +23,11 @@ import {
 } from 'xlsx';
 
 import {
-	operationProperties,
-	fromFileProperties,
+	operationProperty,
+	binaryProperty,
 	toFileProperties,
-	optionsProperties,
+	fromFileOptions,
+	toFileOptions,
 } from '../description';
 import { flattenObject, generatePairedItemData } from '@utils/utilities';
 import { oldVersionNotice } from '@utils/descriptions';
@@ -47,10 +47,11 @@ export class SpreadsheetFileV1 implements INodeType {
 			outputs: ['main'],
 			properties: [
 				oldVersionNotice,
-				...operationProperties,
-				...fromFileProperties,
+				operationProperty,
+				binaryProperty,
 				...toFileProperties,
-				...optionsProperties,
+				fromFileOptions,
+				toFileOptions,
 			],
 		};
 	}
@@ -78,6 +79,7 @@ export class SpreadsheetFileV1 implements INodeType {
 
 					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);
diff --git a/packages/nodes-base/nodes/SpreadsheetFile/v2/SpreadsheetFileV2.node.ts b/packages/nodes-base/nodes/SpreadsheetFile/v2/SpreadsheetFileV2.node.ts
index 0e951dbd0e..c1a75b69a9 100644
--- a/packages/nodes-base/nodes/SpreadsheetFile/v2/SpreadsheetFileV2.node.ts
+++ b/packages/nodes-base/nodes/SpreadsheetFile/v2/SpreadsheetFileV2.node.ts
@@ -1,38 +1,14 @@
-/* eslint-disable n8n-nodes-base/node-filename-against-convention */
 import type {
-	IDataObject,
 	IExecuteFunctions,
 	INodeExecutionData,
 	INodeType,
 	INodeTypeBaseDescription,
 	INodeTypeDescription,
 } from 'n8n-workflow';
-import { BINARY_ENCODING, NodeOperationError } from 'n8n-workflow';
 
-import type {
-	JSON2SheetOpts,
-	Sheet2JSONOpts,
-	WorkBook,
-	WritingOptions,
-	ParsingOptions,
-} from 'xlsx';
-
-import {
-	read as xlsxRead,
-	readFile as xlsxReadFile,
-	utils as xlsxUtils,
-	write as xlsxWrite,
-} from 'xlsx';
-import { parse as createCSVParser } from 'csv-parse';
-
-import {
-	operationProperties,
-	fromFileProperties,
-	toFileProperties,
-	optionsProperties,
-	fromFileV2Properties,
-} from '../description';
-import { flattenObject, generatePairedItemData } from '@utils/utilities';
+import { operationProperty } from '../description';
+import * as fromFile from './fromFile.operation';
+import * as toFile from './toFile.operation';
 
 export class SpreadsheetFileV2 implements INodeType {
 	description: INodeTypeDescription;
@@ -47,271 +23,23 @@ export class SpreadsheetFileV2 implements INodeType {
 			},
 			inputs: ['main'],
 			outputs: ['main'],
-			properties: [
-				...operationProperties,
-				...fromFileProperties,
-				...fromFileV2Properties,
-				...toFileProperties,
-				...optionsProperties,
-			],
+			properties: [operationProperty, ...fromFile.description, ...toFile.description],
 		};
 	}
 
-	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+	async execute(this: IExecuteFunctions) {
 		const items = this.getInputData();
-
 		const operation = this.getNodeParameter('operation', 0);
-
-		const newItems: INodeExecutionData[] = [];
+		let returnData: INodeExecutionData[] = [];
 
 		if (operation === 'fromFile') {
-			// Read data from spreadsheet file to workflow
-			for (let i = 0; i < items.length; i++) {
-				try {
-					const options = this.getNodeParameter('options', i, {});
-					let fileFormat = this.getNodeParameter('fileFormat', i, {});
-					const binaryPropertyName = this.getNodeParameter('binaryPropertyName', i);
-					const binaryData = this.helpers.assertBinaryData(i, binaryPropertyName);
-
-					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) {
-							newItems.push({
-								json: {
-									row: rowData,
-								},
-								pairedItem: {
-									item: i,
-								},
-							} as INodeExecutionData);
-						}
-					} else {
-						for (const rowData of rows) {
-							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 new NodeOperationError(this.getNode(), error, { itemIndex: i });
-				}
-			}
-
-			return [newItems];
-		} else if (operation === 'toFile') {
-			const pairedItem = generatePairedItemData(items.length);
-			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!`,
-				);
-			}
+			returnData = await fromFile.execute.call(this, items);
 		}
-		return [newItems];
+
+		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 0000000000..ffafaa952d
--- /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 0000000000..b59d1568f2
--- /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 { generatePairedItemData } from '@utils/utilities';
+import type { JsonToSpreadsheetBinaryFormat, JsonToSpreadsheetBinaryOptions } from '@utils/binary';
+import { convertJsonToSpreadsheetBinary } from '@utils/binary';
+import { toFileOptions, toFileProperties } from '../description';
+
+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 3a46546a73..7965e4c1bd 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/Ssh/Ssh.node.ts b/packages/nodes-base/nodes/Ssh/Ssh.node.ts
index 565713351f..7625289797 100644
--- a/packages/nodes-base/nodes/Ssh/Ssh.node.ts
+++ b/packages/nodes-base/nodes/Ssh/Ssh.node.ts
@@ -1,3 +1,5 @@
+import { rm, writeFile } from 'fs/promises';
+import type { Readable } from 'stream';
 import type {
 	ICredentialTestFunctions,
 	ICredentialsDecrypted,
@@ -10,15 +12,11 @@ import type {
 } from 'n8n-workflow';
 import { BINARY_ENCODING, NodeOperationError } from 'n8n-workflow';
 
-import { formatPrivateKey } from '@utils/utilities';
-
-import { rm, writeFile } from 'fs/promises';
-
 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,
@@ -193,7 +191,7 @@ export class Ssh implements INodeType {
 				default: 'upload',
 			},
 			{
-				displayName: 'Binary Property',
+				displayName: 'Input Binary Field',
 				name: 'binaryPropertyName',
 				type: 'string',
 				default: 'data',
@@ -205,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',
@@ -241,7 +238,7 @@ export class Ssh implements INodeType {
 				required: true,
 			},
 			{
-				displayName: 'Binary Property',
+				displayName: 'File Property',
 				displayOptions: {
 					show: {
 						resource: ['file'],
diff --git a/packages/nodes-base/nodes/Stackby/Stackby.node.ts b/packages/nodes-base/nodes/Stackby/Stackby.node.ts
index ad4e491497..608551fac0 100644
--- a/packages/nodes-base/nodes/Stackby/Stackby.node.ts
+++ b/packages/nodes-base/nodes/Stackby/Stackby.node.ts
@@ -7,9 +7,9 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
+import { generatePairedItemData } from '../../utils/utilities';
 import type { IRecord } from './GenericFunction';
 import { apiRequest, apiRequestAllItems } from './GenericFunction';
-import { generatePairedItemData } from '../../utils/utilities';
 
 export class Stackby implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/StickyNote/StickyNote.node.ts b/packages/nodes-base/nodes/StickyNote/StickyNote.node.ts
index 7dc2eebf23..d9538bdf44 100644
--- a/packages/nodes-base/nodes/StickyNote/StickyNote.node.ts
+++ b/packages/nodes-base/nodes/StickyNote/StickyNote.node.ts
@@ -44,6 +44,14 @@ 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,
+			},
 		],
 	};
 
diff --git a/packages/nodes-base/nodes/StopAndError/StopAndError.node.json b/packages/nodes-base/nodes/StopAndError/StopAndError.node.json
index 29e19dc814..b46fd906bd 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 537ce4101b..3378c73699 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 fcb31fdad8..dc0c630de6 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 { IDataObject } from 'n8n-workflow';
 import type { WorkflowTestData } from '@test/nodes/types';
 import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import * as Helpers from '@test/nodes/Helpers';
-import type { IDataObject } from 'n8n-workflow';
 
 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/Storyblok.node.json b/packages/nodes-base/nodes/Storyblok/Storyblok.node.json
index 2ce9f0153f..b9db04104e 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.svg b/packages/nodes-base/nodes/Storyblok/storyblok.svg
index c47cb1e56a..c8b617c2d6 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/Strapi.node.json b/packages/nodes-base/nodes/Strapi/Strapi.node.json
index a541cfd2c9..07df9ead6d 100644
--- a/packages/nodes-base/nodes/Strapi/Strapi.node.json
+++ b/packages/nodes-base/nodes/Strapi/Strapi.node.json
@@ -2,7 +2,7 @@
 	"node": "n8n-nodes-base.strapi",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": ["Data & Storage", "Marketing & Content"],
+	"categories": ["Data & Storage", "Marketing"],
 	"resources": {
 		"credentialDocumentation": [
 			{
diff --git a/packages/nodes-base/nodes/Strapi/strapi.svg b/packages/nodes-base/nodes/Strapi/strapi.svg
index ceb65ff0e3..3496c5a10d 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/Strava.node.ts b/packages/nodes-base/nodes/Strava/Strava.node.ts
index c7b8e7778f..f88c9c94dc 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',
diff --git a/packages/nodes-base/nodes/Strava/StravaTrigger.node.ts b/packages/nodes-base/nodes/Strava/StravaTrigger.node.ts
index 9aa248db92..c937825e5f 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',
diff --git a/packages/nodes-base/nodes/Strava/strava.svg b/packages/nodes-base/nodes/Strava/strava.svg
index d94ac6a66f..8c68136b5b 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.svg b/packages/nodes-base/nodes/Stripe/stripe.svg
index e5419a6d1d..f6bcb749dd 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/Supabase.node.ts b/packages/nodes-base/nodes/Supabase/Supabase.node.ts
index 340b4cace5..9e025547bc 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);
diff --git a/packages/nodes-base/nodes/Supabase/supabase.svg b/packages/nodes-base/nodes/Supabase/supabase.svg
index ad802ac16a..7f00f09fc9 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/SurveyMonkeyTrigger.node.json b/packages/nodes-base/nodes/SurveyMonkey/SurveyMonkeyTrigger.node.json
index 357d2ae3e8..439bc2afc8 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 a6ef965a07..289b4ebd49 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',
diff --git a/packages/nodes-base/nodes/SurveyMonkey/surveyMonkey.svg b/packages/nodes-base/nodes/SurveyMonkey/surveyMonkey.svg
index 9d6409a2f1..27a55e3163 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 d88e874ee0..9b6de4015f 100644
--- a/packages/nodes-base/nodes/Switch/Switch.node.ts
+++ b/packages/nodes-base/nodes/Switch/Switch.node.ts
@@ -3,6 +3,7 @@ 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() {
@@ -12,12 +13,13 @@ export class Switch extends VersionedNodeType {
 			icon: 'fa:map-signs',
 			group: ['transform'],
 			description: 'Route items depending on defined expression or rules',
-			defaultVersion: 2,
+			defaultVersion: 3,
 		};
 
 		const nodeVersions: IVersionedNodeType['nodeVersions'] = {
 			1: new SwitchV1(baseDescription),
 			2: new SwitchV2(baseDescription),
+			3: new SwitchV3(baseDescription),
 		};
 
 		super(nodeVersions, baseDescription);
diff --git a/packages/nodes-base/nodes/Switch/V2/SwitchV2.node.ts b/packages/nodes-base/nodes/Switch/V2/SwitchV2.node.ts
index 5fa67e83db..b63d1c670b 100644
--- a/packages/nodes-base/nodes/Switch/V2/SwitchV2.node.ts
+++ b/packages/nodes-base/nodes/Switch/V2/SwitchV2.node.ts
@@ -23,7 +23,7 @@ export class SwitchV2 implements INodeType {
 				color: '#506000',
 			},
 			inputs: ['main'],
-			// eslint-disable-next-line prettier/prettier
+
 			outputs: `={{
 					((parameters) => {
 						const rules = parameters.rules?.rules ?? [];
@@ -152,6 +152,7 @@ export class SwitchV2 implements INodeType {
 					type: 'fixedCollection',
 					typeOptions: {
 						multipleValues: true,
+						sortable: true,
 					},
 					displayOptions: {
 						show: {
@@ -226,6 +227,7 @@ export class SwitchV2 implements INodeType {
 					type: 'fixedCollection',
 					typeOptions: {
 						multipleValues: true,
+						sortable: true,
 					},
 					displayOptions: {
 						show: {
@@ -299,6 +301,7 @@ export class SwitchV2 implements INodeType {
 					type: 'fixedCollection',
 					typeOptions: {
 						multipleValues: true,
+						sortable: true,
 					},
 					displayOptions: {
 						show: {
@@ -389,6 +392,7 @@ export class SwitchV2 implements INodeType {
 					type: 'fixedCollection',
 					typeOptions: {
 						multipleValues: true,
+						sortable: true,
 					},
 					displayOptions: {
 						show: {
@@ -499,7 +503,7 @@ export class SwitchV2 implements INodeType {
 							mode: ['rules'],
 						},
 					},
-					// eslint-disable-next-line n8n-nodes-base/node-param-options-type-unsorted-items
+
 					typeOptions: {
 						loadOptionsDependsOn: ['rules.rules'],
 						loadOptionsMethod: 'getFallbackOutputOptions',
@@ -640,6 +644,8 @@ export class SwitchV2 implements INodeType {
 				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) {
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 0000000000..52e4864433
--- /dev/null
+++ b/packages/nodes-base/nodes/Switch/V3/SwitchV3.node.ts
@@ -0,0 +1,390 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	ILoadOptionsFunctions,
+	INodeExecutionData,
+	INodeParameters,
+	INodePropertyOptions,
+	INodeType,
+	INodeTypeBaseDescription,
+	INodeTypeDescription,
+} from 'n8n-workflow';
+import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
+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's index to which send an input item, use expressions to calculate what input item should be routed to which output, 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 to change the operator, switch ON the option 'Less Strict Type Validation', or change the type with an expression";
+							}
+							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 0000000000..ea910a554d
--- /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 0000000000..ab506aa481
--- /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.rules.workflow.json b/packages/nodes-base/nodes/Switch/V3/test/switch.rules.workflow.json
new file mode 100644
index 0000000000..0cea4bcabd
--- /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/SyncroMSP/v1/actions/contact/index.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/index.ts
index 2b8dccbb51..92652e7bac 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 041c712a96..be3c8fd202 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 a8842a4af7..5eaeaf3ec3 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/ticket/index.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/index.ts
index ca2bcd6d78..49dfc1d67c 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/Taiga/GenericFunctions.ts b/packages/nodes-base/nodes/Taiga/GenericFunctions.ts
index 9b09ffc35b..d75883f8dd 100644
--- a/packages/nodes-base/nodes/Taiga/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Taiga/GenericFunctions.ts
@@ -1,3 +1,4 @@
+import { createHash } from 'crypto';
 import type { OptionsWithUri } from 'request';
 
 import type {
@@ -11,8 +12,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
-import { createHash } from 'crypto';
-
 export async function getAuthorization(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
 	credentials?: ICredentialDataDecryptedObject,
diff --git a/packages/nodes-base/nodes/Taiga/taiga.svg b/packages/nodes-base/nodes/Taiga/taiga.svg
index 913a5d31df..6aca2f9912 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/Tapfiliate/tapfiliate.svg b/packages/nodes-base/nodes/Tapfiliate/tapfiliate.svg
index 6ea919ed39..bb7a3b72d3 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 51de0a9adc..9a205aeaae 100644
--- a/packages/nodes-base/nodes/Telegram/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Telegram/GenericFunctions.ts
@@ -139,7 +139,7 @@ export function addAdditionalFields(
 		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) {
diff --git a/packages/nodes-base/nodes/Telegram/Telegram.node.ts b/packages/nodes-base/nodes/Telegram/Telegram.node.ts
index 3c3046bc82..cf721c1adc 100644
--- a/packages/nodes-base/nodes/Telegram/Telegram.node.ts
+++ b/packages/nodes-base/nodes/Telegram/Telegram.node.ts
@@ -688,7 +688,7 @@ export class Telegram implements INodeType {
 			// ----------------------------------
 
 			{
-				displayName: 'Binary Data',
+				displayName: 'Binary File',
 				name: 'binaryData',
 				type: 'boolean',
 				default: false,
@@ -709,11 +709,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 +1023,13 @@ export class Telegram implements INodeType {
 										type: 'options',
 										options: [
 											{
-												name: 'Markdown',
+												name: 'Markdown (Legacy)',
 												value: 'Markdown',
 											},
+											{
+												name: 'MarkdownV2',
+												value: 'MarkdownV2',
+											},
 											{
 												name: 'HTML',
 												value: 'HTML',
@@ -1575,9 +1580,13 @@ export class Telegram implements INodeType {
 						type: 'options',
 						options: [
 							{
-								name: 'Markdown',
+								name: 'Markdown (Legacy)',
 								value: 'Markdown',
 							},
+							{
+								name: 'MarkdownV2',
+								value: 'MarkdownV2',
+							},
 							{
 								name: 'HTML',
 								value: 'HTML',
diff --git a/packages/nodes-base/nodes/Telegram/telegram.svg b/packages/nodes-base/nodes/Telegram/telegram.svg
index 7169647621..d070edee6b 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 fab2dc8612..14132a0feb 100644
--- a/packages/nodes-base/nodes/TheHive/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/TheHive/GenericFunctions.ts
@@ -6,9 +6,9 @@ import type {
 	ILoadOptionsFunctions,
 	IDataObject,
 } 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(
@@ -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/TheHive.node.ts b/packages/nodes-base/nodes/TheHive/TheHive.node.ts
index 0dd2c26aba..8bd8ce91bb 100644
--- a/packages/nodes-base/nodes/TheHive/TheHive.node.ts
+++ b/packages/nodes-base/nodes/TheHive/TheHive.node.ts
@@ -10,6 +10,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 +35,6 @@ import {
 	theHiveApiRequest,
 } from './GenericFunctions';
 
-import set from 'lodash/set';
-
 export class TheHive implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'TheHive',
diff --git a/packages/nodes-base/nodes/TheHive/TheHiveTrigger.node.ts b/packages/nodes-base/nodes/TheHive/TheHiveTrigger.node.ts
index d293d40348..a3e7b8e5e1 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 835d47bd56..2522094645 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 8f8f8ed16b..834201ed65 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 d4d9a82b22..747d610222 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 03ef3ed41b..d48b8fd6f6 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/TheHiveProjectTrigger.node.ts b/packages/nodes-base/nodes/TheHiveProject/TheHiveProjectTrigger.node.ts
index 93a6c2315d..074573e7de 100644
--- a/packages/nodes-base/nodes/TheHiveProject/TheHiveProjectTrigger.node.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/TheHiveProjectTrigger.node.ts
@@ -31,6 +31,13 @@ export class TheHiveProjectTrigger implements INodeType {
 			},
 		],
 		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',
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/alert/create.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/alert/create.operation.ts
index a57a4ef102..e7a6fc6f9e 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/alert/create.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/alert/create.operation.ts
@@ -4,15 +4,14 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
-import { updateDisplayOptions, wrapData } from '@utils/utilities';
-
-import { theHiveApiRequest } from '../../transport';
 
 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[] = [
 	{
@@ -60,9 +59,10 @@ const properties: 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/TheHiveProject/actions/alert/deleteAlert.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/alert/deleteAlert.operation.ts
index 8cb16408f8..2e914b5f58 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/alert/deleteAlert.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/alert/deleteAlert.operation.ts
@@ -1,7 +1,7 @@
 import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
-import { updateDisplayOptions, wrapData } from '@utils/utilities';
 import { theHiveApiRequest } from '../../transport';
 import { alertRLC } from '../../descriptions';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
 const properties: INodeProperties[] = [alertRLC];
 
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/alert/executeResponder.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/alert/executeResponder.operation.ts
index 639bc8cab6..4a5712152a 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/alert/executeResponder.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/alert/executeResponder.operation.ts
@@ -4,9 +4,9 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
-import { updateDisplayOptions, wrapData } from '@utils/utilities';
 import { alertRLC, responderOptions } from '../../descriptions';
 import { theHiveApiRequest } from '../../transport';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
 const properties: INodeProperties[] = [{ ...alertRLC, name: 'id' }, responderOptions];
 
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/alert/get.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/alert/get.operation.ts
index 34fd5fca24..32cee8ca99 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/alert/get.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/alert/get.operation.ts
@@ -4,9 +4,9 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
-import { updateDisplayOptions, wrapData } from '@utils/utilities';
 import { theHiveApiRequest } from '../../transport';
 import { alertRLC } from '../../descriptions';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	alertRLC,
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/alert/merge.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/alert/merge.operation.ts
index 04b0654bf1..9be2833a4e 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/alert/merge.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/alert/merge.operation.ts
@@ -4,9 +4,9 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
-import { updateDisplayOptions, wrapData } from '@utils/utilities';
 import { theHiveApiRequest } from '../../transport';
 import { alertRLC, caseRLC } from '../../descriptions';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
 const properties: INodeProperties[] = [alertRLC, caseRLC];
 
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/alert/promote.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/alert/promote.operation.ts
index 22591f9ce1..cc69c94f9c 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/alert/promote.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/alert/promote.operation.ts
@@ -4,9 +4,9 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
-import { updateDisplayOptions, wrapData } from '@utils/utilities';
 import { theHiveApiRequest } from '../../transport';
 import { alertRLC } from '../../descriptions';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	alertRLC,
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/alert/search.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/alert/search.operation.ts
index b400562549..f74cb70b9a 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/alert/search.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/alert/search.operation.ts
@@ -4,7 +4,6 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
-import { updateDisplayOptions, wrapData } from '@utils/utilities';
 import {
 	genericFiltersCollection,
 	returnAllAndLimit,
@@ -12,6 +11,7 @@ import {
 	sortCollection,
 } from '../../descriptions';
 import { theHiveApiQuery } from '../../transport';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	...returnAllAndLimit,
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/alert/status.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/alert/status.operation.ts
index 20507f8a20..d4c7484abe 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/alert/status.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/alert/status.operation.ts
@@ -1,7 +1,7 @@
 import type { INodeExecutionData, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
-import { updateDisplayOptions, wrapData } from '@utils/utilities';
 import { theHiveApiRequest } from '../../transport';
 import { alertRLC } from '../../descriptions';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	alertRLC,
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/alert/update.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/alert/update.operation.ts
index c8beae9de3..b5ede4590b 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/alert/update.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/alert/update.operation.ts
@@ -5,11 +5,10 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
-import { updateDisplayOptions, wrapData } from '@utils/utilities';
-
+import set from 'lodash/set';
 import { theHiveApiRequest } from '../../transport';
 import { fixFieldType, prepareInputItem } from '../../helpers/utils';
-import set from 'lodash/set';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/case/addAttachment.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/case/addAttachment.operation.ts
index b00b9b42f3..9f0bcdc6f5 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/case/addAttachment.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/case/addAttachment.operation.ts
@@ -4,9 +4,9 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
-import { updateDisplayOptions, wrapData } from '@utils/utilities';
 import { theHiveApiRequest } from '../../transport';
 import { attachmentsUi, caseRLC } from '../../descriptions';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	caseRLC,
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/case/create.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/case/create.operation.ts
index 42a04f477e..7e212c3c62 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/case/create.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/case/create.operation.ts
@@ -4,13 +4,12 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
-import { updateDisplayOptions, wrapData } from '@utils/utilities';
-
-import { theHiveApiRequest } from '../../transport';
 
 import set from 'lodash/set';
+import { theHiveApiRequest } from '../../transport';
 
 import { fixFieldType, prepareInputItem } from '../../helpers/utils';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/case/deleteAttachment.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/case/deleteAttachment.operation.ts
index af2d685851..aa398e0871 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/case/deleteAttachment.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/case/deleteAttachment.operation.ts
@@ -1,7 +1,7 @@
 import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
-import { updateDisplayOptions, wrapData } from '@utils/utilities';
 import { theHiveApiRequest } from '../../transport';
 import { caseRLC } from '../../descriptions';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	caseRLC,
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/case/deleteCase.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/case/deleteCase.operation.ts
index 056abf91a5..077b45ad9b 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/case/deleteCase.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/case/deleteCase.operation.ts
@@ -1,7 +1,7 @@
 import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
-import { updateDisplayOptions, wrapData } from '@utils/utilities';
 import { theHiveApiRequest } from '../../transport';
 import { caseRLC } from '../../descriptions';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
 const properties: INodeProperties[] = [caseRLC];
 
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/case/executeResponder.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/case/executeResponder.operation.ts
index 9eb7fa35d4..3132266005 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/case/executeResponder.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/case/executeResponder.operation.ts
@@ -4,9 +4,9 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
-import { updateDisplayOptions, wrapData } from '@utils/utilities';
 import { caseRLC, responderOptions } from '../../descriptions';
 import { theHiveApiRequest } from '../../transport';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
 const properties: INodeProperties[] = [{ ...caseRLC, name: 'id' }, responderOptions];
 
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/case/get.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/case/get.operation.ts
index 1787a78f50..2c516f05ab 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/case/get.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/case/get.operation.ts
@@ -4,9 +4,9 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
-import { updateDisplayOptions, wrapData } from '@utils/utilities';
 import { theHiveApiRequest } from '../../transport';
 import { caseRLC } from '../../descriptions';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
 const properties: INodeProperties[] = [caseRLC];
 
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/case/getAttachment.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/case/getAttachment.operation.ts
index 5ebafe61bc..cf538f4ab7 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/case/getAttachment.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/case/getAttachment.operation.ts
@@ -4,9 +4,9 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
-import { updateDisplayOptions } from '@utils/utilities';
 import { theHiveApiRequest } from '../../transport';
 import { caseRLC } from '../../descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	caseRLC,
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/case/getTimeline.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/case/getTimeline.operation.ts
index 100218b659..3b945856f9 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/case/getTimeline.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/case/getTimeline.operation.ts
@@ -4,9 +4,9 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
-import { updateDisplayOptions, wrapData } from '@utils/utilities';
 import { theHiveApiRequest } from '../../transport';
 import { caseRLC } from '../../descriptions';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
 const properties: INodeProperties[] = [caseRLC];
 
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/case/search.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/case/search.operation.ts
index 2caee6b170..c7f44f5e40 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/case/search.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/case/search.operation.ts
@@ -4,7 +4,6 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
-import { updateDisplayOptions, wrapData } from '@utils/utilities';
 import {
 	genericFiltersCollection,
 	returnAllAndLimit,
@@ -12,6 +11,7 @@ import {
 	sortCollection,
 } from '../../descriptions';
 import { theHiveApiQuery } from '../../transport';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	...returnAllAndLimit,
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/case/update.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/case/update.operation.ts
index 320397d1fb..a88ecc4714 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/case/update.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/case/update.operation.ts
@@ -5,11 +5,10 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
-import { updateDisplayOptions, wrapData } from '@utils/utilities';
-
+import set from 'lodash/set';
 import { theHiveApiRequest } from '../../transport';
 import { fixFieldType, prepareInputItem } from '../../helpers/utils';
-import set from 'lodash/set';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/comment/add.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/comment/add.operation.ts
index ddb00e469d..572db21959 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/comment/add.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/comment/add.operation.ts
@@ -4,9 +4,9 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
-import { updateDisplayOptions, wrapData } from '@utils/utilities';
 import { theHiveApiRequest } from '../../transport';
 import { alertRLC, caseRLC } from '../../descriptions';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/comment/deleteComment.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/comment/deleteComment.operation.ts
index f237e6cf1d..e178729c61 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/comment/deleteComment.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/comment/deleteComment.operation.ts
@@ -1,7 +1,7 @@
 import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
-import { updateDisplayOptions, wrapData } from '@utils/utilities';
 import { theHiveApiRequest } from '../../transport';
 import { commentRLC } from '../../descriptions';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
 const properties: INodeProperties[] = [commentRLC];
 
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/comment/search.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/comment/search.operation.ts
index 8e279fd8fe..86bcd95d61 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/comment/search.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/comment/search.operation.ts
@@ -5,7 +5,6 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
-import { updateDisplayOptions, wrapData } from '@utils/utilities';
 import {
 	alertRLC,
 	caseRLC,
@@ -16,6 +15,7 @@ import {
 } from '../../descriptions';
 import { theHiveApiQuery } from '../../transport';
 import type { QueryScope } from '../../helpers/interfaces';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/comment/update.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/comment/update.operation.ts
index f4316e5709..5379ce91a4 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/comment/update.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/comment/update.operation.ts
@@ -4,9 +4,9 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
-import { updateDisplayOptions, wrapData } from '@utils/utilities';
 import { theHiveApiRequest } from '../../transport';
 import { commentRLC } from '../../descriptions';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	commentRLC,
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/log/addAttachment.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/log/addAttachment.operation.ts
index bf5cc1d20b..31e84c5dc9 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/log/addAttachment.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/log/addAttachment.operation.ts
@@ -4,9 +4,9 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
-import { updateDisplayOptions, wrapData } from '@utils/utilities';
 import { theHiveApiRequest } from '../../transport';
 import { attachmentsUi, logRLC } from '../../descriptions';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
 const properties: INodeProperties[] = [logRLC, attachmentsUi];
 
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/log/create.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/log/create.operation.ts
index 5150acf397..2f73eeaed0 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/log/create.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/log/create.operation.ts
@@ -4,12 +4,12 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
-import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
 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,
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/log/deleteAttachment.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/log/deleteAttachment.operation.ts
index 645ec7957c..3f3e64755e 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/log/deleteAttachment.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/log/deleteAttachment.operation.ts
@@ -1,7 +1,7 @@
 import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
-import { updateDisplayOptions, wrapData } from '@utils/utilities';
 import { theHiveApiRequest } from '../../transport';
 import { logRLC } from '../../descriptions';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	logRLC,
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/log/deleteLog.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/log/deleteLog.operation.ts
index de0b3bdf81..44fb4e5aed 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/log/deleteLog.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/log/deleteLog.operation.ts
@@ -1,7 +1,7 @@
 import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
-import { updateDisplayOptions, wrapData } from '@utils/utilities';
 import { theHiveApiRequest } from '../../transport';
 import { logRLC } from '../../descriptions';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
 const properties: INodeProperties[] = [logRLC];
 
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/log/executeResponder.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/log/executeResponder.operation.ts
index c7cb4ab6ba..8eceb9660b 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/log/executeResponder.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/log/executeResponder.operation.ts
@@ -4,9 +4,9 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
-import { updateDisplayOptions, wrapData } from '@utils/utilities';
 import { logRLC, responderOptions } from '../../descriptions';
 import { theHiveApiRequest } from '../../transport';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
 const properties: INodeProperties[] = [{ ...logRLC, name: 'id' }, responderOptions];
 
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/log/get.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/log/get.operation.ts
index 0222f45557..b110db32ac 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/log/get.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/log/get.operation.ts
@@ -4,9 +4,9 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
-import { updateDisplayOptions, wrapData } from '@utils/utilities';
 import { theHiveApiRequest } from '../../transport';
 import { logRLC } from '../../descriptions';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
 const properties: INodeProperties[] = [logRLC];
 
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/log/search.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/log/search.operation.ts
index 96fa58e20b..9aed510404 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/log/search.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/log/search.operation.ts
@@ -4,7 +4,6 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
-import { updateDisplayOptions, wrapData } from '@utils/utilities';
 import {
 	taskRLC,
 	genericFiltersCollection,
@@ -14,6 +13,7 @@ import {
 } from '../../descriptions';
 import { theHiveApiQuery } from '../../transport';
 import type { QueryScope } from '../../helpers/interfaces';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/observable/create.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/observable/create.operation.ts
index fe0a0f6426..b431c2e9ca 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/observable/create.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/observable/create.operation.ts
@@ -5,14 +5,12 @@ import {
 	type INodeExecutionData,
 	type INodeProperties,
 } from 'n8n-workflow';
-import { updateDisplayOptions, wrapData } from '@utils/utilities';
-
+import FormData from 'form-data';
 import { theHiveApiRequest } from '../../transport';
 
 import { fixFieldType, prepareInputItem } from '../../helpers/utils';
 import { alertRLC, attachmentsUi, caseRLC } from '../../descriptions';
-
-import FormData from 'form-data';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/observable/deleteObservable.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/observable/deleteObservable.operation.ts
index 230bd39508..e8e6567b5a 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/observable/deleteObservable.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/observable/deleteObservable.operation.ts
@@ -1,7 +1,7 @@
 import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
-import { updateDisplayOptions, wrapData } from '@utils/utilities';
 import { theHiveApiRequest } from '../../transport';
 import { observableRLC } from '../../descriptions';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
 const properties: INodeProperties[] = [observableRLC];
 
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/observable/executeAnalyzer.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/observable/executeAnalyzer.operation.ts
index 011b8efbe4..50bbfbdfb3 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/observable/executeAnalyzer.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/observable/executeAnalyzer.operation.ts
@@ -4,9 +4,9 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
-import { updateDisplayOptions, wrapData } from '@utils/utilities';
 import { observableRLC, observableTypeOptions } from '../../descriptions';
 import { theHiveApiRequest } from '../../transport';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	observableRLC,
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/observable/executeResponder.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/observable/executeResponder.operation.ts
index adf8b58a0a..5f75bc9367 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/observable/executeResponder.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/observable/executeResponder.operation.ts
@@ -4,9 +4,9 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
-import { updateDisplayOptions, wrapData } from '@utils/utilities';
 import { observableRLC, responderOptions } from '../../descriptions';
 import { theHiveApiRequest } from '../../transport';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
 const properties: INodeProperties[] = [{ ...observableRLC, name: 'id' }, responderOptions];
 
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/observable/get.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/observable/get.operation.ts
index fdff6e068d..7dc729b56d 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/observable/get.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/observable/get.operation.ts
@@ -4,9 +4,9 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
-import { updateDisplayOptions, wrapData } from '@utils/utilities';
 import { theHiveApiRequest } from '../../transport';
 import { observableRLC } from '../../descriptions';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
 const properties: INodeProperties[] = [observableRLC];
 
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/observable/search.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/observable/search.operation.ts
index 514fe1b2e9..e27c8e8331 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/observable/search.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/observable/search.operation.ts
@@ -5,7 +5,6 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
-import { updateDisplayOptions, wrapData } from '@utils/utilities';
 import {
 	alertRLC,
 	caseRLC,
@@ -16,6 +15,7 @@ import {
 } from '../../descriptions';
 import { theHiveApiQuery } from '../../transport';
 import type { QueryScope } from '../../helpers/interfaces';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/observable/update.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/observable/update.operation.ts
index 23ccbcecb1..9c3ef4243f 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/observable/update.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/observable/update.operation.ts
@@ -5,11 +5,10 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
-import { updateDisplayOptions, wrapData } from '@utils/utilities';
-
+import set from 'lodash/set';
 import { theHiveApiRequest } from '../../transport';
 import { fixFieldType, prepareInputItem } from '../../helpers/utils';
-import set from 'lodash/set';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/page/create.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/page/create.operation.ts
index c60c8d6906..0c2531d8df 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/page/create.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/page/create.operation.ts
@@ -4,9 +4,9 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
-import { updateDisplayOptions, wrapData } from '@utils/utilities';
 import { theHiveApiRequest } from '../../transport';
 import { caseRLC } from '../../descriptions';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/page/deletePage.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/page/deletePage.operation.ts
index ad0f278561..3522404168 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/page/deletePage.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/page/deletePage.operation.ts
@@ -1,7 +1,7 @@
 import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
-import { updateDisplayOptions, wrapData } from '@utils/utilities';
 import { theHiveApiRequest } from '../../transport';
 import { caseRLC, pageRLC } from '../../descriptions';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/page/search.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/page/search.operation.ts
index 99f8073959..796da7b682 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/page/search.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/page/search.operation.ts
@@ -4,7 +4,6 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
-import { updateDisplayOptions, wrapData } from '@utils/utilities';
 import {
 	caseRLC,
 	genericFiltersCollection,
@@ -14,6 +13,7 @@ import {
 } from '../../descriptions';
 import { theHiveApiQuery } from '../../transport';
 import type { QueryScope } from '../../helpers/interfaces';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/page/update.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/page/update.operation.ts
index 31209a0ea0..1b401e5645 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/page/update.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/page/update.operation.ts
@@ -4,9 +4,9 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
-import { updateDisplayOptions, wrapData } from '@utils/utilities';
 import { theHiveApiRequest } from '../../transport';
 import { caseRLC, pageRLC } from '../../descriptions';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/query/executeQuery.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/query/executeQuery.operation.ts
index 57c9a7367c..f4772aacad 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/query/executeQuery.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/query/executeQuery.operation.ts
@@ -6,20 +6,19 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError, jsonParse } from 'n8n-workflow';
 
-import { updateDisplayOptions, wrapData } from '@utils/utilities';
 import { theHiveApiRequest } from '../../transport';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
 		displayName: 'Query',
 		name: 'queryJson',
-		type: 'string',
+		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: {
-			editor: 'json',
 			rows: 10,
 		},
 	},
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/task/create.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/task/create.operation.ts
index 38aeb35429..414549e690 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/task/create.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/task/create.operation.ts
@@ -4,12 +4,12 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
-import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
 import { theHiveApiRequest } from '../../transport';
 
 import { fixFieldType, prepareInputItem } from '../../helpers/utils';
 import { caseRLC } from '../../descriptions';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	caseRLC,
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/task/deleteTask.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/task/deleteTask.operation.ts
index 021c5f47c6..213e4794cf 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/task/deleteTask.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/task/deleteTask.operation.ts
@@ -1,7 +1,7 @@
 import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
-import { updateDisplayOptions, wrapData } from '@utils/utilities';
 import { theHiveApiRequest } from '../../transport';
 import { taskRLC } from '../../descriptions';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
 const properties: INodeProperties[] = [taskRLC];
 
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/task/executeResponder.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/task/executeResponder.operation.ts
index 4474fa5f0e..d3f540baad 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/task/executeResponder.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/task/executeResponder.operation.ts
@@ -4,9 +4,9 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
-import { updateDisplayOptions, wrapData } from '@utils/utilities';
 import { responderOptions, taskRLC } from '../../descriptions';
 import { theHiveApiRequest } from '../../transport';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
 const properties: INodeProperties[] = [{ ...taskRLC, name: 'id' }, responderOptions];
 
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/task/get.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/task/get.operation.ts
index 6b693d9c1c..f88853e614 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/task/get.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/task/get.operation.ts
@@ -4,9 +4,9 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
-import { updateDisplayOptions, wrapData } from '@utils/utilities';
 import { theHiveApiRequest } from '../../transport';
 import { taskRLC } from '../../descriptions';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
 const properties: INodeProperties[] = [taskRLC];
 
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/task/search.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/task/search.operation.ts
index d5ad99a21c..0954fc8856 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/task/search.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/task/search.operation.ts
@@ -4,7 +4,6 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
-import { updateDisplayOptions, wrapData } from '@utils/utilities';
 import {
 	caseRLC,
 	genericFiltersCollection,
@@ -14,6 +13,7 @@ import {
 } from '../../descriptions';
 import { theHiveApiQuery } from '../../transport';
 import type { QueryScope } from '../../helpers/interfaces';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/task/update.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/task/update.operation.ts
index 824516c536..80875d27f6 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/task/update.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/task/update.operation.ts
@@ -5,11 +5,10 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
-import { updateDisplayOptions, wrapData } from '@utils/utilities';
-
+import set from 'lodash/set';
 import { theHiveApiRequest } from '../../transport';
 import { fixFieldType, prepareInputItem } from '../../helpers/utils';
-import set from 'lodash/set';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/TheHiveProject/helpers/utils.ts b/packages/nodes-base/nodes/TheHiveProject/helpers/utils.ts
index 2299e35a31..8c392043b8 100644
--- a/packages/nodes-base/nodes/TheHiveProject/helpers/utils.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/helpers/utils.ts
@@ -1,4 +1,4 @@
-import type { IDataObject } from 'n8n-workflow';
+import { ApplicationError, type IDataObject } from 'n8n-workflow';
 
 import get from 'lodash/get';
 import set from 'lodash/set';
@@ -54,7 +54,9 @@ export function prepareInputItem(item: IDataObject, schema: IDataObject[], i: nu
 			set(returnData, id, value);
 		} else {
 			if (entry.required) {
-				throw new Error(`Required field "${id}" is missing in item ${i}`);
+				throw new ApplicationError(`Required field "${id}" is missing in item ${i}`, {
+					level: 'warning',
+				});
 			}
 		}
 	}
diff --git a/packages/nodes-base/nodes/TheHiveProject/methods/resourceMapping.ts b/packages/nodes-base/nodes/TheHiveProject/methods/resourceMapping.ts
index 4157eacb2a..84703409ba 100644
--- a/packages/nodes-base/nodes/TheHiveProject/methods/resourceMapping.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/methods/resourceMapping.ts
@@ -8,6 +8,12 @@ import type {
 
 import { theHiveApiRequest } from '../transport';
 
+import {
+	alertCommonFields,
+	caseCommonFields,
+	observableCommonFields,
+	taskCommonFields,
+} from '../helpers/constants';
 import {
 	loadAlertStatus,
 	loadCaseStatus,
@@ -16,13 +22,6 @@ import {
 	loadUsers,
 } from './loadOptions';
 
-import {
-	alertCommonFields,
-	caseCommonFields,
-	observableCommonFields,
-	taskCommonFields,
-} from '../helpers/constants';
-
 async function getCustomFields(this: ILoadOptionsFunctions) {
 	const customFields = (await theHiveApiRequest.call(this, 'POST', '/v1/query', {
 		query: [
diff --git a/packages/nodes-base/nodes/TheHiveProject/test/transport.test.ts b/packages/nodes-base/nodes/TheHiveProject/test/transport.test.ts
index 4359af3b6f..442cb2739f 100644
--- a/packages/nodes-base/nodes/TheHiveProject/test/transport.test.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/test/transport.test.ts
@@ -1,10 +1,9 @@
 import type { IExecuteFunctions } from 'n8n-workflow';
+import nock from 'nock';
 import * as transport from '../transport/requestApi';
 
 import { theHiveApiQuery } from '../transport/queryHelper';
 
-import nock from 'nock';
-
 jest.mock('../transport/requestApi', () => {
 	const originalModule = jest.requireActual('../transport/requestApi');
 	return {
diff --git a/packages/nodes-base/nodes/TheHiveProject/thehiveproject.svg b/packages/nodes-base/nodes/TheHiveProject/thehiveproject.svg
index fce8a64655..914c9c5d22 100644
--- a/packages/nodes-base/nodes/TheHiveProject/thehiveproject.svg
+++ b/packages/nodes-base/nodes/TheHiveProject/thehiveproject.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:#F3D02F}</style></defs><path d="M290 150A140 140 0 11150 10a140 140 0 01140 140" fill="#252525"/><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>
+<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/TimescaleDb/TimescaleDb.node.ts b/packages/nodes-base/nodes/TimescaleDb/TimescaleDb.node.ts
index 86b8d76fab..e287be8ede 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, pgQueryV2, 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',
@@ -68,7 +68,6 @@ export class TimescaleDb implements INodeType {
 				noDataExpression: true,
 				typeOptions: {
 					editor: 'sqlEditor',
-					rows: 5,
 					sqlDialect: 'PostgreSQL',
 				},
 				displayOptions: {
diff --git a/packages/nodes-base/nodes/TimescaleDb/timescale.svg b/packages/nodes-base/nodes/TimescaleDb/timescale.svg
index 5a0f8154a0..e0f4d6e2e6 100644
--- a/packages/nodes-base/nodes/TimescaleDb/timescale.svg
+++ b/packages/nodes-base/nodes/TimescaleDb/timescale.svg
@@ -1,31 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 27.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Brand_mark_digital" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
-	 y="0px" viewBox="0 0 1409 1408.1" style="enable-background:new 0 0 1409 1408.1;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:url(#SVGID_1_);}
-	.st1{fill:url(#SVGID_00000134969684113571951290000002026826131067022783_);}
-	.st2{fill:#000000;}
-</style>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="601.093" y1="879.5583" x2="487.4729" y2="877.8683" gradientTransform="matrix(1 0 0 1 0 -373.06)">
-	<stop  offset="0" style="stop-color:#000000;stop-opacity:0"/>
-	<stop  offset="1" style="stop-color:#000000"/>
-</linearGradient>
-<path class="st0" d="M599.4,619l-0.1-116.1c0-6.9-2.7-13.5-7.6-18.4L491.2,383.7l-70.1,77.4L584.9,625
-	C590.3,630.3,599.4,626.5,599.4,619L599.4,619z"/>
-<linearGradient id="SVGID_00000117652149966120466280000016546900606124541606_" gradientUnits="userSpaceOnUse" x1="396.3043" y1="1239.8578" x2="223.4527" y2="1239.8578" gradientTransform="matrix(1 0 0 1 0 -373.06)">
-	<stop  offset="0" style="stop-color:#000000;stop-opacity:0"/>
-	<stop  offset="0.96" style="stop-color:#000000"/>
-</linearGradient>
-<path style="fill:url(#SVGID_00000117652149966120466280000016546900606124541606_);" d="M391.6,914L153.4,676.4l-90.9,57
-	l322.2,321.2c5.3,5.3,14.5,1.6,14.5-6V932.5C399.2,925.6,396.5,918.9,391.6,914L391.6,914z"/>
-<path class="st2" 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.1
-	c-6.2-6.2-9.6-14.5-9.6-23.2l0.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,0
-	l229.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.8l-221.6-221.7
-	c-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.2
-	c4.4-4.4,11.6-4.4,16,0l0,0l70.1-77.4c-1.3-1.5-2.5-3.1-3.8-4.8c-20-27-32.2-71.6-18-121.8c8.5-32.2,26.1-56.4,58.7-85.9
-	c2.9-2.6,7.4-2.7,10.3-0.2l84.3,73l16.6,14.4c6.4,5.5,14,9.5,22.2,11.4l262.8,62.5c3.1,0.7,5.9,2.3,8.1,4.5l269.9,269.3
-	c4.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.3l-61.6-26.8h-225
-	c-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
-	C1406,300.3,1064.6-24.1,654.7,4.3L654.7,4.3z"/>
-</svg>
+<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/todoist.svg b/packages/nodes-base/nodes/Todoist/todoist.svg
index 61dcc2ea7c..4c999448c6 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 a45773a880..b4cd4f2ec1 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 e40fe25be0..058b3c6964 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,9 +12,6 @@ import {
 	UpdateHandler,
 } from './OperationHandler';
 
-import type { Context } from '../GenericFunctions';
-import type { IDataObject } from 'n8n-workflow';
-
 export class TodoistService implements Service {
 	async execute(
 		ctx: Context,
diff --git a/packages/nodes-base/nodes/Todoist/v2/OperationHandler.ts b/packages/nodes-base/nodes/Todoist/v2/OperationHandler.ts
index cc25cfb5aa..19e9c661ad 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>;
@@ -317,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 e40fe25be0..058b3c6964 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,9 +12,6 @@ import {
 	UpdateHandler,
 } from './OperationHandler';
 
-import type { Context } from '../GenericFunctions';
-import type { IDataObject } from 'n8n-workflow';
-
 export class TodoistService implements Service {
 	async execute(
 		ctx: Context,
diff --git a/packages/nodes-base/nodes/Toggl/TogglTrigger.node.ts b/packages/nodes-base/nodes/Toggl/TogglTrigger.node.ts
index 3278ed27b6..fcfcf87846 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/Transform/Aggregate/Aggregate.node.json b/packages/nodes-base/nodes/Transform/Aggregate/Aggregate.node.json
new file mode 100644
index 0000000000..53a9760c16
--- /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 0000000000..fd918290a4
--- /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 0000000000..56381ac612
--- /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 0000000000..9682e72a11
--- /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 0000000000..db8e778e97
--- /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 0000000000..5a4f1e10fd
--- /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 0000000000..1fa3619523
--- /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 0000000000..0415520801
--- /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 0000000000..d736ec53b0
--- /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 0000000000..1b9feb88cb
--- /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 0000000000..609538fceb
--- /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 0000000000..5130b9f406
--- /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 0000000000..2d914fdf34
--- /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 0000000000..f2a0416c40
--- /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 0000000000..73d697bfc7
--- /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 0000000000..0699c46f7d
--- /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 0000000000..ff5d794092
--- /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 0000000000..13e63540d2
--- /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"],
+	"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 0000000000..52ac687132
--- /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 0000000000..ebb6dd4898
--- /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 0000000000..fdbe316072
--- /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 0000000000..b6f6dd5341
--- /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 0000000000..3b156e206b
--- /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 0000000000..8cc55b4864
--- /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 0000000000..5a48662cb9
--- /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 0000000000..b00f667ee6
--- /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 0000000000..24c642cfeb
--- /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 0000000000..9bb7dac8f9
--- /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 0000000000..dda1c6c4c4
--- /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 0000000000..816e6c4d64
--- /dev/null
+++ b/packages/nodes-base/nodes/Transform/Summarize/Summarize.node.json
@@ -0,0 +1,32 @@
+{
+	"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": [
+		"Summarise",
+		"Summarize",
+		"Group",
+		"Pivot",
+		"Sum",
+		"Count",
+		"Min",
+		"Max",
+		"Transform",
+		"Array",
+		"List",
+		"Item"
+	],
+	"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 0000000000..1eadc629bb
--- /dev/null
+++ b/packages/nodes-base/nodes/Transform/Summarize/Summarize.node.ts
@@ -0,0 +1,350 @@
+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';
+
+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: '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) {
+			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/Transform/Summarize/summarize.svg b/packages/nodes-base/nodes/Transform/Summarize/summarize.svg
new file mode 100644
index 0000000000..e0ef907fa0
--- /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 0000000000..c846b0c33c
--- /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 0000000000..3a6446d12b
--- /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 0000000000..89fdb16600
--- /dev/null
+++ b/packages/nodes-base/nodes/Transform/Summarize/utils.ts
@@ -0,0 +1,288 @@
+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 = {
+	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 0000000000..73b9fc7d68
--- /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/Trello/trello.svg b/packages/nodes-base/nodes/Trello/trello.svg
index 3fa2aaf532..d497f2168b 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/Twilio/twilio.svg b/packages/nodes-base/nodes/Twilio/twilio.svg
index 5055f6372f..de22b6c694 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/Twist.node.ts b/packages/nodes-base/nodes/Twist/Twist.node.ts
index dd046523ec..c5b35aece3 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/Twitter.node.json b/packages/nodes-base/nodes/Twitter/Twitter.node.json
index 1d862cb20f..91d0d19d86 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": [
 			{
diff --git a/packages/nodes-base/nodes/Twitter/V1/TwitterV1.node.ts b/packages/nodes-base/nodes/Twitter/V1/TwitterV1.node.ts
index b1a8cbd17e..0757de3e12 100644
--- a/packages/nodes-base/nodes/Twitter/V1/TwitterV1.node.ts
+++ b/packages/nodes-base/nodes/Twitter/V1/TwitterV1.node.ts
@@ -10,6 +10,7 @@ import type {
 	JsonObject,
 } from 'n8n-workflow';
 
+import ISO6391 from 'iso-639-1';
 import { directMessageFields, directMessageOperations } from './DirectMessageDescription';
 
 import { tweetFields, tweetOperations } from './TweetDescription';
@@ -22,8 +23,6 @@ import {
 
 import type { ITweet, ITweetCreate } from './TweetInterface';
 
-import ISO6391 from 'iso-639-1';
-
 export class TwitterV1 implements INodeType {
 	description: INodeTypeDescription;
 
diff --git a/packages/nodes-base/nodes/Twitter/V2/GenericFunctions.ts b/packages/nodes-base/nodes/Twitter/V2/GenericFunctions.ts
index 7227b1cca8..353de66b06 100644
--- a/packages/nodes-base/nodes/Twitter/V2/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Twitter/V2/GenericFunctions.ts
@@ -8,7 +8,7 @@ import type {
 	INodeParameterResourceLocator,
 	JsonObject,
 } from 'n8n-workflow';
-import { NodeApiError, NodeOperationError } from 'n8n-workflow';
+import { ApplicationError, NodeApiError, NodeOperationError } from 'n8n-workflow';
 
 export async function twitterApiRequest(
 	this: IExecuteFunctions | ILoadOptionsFunctions | IHookFunctions,
@@ -90,7 +90,7 @@ export function returnId(tweetId: INodeParameterResourceLocator) {
 
 		return tweetIdMatch?.[3] as string;
 	} else {
-		throw new Error(`The mode ${tweetId.mode} is not valid!`);
+		throw new ApplicationError(`The mode ${tweetId.mode} is not valid!`, { level: 'warning' });
 	}
 }
 
@@ -120,5 +120,8 @@ export async function returnIdFromUsername(
 			{},
 		)) as { id: string };
 		return list.id;
-	} else throw new Error(`The username mode ${usernameRlc.mode} is not valid!`);
+	} else
+		throw new ApplicationError(`The username mode ${usernameRlc.mode} is not valid!`, {
+			level: 'warning',
+		});
 }
diff --git a/packages/nodes-base/nodes/Twitter/V2/TwitterV2.node.ts b/packages/nodes-base/nodes/Twitter/V2/TwitterV2.node.ts
index 19b2d59504..ef13131b05 100644
--- a/packages/nodes-base/nodes/Twitter/V2/TwitterV2.node.ts
+++ b/packages/nodes-base/nodes/Twitter/V2/TwitterV2.node.ts
@@ -11,13 +11,13 @@ import type {
 	JsonObject,
 } from 'n8n-workflow';
 
+import ISO6391 from 'iso-639-1';
+import { DateTime } from 'luxon';
 import { directMessageFields, directMessageOperations } from './DirectMessageDescription';
 import { listFields, listOperations } from './ListDescription';
 import { tweetFields, tweetOperations } from './TweetDescription';
 import { userFields, userOperations } from './UserDescription';
 
-import ISO6391 from 'iso-639-1';
-import { DateTime } from 'luxon';
 import {
 	returnId,
 	returnIdFromUsername,
diff --git a/packages/nodes-base/nodes/Twitter/test/Twitter.test.ts b/packages/nodes-base/nodes/Twitter/test/Twitter.test.ts
index 9d164cc960..ff0c8fa1e4 100644
--- a/packages/nodes-base/nodes/Twitter/test/Twitter.test.ts
+++ b/packages/nodes-base/nodes/Twitter/test/Twitter.test.ts
@@ -1,6 +1,5 @@
-import { getWorkflowFilenames, testWorkflows } from '@test/nodes/Helpers';
-
 import nock from 'nock';
+import { getWorkflowFilenames, testWorkflows } from '@test/nodes/Helpers';
 
 const searchResult = {
 	data: [
diff --git a/packages/nodes-base/nodes/Twitter/x.svg b/packages/nodes-base/nodes/Twitter/x.svg
index 7c152ac8ac..95d7fc2f51 100644
--- a/packages/nodes-base/nodes/Twitter/x.svg
+++ b/packages/nodes-base/nodes/Twitter/x.svg
@@ -1 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><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"></path></svg>
+<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/typeform.svg b/packages/nodes-base/nodes/Typeform/typeform.svg
index c3176af180..4720d11900 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/UnleashedSoftware/GenericFunctions.ts b/packages/nodes-base/nodes/UnleashedSoftware/GenericFunctions.ts
index f519e307df..d566ccd94c 100644
--- a/packages/nodes-base/nodes/UnleashedSoftware/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/UnleashedSoftware/GenericFunctions.ts
@@ -1,3 +1,4 @@
+import { createHmac } from 'crypto';
 import type { OptionsWithUrl } from 'request';
 
 import type {
@@ -9,8 +10,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import { createHmac } from 'crypto';
-
 import qs from 'qs';
 
 export async function unleashedApiRequest(
diff --git a/packages/nodes-base/nodes/UnleashedSoftware/UnleashedSoftware.node.ts b/packages/nodes-base/nodes/UnleashedSoftware/UnleashedSoftware.node.ts
index 565330aa79..6bbab8a80e 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',
diff --git a/packages/nodes-base/nodes/UptimeRobot/UptimeRobot.node.ts b/packages/nodes-base/nodes/UptimeRobot/UptimeRobot.node.ts
index 0fb7324c76..c6b205254d 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/urlScanIo.svg b/packages/nodes-base/nodes/UrlScanIo/urlScanIo.svg
index e361a718c5..e27957b656 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/GenericFunctions.ts b/packages/nodes-base/nodes/Venafi/Datacenter/GenericFunctions.ts
index e7532e30bd..ecb654ceb5 100644
--- a/packages/nodes-base/nodes/Venafi/Datacenter/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Venafi/Datacenter/GenericFunctions.ts
@@ -1,5 +1,6 @@
 import type { OptionsWithUri } from 'request';
 
+import { ApplicationError } from 'n8n-workflow';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -50,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;
 	}
diff --git a/packages/nodes-base/nodes/Venafi/Datacenter/VenafiTlsProtectDatacenterTrigger.node.ts b/packages/nodes-base/nodes/Venafi/Datacenter/VenafiTlsProtectDatacenterTrigger.node.ts
index 7035cbdaf2..518e539a59 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 9090c78dd5..91e8e6fa9f 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 f4a08a7279..58e2066a32 100644
--- a/packages/nodes-base/nodes/Venafi/ProtectCloud/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Venafi/ProtectCloud/GenericFunctions.ts
@@ -23,6 +23,9 @@ 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 = {
 		headers: {
@@ -32,7 +35,7 @@ export async function venafiApiRequest(
 		method,
 		body,
 		qs,
-		uri: `https://api.venafi.cloud${resource}`,
+		uri: `https://api.venafi.${region}${resource}`,
 		json: true,
 	};
 
diff --git a/packages/nodes-base/nodes/Venafi/ProtectCloud/VenafiTlsProtectCloud.node.ts b/packages/nodes-base/nodes/Venafi/ProtectCloud/VenafiTlsProtectCloud.node.ts
index 97fb3876f2..25a09ea38a 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 dd9aaf6316..75478cc78d 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 70ed4594fa..a9196165bc 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/vero.svg b/packages/nodes-base/nodes/Vero/vero.svg
index 46f4cf1efa..35fa614dc8 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/Vonage.node.ts b/packages/nodes-base/nodes/Vonage/Vonage.node.ts
index 162b982c3a..b6944f4f1a 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 6e8098d3ef..73debf51a2 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 85604f5b8c..7788ca6685 100644
--- a/packages/nodes-base/nodes/Wait/Wait.node.ts
+++ b/packages/nodes-base/nodes/Wait/Wait.node.ts
@@ -4,6 +4,7 @@ import type {
 	INodeTypeDescription,
 	INodeProperties,
 	IDisplayOptions,
+	IWebhookFunctions,
 } from 'n8n-workflow';
 import { WAIT_TIME_UNLIMITED } from 'n8n-workflow';
 
@@ -18,14 +19,168 @@ import {
 	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 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';
 
@@ -47,9 +202,28 @@ export class Wait extends Webhook {
 			{
 				...defaultWebhookDescription,
 				responseData: '={{$parameter["responseData"]}}',
-				path: '={{$parameter["options"]["webhookSuffix"] || ""}}',
+				path: webhookPath,
 				restartWebhook: true,
 			},
+			{
+				name: 'default',
+				httpMethod: 'GET',
+				responseMode: 'onReceived',
+				path: webhookPath,
+				restartWebhook: true,
+				isFullPath: true,
+				isForm: true,
+			},
+			{
+				name: 'default',
+				httpMethod: 'POST',
+				responseMode: '={{$parameter["responseMode"]}}',
+				responseData: '={{$parameter["responseMode"] === "lastNode" ? "noData" : undefined}}',
+				path: webhookPath,
+				restartWebhook: true,
+				isFullPath: true,
+				isForm: true,
+			},
 		],
 		properties: [
 			{
@@ -72,6 +246,11 @@ export class Wait extends Webhook {
 						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',
@@ -150,7 +329,7 @@ export class Wait extends Webhook {
 			},
 
 			// ----------------------------------
-			//         resume:webhook
+			//         resume:webhook & form
 			// ----------------------------------
 			{
 				displayName:
@@ -161,160 +340,67 @@ export class Wait extends Webhook {
 				default: '',
 			},
 			{
-				...httpMethodsProperty,
-				displayOptions: displayOnWebhook,
-				description: 'The HTTP method of the Webhook call',
-			},
-			{
-				...responseCodeProperty,
-				displayOptions: displayOnWebhook,
-			},
-			{
-				...responseModeProperty,
-				displayOptions: displayOnWebhook,
-			},
-			{
-				...responseDataProperty,
-				displayOptions: {
-					show: {
-						...responseDataProperty.displayOptions?.show,
-						...displayOnWebhook.show,
-					},
-				},
-			},
-			{
-				...responseBinaryPropertyNameProperty,
-				displayOptions: {
-					show: {
-						...responseBinaryPropertyNameProperty.displayOptions?.show,
-						...displayOnWebhook.show,
-					},
-				},
-			},
-			{
-				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: displayOnWebhook,
-			},
-			{
-				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],
-						...displayOnWebhook.show,
-					},
-				},
-				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],
-						...displayOnWebhook.show,
-					},
-				},
-				typeOptions: {
-					minValue: 0,
-					numberPrecision: 2,
-				},
-				default: 1,
-				description: 'The time to wait',
-			},
-			{
-				displayName: 'Unit',
-				name: 'resumeUnit',
-				type: 'options',
-				displayOptions: {
-					show: {
-						limitType: ['afterTimeInterval'],
-						limitWaitTime: [true],
-						...displayOnWebhook.show,
-					},
-				},
-				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],
-						...displayOnWebhook.show,
-					},
-				},
+				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: '',
-				description: 'Continue execution after the specified date and time',
 			},
+			...onFormSubmitProperties,
+			...onWebhookCallProperties,
+			...waitTimeProperties,
 			{
 				...optionsProperty,
 				displayOptions: displayOnWebhook,
-				options: [
-					...(optionsProperty.options as INodeProperties[]),
-					{
-						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.',
+				options: [...(optionsProperty.options as INodeProperties[]), webhookSuffix],
+			},
+			{
+				displayName: 'Options',
+				name: 'options',
+				type: 'collection',
+				placeholder: 'Add Option',
+				default: {},
+				displayOptions: {
+					show: {
+						resume: ['form'],
 					},
-				],
+					hide: {
+						responseMode: ['responseNode'],
+					},
+				},
+				options: [respondWithOptions, webhookSuffix],
+			},
+			{
+				displayName: 'Options',
+				name: 'options',
+				type: 'collection',
+				placeholder: 'Add Option',
+				default: {},
+				displayOptions: {
+					show: {
+						resume: ['form'],
+					},
+					hide: {
+						responseMode: ['onReceived', 'lastNode'],
+					},
+				},
+				options: [webhookSuffix],
 			},
 		],
 	};
 
+	async webhook(context: IWebhookFunctions) {
+		const resume = context.getNodeParameter('resume', 0) as string;
+		if (resume === 'form') return formWebhook(context);
+		return super.webhook(context);
+	}
+
 	async execute(context: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 		const resume = context.getNodeParameter('resume', 0) as string;
 
-		if (resume === 'webhook') {
-			return this.handleWebhookResume(context);
+		if (['webhook', 'form'].includes(resume)) {
+			return this.configureAndPutToWait(context);
 		}
 
 		let waitTill: Date;
@@ -347,10 +433,9 @@ export class Wait extends Webhook {
 		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([context.getInputData()]);
-				}, waitValue);
+			return new Promise((resolve) => {
+				const timer = setTimeout(() => resolve([context.getInputData()]), waitValue);
+				context.onExecutionCancellation(() => clearTimeout(timer));
 			});
 		}
 
@@ -358,16 +443,17 @@ export class Wait extends Webhook {
 		return this.putToWait(context, waitTill);
 	}
 
-	private async handleWebhookResume(context: IExecuteFunctions) {
+	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;
 				}
@@ -379,7 +465,6 @@ export class Wait extends Webhook {
 				}
 
 				waitAmount *= 1000;
-
 				waitTill = new Date(new Date().getTime() + waitAmount);
 			} else {
 				waitTill = new Date(context.getNodeParameter('maxDateAndTime', 0) as string);
diff --git a/packages/nodes-base/nodes/Webflow/Webflow.node.json b/packages/nodes-base/nodes/Webflow/Webflow.node.json
index c3291e7e73..9e95776d2d 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/WebflowTrigger.node.json b/packages/nodes-base/nodes/Webflow/WebflowTrigger.node.json
index f812473110..5c3aaa7984 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 80675e0218..32fa9dbda2 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 2050230429..cc6961da5c 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 fb870c7169..e0a194cdb3 100644
--- a/packages/nodes-base/nodes/Webhook/Webhook.node.ts
+++ b/packages/nodes-base/nodes/Webhook/Webhook.node.ts
@@ -1,4 +1,7 @@
 /* eslint-disable n8n-nodes-base/node-execute-block-wrong-error-thrown */
+import { pipeline } from 'stream/promises';
+import { createWriteStream } from 'fs';
+import { stat } from 'fs/promises';
 import type {
 	IWebhookFunctions,
 	ICredentialDataDecryptedObject,
@@ -10,8 +13,6 @@ import type {
 } from 'n8n-workflow';
 import { BINARY_ENCODING, NodeOperationError, Node } from 'n8n-workflow';
 
-import { pipeline } from 'stream/promises';
-import { createWriteStream } from 'fs';
 import { v4 as uuid } from 'uuid';
 import basicAuth from 'basic-auth';
 import isbot from 'isbot';
@@ -38,13 +39,14 @@ export class Webhook extends Node {
 		icon: 'file:webhook.svg',
 		name: 'webhook',
 		group: ['trigger'],
-		version: 1,
+		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: {
@@ -97,7 +99,7 @@ export class Webhook extends Node {
 		const options = context.getNodeParameter('options', {}) as {
 			binaryData: boolean;
 			ignoreBots: boolean;
-			rawBody: Buffer;
+			rawBody: boolean;
 			responseData?: string;
 		};
 		const req = context.getRequestObject();
@@ -124,6 +126,17 @@ export class Webhook extends Node {
 			return this.handleFormData(context);
 		}
 
+		const nodeVersion = context.getNode().typeVersion;
+		if (nodeVersion > 1 && !req.body && !options.rawBody) {
+			try {
+				return await this.handleBinaryData(context);
+			} catch (error) {}
+		}
+
+		if (options.rawBody && !req.rawBody) {
+			await req.readRawBody();
+		}
+
 		const response: INodeExecutionData = {
 			json: {
 				headers: req.headers,
@@ -134,7 +147,7 @@ export class Webhook extends Node {
 			binary: options.rawBody
 				? {
 						data: {
-							data: req.rawBody.toString(BINARY_ENCODING),
+							data: (req.rawBody ?? '').toString(BINARY_ENCODING),
 							mimeType: req.contentType ?? 'application/json',
 						},
 				  }
@@ -204,7 +217,6 @@ export class Webhook extends Node {
 		const { data, files } = req.body;
 
 		const returnItem: INodeExecutionData = {
-			binary: {},
 			json: {
 				headers: req.headers,
 				params: req.params,
@@ -213,7 +225,12 @@ export class Webhook extends Node {
 			},
 		};
 
+		if (files && Object.keys(files).length) {
+			returnItem.binary = {};
+		}
+
 		let count = 0;
+
 		for (const key of Object.keys(files)) {
 			const processFiles: MultiPartFormData.File[] = [];
 			let multiFile = false;
@@ -246,6 +263,7 @@ export class Webhook extends Node {
 				count += 1;
 			}
 		}
+
 		return { workflowData: [[returnItem]] };
 	}
 
@@ -260,7 +278,6 @@ export class Webhook extends Node {
 			await pipeline(req, createWriteStream(binaryFile.path));
 
 			const returnItem: INodeExecutionData = {
-				binary: {},
 				json: {
 					headers: req.headers,
 					params: req.params,
@@ -269,13 +286,17 @@ export class Webhook extends Node {
 				},
 			};
 
-			const binaryPropertyName = (options.binaryPropertyName || 'data') as string;
-			const fileName = req.contentDisposition?.filename ?? uuid();
-			returnItem.binary![binaryPropertyName] = await context.nodeHelpers.copyBinaryFile(
-				binaryFile.path,
-				fileName,
-				req.contentType ?? 'application/octet-stream',
-			);
+			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 { workflowData: [[returnItem]] };
 		} catch (error) {
diff --git a/packages/nodes-base/nodes/Webhook/description.ts b/packages/nodes-base/nodes/Webhook/description.ts
index 33be6f5ae9..2f4cc3fdeb 100644
--- a/packages/nodes-base/nodes/Webhook/description.ts
+++ b/packages/nodes-base/nodes/Webhook/description.ts
@@ -2,7 +2,7 @@ import type { INodeProperties, INodeTypeDescription, IWebhookDescription } from
 
 export const defaultWebhookDescription: IWebhookDescription = {
 	name: 'default',
-	httpMethod: '={{$parameter["httpMethod"]}}',
+	httpMethod: '={{$parameter["httpMethod"] || "GET"}}',
 	isFullPath: true,
 	responseCode: '={{$parameter["responseCode"]}}',
 	responseMode: '={{$parameter["responseMode"]}}',
@@ -196,30 +196,45 @@ export const optionsProperty: INodeProperties = {
 	default: {},
 	options: [
 		{
-			displayName: 'Binary Data',
+			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',
-			required: true,
 			displayOptions: {
-				show: {
-					binaryData: [true],
+				hide: {
+					'@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.',
+				'Name of the binary property to write the data of the received file to, only relevant if binary data is received',
 		},
 		{
 			displayName: 'Ignore Bots',
@@ -248,6 +263,9 @@ export const optionsProperty: INodeProperties = {
 			name: 'rawBody',
 			type: 'boolean',
 			displayOptions: {
+				show: {
+					'@version': [1],
+				},
 				hide: {
 					binaryData: [true],
 					noResponseBody: [true],
@@ -257,6 +275,19 @@ export const optionsProperty: INodeProperties = {
 			// 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',
diff --git a/packages/nodes-base/nodes/Webhook/test/Webhook.test.ts b/packages/nodes-base/nodes/Webhook/test/Webhook.test.ts
index bb903fd934..246f7dae1e 100644
--- a/packages/nodes-base/nodes/Webhook/test/Webhook.test.ts
+++ b/packages/nodes-base/nodes/Webhook/test/Webhook.test.ts
@@ -1,4 +1,40 @@
+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('Test Webhook Node', () => {
+	testWorkflows(workflows);
+
+	describe('handleFormData', () => {
+		const node = new Webhook();
+		const context = mock<IWebhookFunctions>({
+			nodeHelpers: mock(),
+		});
+		context.getNodeParameter.calledWith('options').mockReturnValue({});
+		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/webhook.svg b/packages/nodes-base/nodes/Webhook/webhook.svg
index a59b318554..110ebbef60 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/Wekan.node.ts b/packages/nodes-base/nodes/Wekan/Wekan.node.ts
index 5c421dd143..ff1d3043bb 100644
--- a/packages/nodes-base/nodes/Wekan/Wekan.node.ts
+++ b/packages/nodes-base/nodes/Wekan/Wekan.node.ts
@@ -9,6 +9,7 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
+import { wrapData } from '../../utils/utilities';
 import { apiRequest } from './GenericFunctions';
 
 import { boardFields, boardOperations } from './BoardDescription';
@@ -22,7 +23,6 @@ import { checklistFields, checklistOperations } from './ChecklistDescription';
 import { checklistItemFields, checklistItemOperations } from './ChecklistItemDescription';
 
 import { listFields, listOperations } from './ListDescription';
-import { wrapData } from '../../utils/utilities';
 
 // https://wekan.github.io/api/v4.41/
 
diff --git a/packages/nodes-base/nodes/WhatsApp/whatsapp.svg b/packages/nodes-base/nodes/WhatsApp/whatsapp.svg
index fda6c26df4..4d96452c78 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/Wise.node.ts b/packages/nodes-base/nodes/Wise/Wise.node.ts
index 478df11e58..6d4b835fd6 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',
diff --git a/packages/nodes-base/nodes/Wise/WiseTrigger.node.ts b/packages/nodes-base/nodes/Wise/WiseTrigger.node.ts
index f5b23538c3..51d665d1f4 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',
diff --git a/packages/nodes-base/nodes/Wise/descriptions/AccountDescription.ts b/packages/nodes-base/nodes/Wise/descriptions/AccountDescription.ts
index 00101da4b3..3f149307b8 100644
--- a/packages/nodes-base/nodes/Wise/descriptions/AccountDescription.ts
+++ b/packages/nodes-base/nodes/Wise/descriptions/AccountDescription.ts
@@ -139,12 +139,12 @@ export const accountFields: 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: ['account'],
diff --git a/packages/nodes-base/nodes/Wise/descriptions/TransferDescription.ts b/packages/nodes-base/nodes/Wise/descriptions/TransferDescription.ts
index 5d9f0a2d95..5f743cc997 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 16f4d8336a..008014c69a 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 4ee3c27866..ea64cb34da 100644
--- a/packages/nodes-base/nodes/WooCommerce/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/WooCommerce/GenericFunctions.ts
@@ -1,3 +1,4 @@
+import { createHash } from 'crypto';
 import type { OptionsWithUri } from 'request';
 
 import type {
@@ -9,13 +10,10 @@ import type {
 	IWebhookFunctions,
 } 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 type { ICouponLine, IFeeLine, ILineItem, IShoppingLine } from './OrderInterface';
 
 export async function woocommerceApiRequest(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
diff --git a/packages/nodes-base/nodes/WooCommerce/WooCommerceTrigger.node.ts b/packages/nodes-base/nodes/WooCommerce/WooCommerceTrigger.node.ts
index 4aa9c634f1..af36889a38 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 9cde2a9d41..974dc29fbf 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 64f8f43282..3ebfc583d8 100644
--- a/packages/nodes-base/nodes/Wordpress/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Wordpress/GenericFunctions.ts
@@ -30,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);
diff --git a/packages/nodes-base/nodes/Wordpress/Wordpress.node.json b/packages/nodes-base/nodes/Wordpress/Wordpress.node.json
index a150bd81e4..2d7526cb9b 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.svg b/packages/nodes-base/nodes/Wordpress/wordpress.svg
index 1ec64c05f7..d45f7df925 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/WorkableTrigger.node.ts b/packages/nodes-base/nodes/Workable/WorkableTrigger.node.ts
index e67a7ab7ea..d942f697e8 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 ddd9e65848..8fe40e8420 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 fb5ea7b1e3..0938a31488 100644
--- a/packages/nodes-base/nodes/WriteBinaryFile/WriteBinaryFile.node.ts
+++ b/packages/nodes-base/nodes/WriteBinaryFile/WriteBinaryFile.node.ts
@@ -10,6 +10,7 @@ import type {
 
 export class WriteBinaryFile implements INodeType {
 	description: INodeTypeDescription = {
+		hidden: true,
 		displayName: 'Write Binary File',
 		name: 'writeBinaryFile',
 		icon: 'fa:file-export',
diff --git a/packages/nodes-base/nodes/WriteBinaryFile/test/WriteBinaryFile.test.ts b/packages/nodes-base/nodes/WriteBinaryFile/test/WriteBinaryFile.test.ts
index 9cd6df1da5..4a06f8d0e3 100644
--- a/packages/nodes-base/nodes/WriteBinaryFile/test/WriteBinaryFile.test.ts
+++ b/packages/nodes-base/nodes/WriteBinaryFile/test/WriteBinaryFile.test.ts
@@ -1,8 +1,8 @@
 /* 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';
-import path from 'path';
 
 describe('Test Write Binary File Node', () => {
 	beforeEach(async () => {
diff --git a/packages/nodes-base/nodes/Wufoo/WufooTrigger.node.ts b/packages/nodes-base/nodes/Wufoo/WufooTrigger.node.ts
index 575c29c320..bd10e1ea90 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/xero.svg b/packages/nodes-base/nodes/Xero/xero.svg
index 34d4008f91..f2136fb2a7 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 0291e03833..09fc208546 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 eca66e0b06..d80d97f9f5 100644
--- a/packages/nodes-base/nodes/Xml/Xml.node.ts
+++ b/packages/nodes-base/nodes/Xml/Xml.node.ts
@@ -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
diff --git a/packages/nodes-base/nodes/Yourls/GenericFunctions.ts b/packages/nodes-base/nodes/Yourls/GenericFunctions.ts
index 2aba2cc599..7555eeafd9 100644
--- a/packages/nodes-base/nodes/Yourls/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Yourls/GenericFunctions.ts
@@ -37,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/zammad.svg b/packages/nodes-base/nodes/Zammad/zammad.svg
index f3ef577a46..1af051651b 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/zendesk.svg b/packages/nodes-base/nodes/Zendesk/zendesk.svg
index dc3d0ec9b3..456aeae4e8 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/zoho.svg b/packages/nodes-base/nodes/Zoho/zoho.svg
index 203761c270..44bdedddec 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/Zoom.node.ts b/packages/nodes-base/nodes/Zoom/Zoom.node.ts
index 2afffa87f2..cbc3630726 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;
diff --git a/packages/nodes-base/nodes/Zoom/zoom.svg b/packages/nodes-base/nodes/Zoom/zoom.svg
index 6120c91378..58643b49b8 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/MessageDescription.ts b/packages/nodes-base/nodes/Zulip/MessageDescription.ts
index 786cf7c745..c8f0efc339 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 e0d96c66fa..0b7c4b0915 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';
diff --git a/packages/nodes-base/nodes/Zulip/zulip.svg b/packages/nodes-base/nodes/Zulip/zulip.svg
index bea31eed7c..5e398ae55d 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 bc8ce8528f..eb4fbbb36c 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-nodes-base",
-  "version": "1.14.0",
+  "version": "1.24.0",
   "description": "Base nodes of n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",
@@ -89,6 +89,9 @@
       "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",
@@ -489,6 +492,9 @@
       "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",
@@ -781,7 +787,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": {
@@ -808,7 +820,7 @@
     "@types/request-promise-native": "~1.0.15",
     "@types/rfc2047": "^2.0.1",
     "@types/showdown": "^1.9.4",
-    "@types/snowflake-sdk": "^1.6.12",
+    "@types/snowflake-sdk": "^1.6.20",
     "@types/ssh2-sftp-client": "^5.1.0",
     "@types/tmp": "^0.2.0",
     "@types/uuid": "^8.3.2",
@@ -819,66 +831,66 @@
   },
   "dependencies": {
     "@kafkajs/confluent-schema-registry": "1.0.6",
-    "@n8n/vm2": "^3.9.20",
-    "amqplib": "^0.10.3",
-    "aws4": "^1.8.0",
-    "basic-auth": "^2.0.1",
-    "change-case": "^4.1.1",
+    "@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",
-    "csv-parse": "^5.5.0",
-    "currency-codes": "^2.1.0",
-    "eventsource": "^2.0.2",
-    "fast-glob": "^3.2.5",
-    "fflate": "^0.7.0",
-    "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.6.13",
-    "iso-639-1": "^2.1.3",
-    "js-nacl": "^1.4.0",
-    "jsonwebtoken": "^9.0.0",
-    "kafkajs": "^1.14.0",
-    "ldapts": "^4.2.6",
-    "lodash": "^4.17.21",
-    "lossless-json": "^1.0.4",
-    "luxon": "^3.3.0",
-    "mailparser": "^3.2.0",
-    "minifaker": "^1.34.1",
-    "moment": "~2.29.2",
-    "moment-timezone": "^0.5.28",
-    "mongodb": "^4.17.1",
-    "mqtt": "^5.0.2",
-    "mssql": "^8.1.2",
-    "mysql2": "~2.3.0",
+    "cron": "1.7.2",
+    "csv-parse": "5.5.0",
+    "currency-codes": "2.1.0",
+    "eventsource": "2.0.2",
+    "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",
+    "imap-simple": "4.3.0",
+    "isbot": "3.6.13",
+    "iso-639-1": "2.1.15",
+    "js-nacl": "1.4.0",
+    "jsonwebtoken": "9.0.0",
+    "kafkajs": "1.16.0",
+    "ldapts": "4.2.6",
+    "lodash": "4.17.21",
+    "lossless-json": "1.0.5",
+    "luxon": "3.3.0",
+    "mailparser": "3.5.0",
+    "minifaker": "1.34.1",
+    "moment-timezone": "0.5.37",
+    "mongodb": "4.17.1",
+    "mqtt": "5.0.2",
+    "mssql": "8.1.4",
+    "mysql2": "2.3.3",
     "n8n-workflow": "workspace:*",
-    "nanoid": "^3.3.6",
-    "node-html-markdown": "^1.1.3",
-    "node-ssh": "^12.0.0",
-    "nodemailer": "^6.7.1",
-    "otpauth": "^9.1.1",
-    "pdfjs-dist": "^2.16.105",
-    "pg": "^8.3.0",
-    "pg-promise": "^10.5.8",
-    "pretty-bytes": "^5.6.0",
-    "promise-ftp": "^1.3.5",
-    "pyodide": "^0.23.4",
-    "redis": "^3.1.1",
-    "rfc2047": "^4.0.1",
-    "rhea": "^1.0.11",
-    "rss-parser": "^3.7.0",
-    "semver": "^7.5.4",
-    "showdown": "^2.0.3",
-    "simple-git": "^3.17.0",
-    "snowflake-sdk": "^1.8.0",
-    "ssh2-sftp-client": "^7.0.0",
-    "tmp-promise": "^3.0.2",
-    "typedi": "^0.10.0",
-    "uuid": "^8.3.2",
+    "nanoid": "3.3.6",
+    "node-html-markdown": "1.2.0",
+    "node-ssh": "12.0.5",
+    "nodemailer": "6.8.0",
+    "otpauth": "9.1.1",
+    "pdfjs-dist": "2.16.105",
+    "pg": "8.8.0",
+    "pg-promise": "10.12.0",
+    "pretty-bytes": "5.6.0",
+    "promise-ftp": "1.3.5",
+    "pyodide": "0.23.4",
+    "redis": "3.1.2",
+    "rfc2047": "4.0.1",
+    "rhea": "1.0.24",
+    "rss-parser": "3.12.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.5.0"
+    "xml2js": "0.5.0"
   }
 }
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 b2a2b71d02..c93598fa00 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 type { WorkflowTestData } from '../types';
-import nock from 'nock';
 
 const records = [
 	{
diff --git a/packages/nodes-base/test/nodes/ExecuteWorkflow.ts b/packages/nodes-base/test/nodes/ExecuteWorkflow.ts
index a7814f04cd..528eca40a9 100644
--- a/packages/nodes-base/test/nodes/ExecuteWorkflow.ts
+++ b/packages/nodes-base/test/nodes/ExecuteWorkflow.ts
@@ -1,3 +1,4 @@
+import nock from 'nock';
 import { WorkflowExecute } from 'n8n-core';
 import type { INodeTypes, IRun, IRunExecutionData } from 'n8n-workflow';
 import { createDeferredPromise, Workflow } from 'n8n-workflow';
@@ -5,6 +6,13 @@ import * as Helpers from './Helpers';
 import type { WorkflowTestData } from './types';
 
 export async function executeWorkflow(testData: WorkflowTestData, nodeTypes: INodeTypes) {
+	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',
diff --git a/packages/nodes-base/test/nodes/Helpers.ts b/packages/nodes-base/test/nodes/Helpers.ts
index bb923b9968..9cf4dbe8e6 100644
--- a/packages/nodes-base/test/nodes/Helpers.ts
+++ b/packages/nodes-base/test/nodes/Helpers.ts
@@ -1,6 +1,7 @@
 import { readFileSync, readdirSync, mkdtempSync } from 'fs';
 import path from 'path';
 import { tmpdir } from 'os';
+import nock from 'nock';
 import { isEmpty } from 'lodash';
 import { get } from 'lodash';
 import { BinaryDataService, Credentials, constructExecutionMetaData } from 'n8n-core';
@@ -32,7 +33,7 @@ import type {
 	NodeLoadingDetails,
 	WorkflowTestData,
 } from 'n8n-workflow';
-import { ICredentialsHelper, NodeHelpers, WorkflowHooks } from 'n8n-workflow';
+import { ApplicationError, ICredentialsHelper, NodeHelpers, WorkflowHooks } from 'n8n-workflow';
 import { executeWorkflow } from './ExecuteWorkflow';
 
 import { FAKE_CREDENTIALS_DATA } from './FakeCredentialsMap';
@@ -82,8 +83,8 @@ class CredentialType implements ICredentialTypes {
 		return this.credentialTypes[credentialType].type;
 	}
 
-	getNodeTypesToTestWith(type: string): string[] {
-		return knownCredentials[type]?.nodesToTestWith ?? [];
+	getSupportedNodes(type: string): string[] {
+		return knownCredentials[type]?.supportedNodes ?? [];
 	}
 
 	getParentTypes(typeName: string): string[] {
@@ -176,7 +177,6 @@ export function WorkflowExecuteAdditionalData(
 		executeWorkflow: async (workflowInfo: IExecuteWorkflowInfo): Promise<any> => {},
 		sendDataToUI: (message: string) => {},
 		restApiUrl: '',
-		timezone: workflowTestData?.input.workflowData.settings?.timezone || 'America/New_York',
 		webhookBaseUrl: 'webhook',
 		webhookWaitingBaseUrl: 'webhook-waiting',
 		webhookTestBaseUrl: 'webhook-test',
@@ -232,6 +232,16 @@ export function setup(testData: WorkflowTestData[] | WorkflowTestData) {
 		testData = [testData];
 	}
 
+	if (testData.some((t) => !!t.nock)) {
+		beforeAll(() => {
+			nock.disableNetConnect();
+		});
+
+		afterAll(() => {
+			nock.restore();
+		});
+	}
+
 	const nodeTypes = new NodeTypes();
 
 	const nodes = [...new Set(testData.flatMap((data) => data.input.workflowData.nodes))];
@@ -241,7 +251,9 @@ export function setup(testData: WorkflowTestData[] | WorkflowTestData) {
 	for (const credentialName of credentialNames) {
 		const loadInfo = knownCredentials[credentialName];
 		if (!loadInfo) {
-			throw new Error(`Unknown credential type: ${credentialName}`);
+			throw new ApplicationError(`Unknown credential type: ${credentialName}`, {
+				level: 'warning',
+			});
 		}
 		const sourcePath = loadInfo.sourcePath.replace(/^dist\//, './').replace(/\.js$/, '.ts');
 		const nodeSourcePath = path.join(baseDir, sourcePath);
@@ -252,11 +264,11 @@ export function setup(testData: WorkflowTestData[] | WorkflowTestData) {
 	const nodeNames = nodes.map((n) => n.type);
 	for (const nodeName of nodeNames) {
 		if (!nodeName.startsWith('n8n-nodes-base.')) {
-			throw new 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(baseDir, sourcePath);
@@ -284,7 +296,7 @@ export function getResultNodeData(result: IRun, testData: WorkflowTestData) {
 				}
 			});
 
-			throw new Error(`Data for node "${nodeName}" is missing!`);
+			throw new ApplicationError(`Data for node "${nodeName}" is missing!`, { level: 'warning' });
 		}
 		const resultData = result.data.resultData.runData[nodeName].map((nodeData) => {
 			if (nodeData.data === undefined) {
@@ -355,7 +367,7 @@ export const workflowToTests = (workflowFiles: string[]) => {
 			}
 		});
 		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);
diff --git a/packages/nodes-base/test/nodes/Postgres/Postgres.node.functions.test.ts b/packages/nodes-base/test/nodes/Postgres/Postgres.node.functions.test.ts
index e8c40be353..018d34bdb1 100644
--- a/packages/nodes-base/test/nodes/Postgres/Postgres.node.functions.test.ts
+++ b/packages/nodes-base/test/nodes/Postgres/Postgres.node.functions.test.ts
@@ -1,5 +1,5 @@
-const PostgresFun = require('../../../nodes/Postgres/v1/genericFunctions');
 const pgPromise = require('pg-promise');
+const PostgresFun = require('../../../nodes/Postgres/v1/genericFunctions');
 
 type NodeParams = Record<string, string | {}>;
 
diff --git a/packages/nodes-base/utils/binary.ts b/packages/nodes-base/utils/binary.ts
new file mode 100644
index 0000000000..825a0ca08e
--- /dev/null
+++ b/packages/nodes-base/utils/binary.ts
@@ -0,0 +1,194 @@
+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 { flattenObject } from '@utils/utilities';
+
+import get from 'lodash/get';
+import iconv from 'iconv-lite';
+
+import { getDocument as readPDF, version as pdfJsVersion } from 'pdfjs-dist';
+
+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;
+};
+
+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';
+			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: { password?: string; url?: URL; data?: ArrayBuffer } = { password };
+
+	if (binaryData.id) {
+		const binaryPath = this.helpers.getBinaryPath(binaryData.id);
+		params.url = new URL(`file://${binaryPath}`);
+	} 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
index 78abc22251..1465d3e314 100644
--- a/packages/nodes-base/utils/descriptions.ts
+++ b/packages/nodes-base/utils/descriptions.ts
@@ -1,4 +1,4 @@
-import type { INodeProperties } from 'n8n-workflow';
+import type { INodeProperties, INodePropertyOptions } from 'n8n-workflow';
 
 export const oldVersionNotice: INodeProperties = {
 	displayName:
@@ -7,3 +7,439 @@ export const oldVersionNotice: INodeProperties = {
 	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 9149c80e2e..ac07ad65d7 100644
--- a/packages/nodes-base/utils/utilities.ts
+++ b/packages/nodes-base/utils/utilities.ts
@@ -6,7 +6,7 @@ import type {
 	IPairedItemData,
 } from 'n8n-workflow';
 
-import { jsonParse } from 'n8n-workflow';
+import { ApplicationError, jsonParse } from 'n8n-workflow';
 
 import { isEqual, isNull, merge } from 'lodash';
 
@@ -84,18 +84,18 @@ export function updateDisplayOptions(
 
 export function processJsonInput<T>(jsonData: T, inputName?: string) {
 	let values;
-	const input = `'${inputName}' ` || '';
+	const input = inputName ? `'${inputName}' ` : '';
 
 	if (typeof jsonData === 'string') {
 		try {
 			values = jsonParse(jsonData);
 		} catch (error) {
-			throw new Error(`Input ${input}must contain a valid JSON`);
+			throw new ApplicationError(`Input ${input} must contain a valid JSON`, { level: 'warning' });
 		}
 	} else if (typeof jsonData === 'object') {
 		values = jsonData;
 	} else {
-		throw new Error(`Input ${input}must contain a valid JSON`);
+		throw new ApplicationError(`Input ${input} must contain a valid JSON`, { level: 'warning' });
 	}
 
 	return values;
@@ -294,10 +294,19 @@ export function flattenObject(data: IDataObject) {
 }
 
 /**
- * Generate Paired Item Data by length of input array
+ * Capitalizes the first letter of a string
  *
- * @param {number} length
+ * @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,
diff --git a/packages/workflow/README.md b/packages/workflow/README.md
index 601ecd8553..da80c57920 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 3c3ada756a..0e310ca48f 100644
--- a/packages/workflow/package.json
+++ b/packages/workflow/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-workflow",
-  "version": "1.14.0",
+  "version": "1.24.0",
   "description": "Workflow base code of n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",
@@ -39,29 +39,31 @@
     "dist/**/*"
   ],
   "devDependencies": {
-    "@types/crypto-js": "^4.1.3",
     "@types/deep-equal": "^1.0.1",
     "@types/express": "^4.17.6",
     "@types/jmespath": "^0.15.0",
     "@types/lodash": "^4.14.195",
     "@types/luxon": "^3.2.0",
+    "@types/md5": "^2.3.5",
     "@types/xml2js": "^0.4.11"
   },
   "dependencies": {
-    "@n8n/tournament": "^1.0.2",
-    "@n8n_io/riot-tmpl": "^4.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",
+    "callsites": "3.1.0",
+    "deep-equal": "2.2.0",
     "esprima-next": "5.8.4",
-    "form-data": "^4.0.0",
-    "jmespath": "^0.16.0",
-    "js-base64": "^3.7.2",
-    "lodash": "^4.17.21",
-    "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.5.0"
   }
 }
diff --git a/packages/workflow/src/Constants.ts b/packages/workflow/src/Constants.ts
index ad4946888e..ecd604f8dc 100644
--- a/packages/workflow/src/Constants.ts
+++ b/packages/workflow/src/Constants.ts
@@ -3,7 +3,7 @@ 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', 'json', 'python'] as const;
+export const CODE_LANGUAGES = ['javaScript', 'python'] as const;
 export const CODE_EXECUTION_MODES = ['runOnceForAllItems', 'runOnceForEachItem'] as const;
 
 /**
diff --git a/packages/workflow/src/ErrorReporterProxy.ts b/packages/workflow/src/ErrorReporterProxy.ts
index 6f7251d737..fc5a08828d 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,7 @@ export const error = (e: unknown, options?: ReportingOptions) => {
 	if (toReport) instance.report(toReport, options);
 };
 
+export const report = error;
+
 export const warn = (warning: Error | string, options?: ReportingOptions) =>
 	error(warning, { level: 'warning', ...options });
diff --git a/packages/workflow/src/Expression.ts b/packages/workflow/src/Expression.ts
index e6194ef533..c5e65f926b 100644
--- a/packages/workflow/src/Expression.ts
+++ b/packages/workflow/src/Expression.ts
@@ -15,7 +15,8 @@ import type {
 	NodeParameterValueType,
 	WorkflowExecuteMode,
 } from './Interfaces';
-import { ExpressionError, ExpressionExtensionError } from './ExpressionError';
+import { ExpressionError } from './errors/expression.error';
+import { ExpressionExtensionError } from './errors/expression-extension.error';
 import { WorkflowDataProxy } from './WorkflowDataProxy';
 import type { Workflow } from './Workflow';
 
@@ -23,6 +24,8 @@ 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' &&
@@ -32,13 +35,13 @@ const IS_FRONTEND_IN_DEV_MODE =
 
 const IS_FRONTEND = typeof process === 'undefined' || IS_FRONTEND_IN_DEV_MODE;
 
-export const isSyntaxError = (error: unknown): error is SyntaxError =>
+const isSyntaxError = (error: unknown): error is SyntaxError =>
 	error instanceof SyntaxError || (error instanceof Error && error.name === 'SyntaxError');
 
-export const isExpressionError = (error: unknown): error is ExpressionError =>
+const isExpressionError = (error: unknown): error is ExpressionError =>
 	error instanceof ExpressionError || error instanceof ExpressionExtensionError;
 
-export const isTypeError = (error: unknown): error is TypeError =>
+const isTypeError = (error: unknown): error is TypeError =>
 	error instanceof TypeError || (error instanceof Error && error.name === 'TypeError');
 
 // Make sure that error get forwarded
@@ -46,7 +49,6 @@ setErrorHandler((error: Error) => {
 	if (isExpressionError(error)) throw error;
 });
 
-// eslint-disable-next-line @typescript-eslint/naming-convention
 const AsyncFunction = (async () => {}).constructor as FunctionConstructor;
 
 const fnConstructors = {
@@ -59,11 +61,7 @@ const fnConstructors = {
 };
 
 export class Expression {
-	workflow: Workflow;
-
-	constructor(workflow: Workflow) {
-		this.workflow = workflow;
-	}
+	constructor(private readonly workflow: Workflow) {}
 
 	static resolveWithoutWorkflow(expression: string, data: IDataObject = {}) {
 		return tmpl.tmpl(expression, data);
@@ -78,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);
@@ -115,7 +113,6 @@ export class Expression {
 		activeNodeName: string,
 		connectionInputData: INodeExecutionData[],
 		mode: WorkflowExecuteMode,
-		timezone: string,
 		additionalKeys: IWorkflowDataProxyAdditionalKeys,
 		executeData?: IExecuteData,
 		returnObjectAsString = false,
@@ -144,7 +141,6 @@ export class Expression {
 			connectionInputData,
 			siblingParameters,
 			mode,
-			timezone,
 			additionalKeys,
 			executeData,
 			-1,
@@ -315,12 +311,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') {
@@ -344,14 +340,14 @@ export class Expression {
 		} catch (error) {
 			if (isExpressionError(error)) throw error;
 
-			if (isSyntaxError(error)) throw new Error('invalid syntax');
+			if (isSyntaxError(error)) throw new ApplicationError('invalid syntax');
 
 			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 });
@@ -372,7 +368,6 @@ export class Expression {
 		node: INode,
 		parameterValue: string | boolean | undefined,
 		mode: WorkflowExecuteMode,
-		timezone: string,
 		additionalKeys: IWorkflowDataProxyAdditionalKeys,
 		executeData?: IExecuteData,
 		defaultValue?: boolean | number | string | unknown[],
@@ -400,7 +395,6 @@ export class Expression {
 			node.name,
 			connectionInputData,
 			mode,
-			timezone,
 			additionalKeys,
 			executeData,
 		) as boolean | number | string | undefined;
@@ -416,7 +410,6 @@ export class Expression {
 		node: INode,
 		parameterValue: NodeParameterValue | INodeParameters | NodeParameterValue[] | INodeParameters[],
 		mode: WorkflowExecuteMode,
-		timezone: string,
 		additionalKeys: IWorkflowDataProxyAdditionalKeys,
 		executeData?: IExecuteData,
 		defaultValue: NodeParameterValueType | undefined = undefined,
@@ -446,7 +439,6 @@ export class Expression {
 			node.name,
 			connectionInputData,
 			mode,
-			timezone,
 			additionalKeys,
 			executeData,
 			false,
@@ -462,7 +454,6 @@ export class Expression {
 			node.name,
 			connectionInputData,
 			mode,
-			timezone,
 			additionalKeys,
 			executeData,
 			false,
@@ -488,7 +479,6 @@ export class Expression {
 		activeNodeName: string,
 		connectionInputData: INodeExecutionData[],
 		mode: WorkflowExecuteMode,
-		timezone: string,
 		additionalKeys: IWorkflowDataProxyAdditionalKeys,
 		executeData?: IExecuteData,
 		returnObjectAsString = false,
@@ -514,7 +504,6 @@ export class Expression {
 					activeNodeName,
 					connectionInputData,
 					mode,
-					timezone,
 					additionalKeys,
 					executeData,
 					returnObjectAsString,
@@ -532,7 +521,6 @@ export class Expression {
 				activeNodeName,
 				connectionInputData,
 				mode,
-				timezone,
 				additionalKeys,
 				executeData,
 				returnObjectAsString,
@@ -552,7 +540,6 @@ export class Expression {
 				activeNodeName,
 				connectionInputData,
 				mode,
-				timezone,
 				additionalKeys,
 				executeData,
 				returnObjectAsString,
diff --git a/packages/workflow/src/Extensions/ArrayExtensions.ts b/packages/workflow/src/Extensions/ArrayExtensions.ts
index 8c33fd98c4..b414014d0f 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';
@@ -323,80 +324,70 @@ 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 = {
@@ -404,8 +395,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 = {
@@ -414,8 +404,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 = {
@@ -425,7 +414,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 = {
@@ -434,8 +423,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 = {
@@ -448,8 +436,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 = {
@@ -465,8 +452,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 = {
@@ -478,8 +464,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 = {
@@ -487,8 +472,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 = {
@@ -496,8 +480,7 @@ unique.doc = {
 	description: 'Remove duplicates from an array. ',
 	returnType: 'Element',
 	aliases: ['removeDuplicates'],
-	docURL:
-		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/arrays/#array-unique',
+	docURL: 'https://docs.n8n.io/code/builtin/data-transformation-functions/arrays/#array-unique',
 };
 
 export const arrayExtensions: ExtensionMap = {
diff --git a/packages/workflow/src/Extensions/DateExtensions.ts b/packages/workflow/src/Extensions/DateExtensions.ts
index 6389e9fcb2..c99dec4706 100644
--- a/packages/workflow/src/Extensions/DateExtensions.ts
+++ b/packages/workflow/src/Extensions/DateExtensions.ts
@@ -1,4 +1,4 @@
-import { ExpressionExtensionError } from './../ExpressionError';
+import { ExpressionExtensionError } from '../errors/expression-extension.error';
 
 import { DateTime } from 'luxon';
 import type {
@@ -220,24 +220,21 @@ endOfMonth.doc = {
 	name: 'endOfMonth',
 	returnType: 'Date',
 	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',
+	docURL: 'https://docs.n8n.io/code/builtin/data-transformation-functions/dates/#date-endOfMonth',
 };
 
 isDst.doc = {
 	name: 'isDst',
 	returnType: 'boolean',
 	description: 'Checks if a Date is within Daylight Savings Time.',
-	docURL:
-		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/dates/#date-isDst',
+	docURL: 'https://docs.n8n.io/code/builtin/data-transformation-functions/dates/#date-isDst',
 };
 
 isWeekend.doc = {
 	name: 'isWeekend',
 	returnType: 'boolean',
 	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',
+	docURL: 'https://docs.n8n.io/code/builtin/data-transformation-functions/dates/#date-isWeekend',
 };
 
 beginningOf.doc = {
@@ -245,8 +242,7 @@ beginningOf.doc = {
 	description: 'Transform a Date to the start of the given time period. Default unit is `week`.',
 	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 = {
@@ -254,8 +250,7 @@ extract.doc = {
 	description: 'Extracts the part defined in `datePart` from a Date. Default unit is `week`.',
 	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 = {
@@ -263,8 +258,7 @@ format.doc = {
 	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',
+	docURL: 'https://docs.n8n.io/code/builtin/data-transformation-functions/dates/#date-format',
 };
 
 isBetween.doc = {
@@ -275,8 +269,7 @@ isBetween.doc = {
 		{ 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 = {
@@ -287,8 +280,7 @@ isInLast.doc = {
 		{ 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',
 };
 
 minus.doc = {
@@ -299,8 +291,7 @@ minus.doc = {
 		{ 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 = {
@@ -311,8 +302,7 @@ plus.doc = {
 		{ 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 = {
diff --git a/packages/workflow/src/Extensions/ExpressionExtension.ts b/packages/workflow/src/Extensions/ExpressionExtension.ts
index 809d7a4886..29a9bbee1f 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';
diff --git a/packages/workflow/src/Extensions/ExtendedFunctions.ts b/packages/workflow/src/Extensions/ExtendedFunctions.ts
index 73fb21ca90..091cdc8b0c 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/NumberExtensions.ts b/packages/workflow/src/Extensions/NumberExtensions.ts
index 1cbaf53069..48d019331e 100644
--- a/packages/workflow/src/Extensions/NumberExtensions.ts
+++ b/packages/workflow/src/Extensions/NumberExtensions.ts
@@ -1,7 +1,7 @@
 /**
  * @jest-environment jsdom
  */
-import { ExpressionExtensionError } from './../ExpressionError';
+import { ExpressionExtensionError } from '../errors/expression-extension.error';
 import type { ExtensionMap } from './Extensions';
 
 function format(value: number, extraArgs: unknown[]): string {
@@ -44,32 +44,28 @@ 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,8 +77,7 @@ 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 = {
@@ -91,8 +86,7 @@ round.doc = {
 		'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-examples/expressions/data-transformation-functions/numbers/#number-round',
+	docURL: 'https://docs.n8n.io/code/builtin/data-transformation-functions/numbers/#number-round',
 };
 
 export const numberExtensions: ExtensionMap = {
diff --git a/packages/workflow/src/Extensions/ObjectExtensions.ts b/packages/workflow/src/Extensions/ObjectExtensions.ts
index 7274d4808c..61d23d3363 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 {
@@ -84,8 +84,7 @@ 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 +92,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 +107,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 +115,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 +124,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 +134,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 +143,7 @@ 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',
 };
 
 export const objectExtensions: ExtensionMap = {
diff --git a/packages/workflow/src/Extensions/StringExtensions.ts b/packages/workflow/src/Extensions/StringExtensions.ts
index 69a9cae1bd..6a01279637 100644
--- a/packages/workflow/src/Extensions/StringExtensions.ts
+++ b/packages/workflow/src/Extensions/StringExtensions.ts
@@ -1,21 +1,20 @@
-// import { createHash } from 'crypto';
-import { titleCase } from 'title-case';
-import * as ExpressionError from '../ExpressionError';
-import type { ExtensionMap } from './Extensions';
-import CryptoJS from 'crypto-js';
+import SHA from 'jssha';
+import MD5 from 'md5';
 import { encode } from 'js-base64';
+import { titleCase } from 'title-case';
+import type { ExtensionMap } from './Extensions';
 import { transliterate } from 'transliteration';
+import { ExpressionExtensionError } from '../errors/expression-extension.error';
 
-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,
-};
+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 =
@@ -113,23 +112,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 encode(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 {
@@ -194,7 +205,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)) {
@@ -224,7 +235,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;
@@ -232,15 +243,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;
@@ -355,7 +364,7 @@ removeMarkdown.doc = {
 	description: 'Removes Markdown formatting from a string.',
 	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 = {
@@ -363,15 +372,14 @@ removeTags.doc = {
 	description: 'Removes tags, such as HTML or XML, from a string.',
 	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.',
 	returnType: 'Date',
-	docURL:
-		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/strings/#string-toDate',
+	docURL: 'https://docs.n8n.io/code/builtin/data-transformation-functions/strings/#string-toDate',
 };
 
 toFloat.doc = {
@@ -380,7 +388,7 @@ toFloat.doc = {
 	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 = {
@@ -389,8 +397,7 @@ toInt.doc = {
 	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 = {
@@ -398,7 +405,7 @@ toSentenceCase.doc = {
 	description: 'Formats a string to sentence case. Example: "This is a sentence".',
 	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 = {
@@ -406,15 +413,16 @@ toSnakeCase.doc = {
 	description: 'Formats a string to snake case. Example: "this_is_snake_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.',
 	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 = {
@@ -423,7 +431,7 @@ urlEncode.doc = {
 	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 = {
@@ -432,7 +440,7 @@ urlDecode.doc = {
 		'Decodes a URL-encoded string. It decodes any percent-encoded characters in the input string, and replaces them with their original characters.',
 	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 = {
@@ -440,30 +448,28 @@ replaceSpecialChars.doc = {
 	description: 'Replaces non-ASCII characters in a string with an ASCII representation.',
 	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',
 	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.',
 	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.',
 	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 = {
@@ -471,23 +477,21 @@ isNumeric.doc = {
 	description: 'Checks if a string only contains digits.',
 	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.',
 	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.',
 	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 = {
@@ -495,7 +499,7 @@ isNotEmpty.doc = {
 	description: 'Checks if a string has content.',
 	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 = {
@@ -503,7 +507,7 @@ extractEmail.doc = {
 	description: 'Extracts an email from a string. Returns undefined if none is found.',
 	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 = {
@@ -512,7 +516,7 @@ extractDomain.doc = {
 		'Extracts a domain from a string containing a valid URL. Returns undefined if none is found.',
 	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 = {
@@ -520,7 +524,7 @@ extractUrl.doc = {
 	description: 'Extracts a URL from a string. Returns undefined if none is found.',
 	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-extractUrl',
 };
 
 hash.doc = {
@@ -528,8 +532,7 @@ hash.doc = {
 	description: 'Returns a string hashed with the given algorithm. Default algorithm is `md5`.',
 	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 = {
@@ -537,8 +540,7 @@ quote.doc = {
 	description: 'Returns a string wrapped in the quotation marks. Default quotation is `"`.',
 	returnType: 'string',
 	args: [{ name: 'mark?', type: 'string' }],
-	docURL:
-		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/strings/#string-quote',
+	docURL: 'https://docs.n8n.io/code/builtin/data-transformation-functions/strings/#string-quote',
 };
 
 export const stringExtensions: ExtensionMap = {
diff --git a/packages/workflow/src/GlobalState.ts b/packages/workflow/src/GlobalState.ts
new file mode 100644
index 0000000000..f76920fea1
--- /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 a24f7c389a..b3ca075803 100644
--- a/packages/workflow/src/Interfaces.ts
+++ b/packages/workflow/src/Interfaces.ts
@@ -13,12 +13,13 @@ 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 './ExpressionError';
-import type { NodeApiError, NodeOperationError } from './NodeErrors';
+import type { ExpressionError } from './errors/expression.error';
 import type { Workflow } from './Workflow';
-import type { WorkflowActivationError } from './WorkflowActivationError';
-import type { WorkflowOperationError } from './WorkflowErrors';
+import type { WorkflowActivationError } from './errors/workflow-activation.error';
+import type { WorkflowOperationError } from './errors/workflow-operation.error';
 import type { WorkflowHooks } from './WorkflowHooks';
+import type { NodeOperationError } from './errors/node-operation.error';
+import type { NodeApiError } from './errors/node-api.error';
 
 export interface IAdditionalCredentialOptions {
 	oauth2?: IOAuth2Options;
@@ -196,7 +197,6 @@ export abstract class ICredentialsHelper {
 		requestOptions: IHttpRequestOptions | IRequestOptionsSimplified,
 		workflow: Workflow,
 		node: INode,
-		defaultTimezone: string,
 	): Promise<IHttpRequestOptions>;
 
 	abstract preAuthentication(
@@ -217,7 +217,7 @@ export abstract class ICredentialsHelper {
 		nodeCredentials: INodeCredentialsDetails,
 		type: string,
 		mode: WorkflowExecuteMode,
-		defaultTimezone: string,
+		executeData?: IExecuteData,
 		raw?: boolean,
 		expressionResolveValues?: ICredentialsExpressionResolveValues,
 	): Promise<ICredentialDataDecryptedObject>;
@@ -310,6 +310,11 @@ export interface ICredentialTestRequestData {
 	testRequest: ICredentialTestRequest;
 }
 
+type ICredentialHttpRequestNode = {
+	name: string;
+	docsUrl: string;
+} & ({ apiBaseUrl: string } | { apiBaseUrlPlaceholder: string });
+
 export interface ICredentialType {
 	name: string;
 	displayName: string;
@@ -326,12 +331,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[];
 }
 
@@ -372,6 +378,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[];
 }
@@ -405,7 +413,7 @@ export interface IGetExecuteTriggerFunctions {
 
 export interface IRunNodeResponse {
 	data: INodeExecutionData[][] | null | undefined;
-	closeFunction?: () => Promise<void>;
+	closeFunction?: CloseFunction;
 }
 export interface IGetExecuteFunctions {
 	(
@@ -418,6 +426,8 @@ export interface IGetExecuteFunctions {
 		additionalData: IWorkflowExecuteAdditionalData,
 		executeData: IExecuteData,
 		mode: WorkflowExecuteMode,
+		closeFunctions: CloseFunction[],
+		abortSignal?: AbortSignal,
 	): IExecuteFunctions;
 }
 
@@ -433,6 +443,7 @@ export interface IGetExecuteSingleFunctions {
 		additionalData: IWorkflowExecuteAdditionalData,
 		executeData: IExecuteData,
 		mode: WorkflowExecuteMode,
+		abortSignal?: AbortSignal,
 	): IExecuteSingleFunctions;
 }
 
@@ -443,7 +454,6 @@ export interface IGetExecuteHookFunctions {
 		additionalData: IWorkflowExecuteAdditionalData,
 		mode: WorkflowExecuteMode,
 		activation: WorkflowActivateMode,
-		isTest?: boolean,
 		webhookData?: IWebhookData,
 	): IHookFunctions;
 }
@@ -455,6 +465,7 @@ export interface IGetExecuteWebhookFunctions {
 		additionalData: IWorkflowExecuteAdditionalData,
 		mode: WorkflowExecuteMode,
 		webhookData: IWebhookData,
+		closeFunctions: CloseFunction[],
 	): IWebhookFunctions;
 }
 
@@ -513,10 +524,19 @@ export interface IHttpRequestOptions {
 	json?: boolean;
 }
 
+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 | Readable;
+	__bodyResolved?: boolean;
 	headers: IDataObject;
 	statusCode: number;
 	statusMessage?: string;
@@ -710,6 +730,14 @@ export interface RequestHelperFunctions {
 		requestOptions: IHttpRequestOptions,
 		additionalCredentialOptions?: IAdditionalCredentialOptions,
 	): Promise<any>;
+	requestWithAuthenticationPaginated(
+		this: IAllExecuteFunctions,
+		requestOptions: OptionsWithUri,
+		itemIndex: number,
+		paginationOptions: PaginationOptions,
+		credentialsType?: string,
+		additionalCredentialOptions?: IAdditionalCredentialOptions,
+	): Promise<any[]>;
 
 	requestOAuth1(
 		this: IAllExecuteFunctions,
@@ -747,13 +775,17 @@ type FunctionsBaseWithRequiredKeys<Keys extends keyof FunctionsBase> = Functions
 	[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;
 };
 
 // TODO: Create later own type only for Config-Nodes
@@ -895,6 +927,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,
@@ -922,6 +959,7 @@ export interface INodeCredentials {
 	[key: string]: INodeCredentialsDetails;
 }
 
+export type OnError = 'continueErrorOutput' | 'continueRegularOutput' | 'stopWorkflow';
 export interface INode {
 	id: string;
 	name: string;
@@ -936,10 +974,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 {
@@ -1040,11 +1080,13 @@ export type NodePropertyTypes =
 	| 'credentialsSelect'
 	| 'resourceLocator'
 	| 'curlImport'
-	| 'resourceMapper';
+	| 'resourceMapper'
+	| 'filter'
+	| 'credentials';
 
 export type CodeAutocompleteTypes = 'function' | 'functionItem';
 
-export type EditorType = 'code' | 'codeNodeEditor' | 'htmlEditor' | 'sqlEditor' | '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 =
@@ -1067,10 +1109,10 @@ 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?: EditorType; // Supported by: string
-	editorLanguage?: CodeNodeEditorLanguage; // Supported by: string in combination with editor: codeNodeEditor
 	sqlDialect?: SQLDialect; // Supported by: sqlEditor
 	loadOptionsDependsOn?: string[]; // Supported by: options
 	loadOptionsMethod?: string; // Supported by: options
@@ -1086,6 +1128,7 @@ export interface INodePropertyTypeOptions {
 	sortable?: boolean; // Supported when "multipleValues" set to true
 	expirable?: boolean; // Supported by: hidden (only in the credentials)
 	resourceMapper?: ResourceMapperTypeOptions;
+	filter?: FilterTypeOptions;
 	[key: string]: any;
 }
 
@@ -1105,6 +1148,18 @@ export interface ResourceMapperTypeOptions {
 	};
 }
 
+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 interface IDisplayOptions {
 	hide?: {
 		[key: string]: NodeParameterValue[] | undefined;
@@ -1244,13 +1299,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[][]>;
@@ -1279,11 +1334,12 @@ export namespace MultiPartFormData {
 export interface SupplyData {
 	metadata?: IDataObject;
 	response: unknown;
+	closeFunction?: CloseFunction;
 }
 
 export interface INodeType {
 	description: INodeTypeDescription;
-	supplyData?(this: IExecuteFunctions, itemIndex: number): Promise<SupplyData>;
+	supplyData?(this: IAllExecuteFunctions, itemIndex: number): Promise<SupplyData>;
 	execute?(
 		this: IExecuteFunctions,
 	): Promise<INodeExecutionData[][] | NodeExecutionWithMetadata[][] | null>;
@@ -1380,6 +1436,7 @@ export interface INodeTypeBaseDescription {
 	name: string;
 	icon?: string;
 	iconUrl?: string;
+	badgeIconUrl?: string;
 	group: string[];
 	description: string;
 	documentationUrl?: string;
@@ -1494,6 +1551,7 @@ export interface IPostReceiveSort extends IPostReceiveBase {
 }
 
 export type ConnectionTypes =
+	| 'ai_agent'
 	| 'ai_chain'
 	| 'ai_document'
 	| 'ai_embedding'
@@ -1508,6 +1566,8 @@ export type ConnectionTypes =
 	| '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
@@ -1548,6 +1608,7 @@ export interface INodeInputConfiguration {
 }
 
 export interface INodeOutputConfiguration {
+	category?: string;
 	displayName?: string;
 	required?: boolean;
 	type: ConnectionTypes;
@@ -1566,7 +1627,8 @@ export interface INodeTypeDescription extends INodeTypeBaseDescription {
 	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?: {
@@ -1577,21 +1639,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;
-			  };
-	};
+	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
 }
 
@@ -1607,6 +1673,9 @@ export interface IWebhookData {
 	workflowId: string;
 	workflowExecuteAdditionalData: IWorkflowExecuteAdditionalData;
 	webhookId?: string;
+	isTest?: boolean;
+	userId?: string;
+	staticData?: Workflow['staticData'];
 }
 
 export interface IWebhookDescription {
@@ -1621,9 +1690,10 @@ export interface IWebhookDescription {
 	responseMode?: WebhookResponseMode | string;
 	responseData?: WebhookResponseData | string;
 	restartWebhook?: boolean;
+	isForm?: boolean;
 	hasLifecycleMethods?: boolean; // set automatically by generate-ui-types
-	ndvHideUrl?: boolean; // If true the webhook will not be displayed in the editor
-	ndvHideMethod?: boolean; // If true the method will not be displayed in the editor
+	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 {
@@ -1655,6 +1725,11 @@ export interface IWorkflowDataProxyData {
 	$thisItemIndex: number;
 	$now: any;
 	$today: any;
+	$getPairedItem: (
+		destinationNodeName: string,
+		incomingSourceData: ISourceData | null,
+		pairedItem: IPairedItemData,
+	) => INodeExecutionData | null;
 	constructor: any;
 }
 
@@ -1686,7 +1761,7 @@ export type LoadingDetails = {
 };
 
 export type CredentialLoadingDetails = LoadingDetails & {
-	nodesToTestWith?: string[];
+	supportedNodes?: string[];
 	extends?: string[];
 };
 
@@ -1809,7 +1884,7 @@ export interface IWaitingForExecutionSource {
 }
 
 export interface IWorkflowBase {
-	id?: string;
+	id: string;
 	name: string;
 	active: boolean;
 	createdAt: Date;
@@ -1845,7 +1920,8 @@ export interface IWorkflowExecuteAdditionalData {
 		workflowInfo: IExecuteWorkflowInfo,
 		additionalData: IWorkflowExecuteAdditionalData,
 		options: {
-			parentWorkflowId?: string;
+			node?: INode;
+			parentWorkflowId: string;
 			inputData?: INodeExecutionData[];
 			parentExecutionId?: string;
 			loadedWorkflowData?: IWorkflowBase;
@@ -1862,7 +1938,7 @@ export interface IWorkflowExecuteAdditionalData {
 	instanceBaseUrl: string;
 	setExecutionStatus?: (status: ExecutionStatus) => void;
 	sendDataToUI?: (type: string, data: IDataObject | IDataObject[]) => void;
-	timezone: string;
+	formWaitingBaseUrl: string;
 	webhookBaseUrl: string;
 	webhookWaitingBaseUrl: string;
 	webhookTestBaseUrl: string;
@@ -1882,7 +1958,14 @@ export type WorkflowExecuteMode =
 	| 'retry'
 	| 'trigger'
 	| 'webhook';
-export type WorkflowActivateMode = 'init' | 'create' | 'update' | 'activate' | 'manual';
+
+export type WorkflowActivateMode =
+	| 'init'
+	| 'create'
+	| 'update'
+	| 'activate'
+	| 'manual'
+	| 'leadershipChange';
 
 export interface IWorkflowHooksOptionalParameters {
 	parentProcessMode?: string;
@@ -2007,6 +2090,7 @@ export interface INoteGraphItem {
 export interface INodeGraphItem {
 	id: string;
 	type: string;
+	version?: number;
 	resource?: string;
 	operation?: string;
 	domain?: string; // HTTP Request node v1
@@ -2051,23 +2135,6 @@ export interface IConnectedNode {
 	depth: number;
 }
 
-export const enum OAuth2GrantType {
-	pkce = 'pkce',
-	authorizationCode = 'authorizationCode',
-	clientCredentials = 'clientCredentials',
-}
-export interface IOAuth2Credentials {
-	grantType: 'authorizationCode' | 'clientCredentials' | 'pkce';
-	clientId: string;
-	clientSecret: string;
-	accessTokenUrl: string;
-	authUrl: string;
-	authQueryParameters: string;
-	authentication: 'body' | 'header';
-	scope: string;
-	oauthTokenData?: IDataObject;
-}
-
 export type PublicInstalledPackage = {
 	packageName: string;
 	installedVersion: string;
@@ -2144,7 +2211,8 @@ export type FieldType =
 	| 'time'
 	| 'array'
 	| 'object'
-	| 'options';
+	| 'options'
+	| 'url';
 
 export type ValidationResult = {
 	valid: boolean;
@@ -2158,6 +2226,42 @@ export type ResourceMapperValue = {
 	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 interface ExecutionOptions {
 	limit?: number;
 }
@@ -2204,6 +2308,9 @@ export interface IPublicApiSettings {
 export type ExpressionEvaluatorType = 'tmpl' | 'tournament';
 
 export interface IN8nUISettings {
+	endpointForm: string;
+	endpointFormTest: string;
+	endpointFormWaiting: string;
 	endpointWebhook: string;
 	endpointWebhookTest: string;
 	saveDataErrorExecution: WorkflowSettings.SaveDataExecution;
@@ -2284,6 +2391,8 @@ export interface IN8nUISettings {
 		debugInEditor: boolean;
 		binaryDataS3: boolean;
 		workflowHistory: boolean;
+		workerView: boolean;
+		advancedPermissions: boolean;
 	};
 	hideUsagePage: boolean;
 	license: {
@@ -2327,3 +2436,5 @@ export type BannerName =
 	| 'TRIAL'
 	| 'NON_PRODUCTION_LICENSE'
 	| 'EMAIL_CONFIRMATION';
+
+export type Functionality = 'regular' | 'configuration-node';
diff --git a/packages/workflow/src/NodeErrors.ts b/packages/workflow/src/NodeErrors.ts
deleted file mode 100644
index 8abfcefac8..0000000000
--- a/packages/workflow/src/NodeErrors.ts
+++ /dev/null
@@ -1,509 +0,0 @@
-/* eslint-disable @typescript-eslint/naming-convention */
-
-import { parseString } from 'xml2js';
-import { removeCircularRefs, isTraversableObject } from './utils';
-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'];
-
-/**
- * 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',
-};
-
-/**
- * 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?',
-};
-
-const UNKNOWN_ERROR_MESSAGE = 'UNKNOWN ERROR - check the detailed error for more information';
-const UNKNOWN_ERROR_MESSAGE_CRED = 'UNKNOWN ERROR';
-
-export type Severity = 'warning' | 'error';
-
-interface ExecutionBaseErrorOptions {
-	cause?: Error | JsonObject;
-}
-
-interface NodeOperationErrorOptions {
-	message?: string;
-	description?: string;
-	runIndex?: number;
-	itemIndex?: number;
-	severity?: Severity;
-	messageMapping?: { [key: string]: string }; // allows to pass custom mapping for error messages scoped to a node
-}
-
-interface NodeApiErrorOptions extends NodeOperationErrorOptions {
-	message?: string;
-	httpCode?: string;
-	parseXml?: boolean;
-}
-
-export abstract class ExecutionBaseError extends Error {
-	description: string | null | undefined;
-
-	cause: Error | JsonObject | undefined;
-
-	timestamp: number;
-
-	context: IDataObject = {};
-
-	lineNumber: number | undefined;
-
-	severity: Severity = 'error';
-
-	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.
- */
-export 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 {
-		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;
-	}
-
-	/**
-	 * 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,
-		description: string | undefined | null,
-		code?: string | null,
-		messageMapping?: { [key: string]: string },
-	) {
-		let newMessage = message;
-		let newDescription = description as string;
-
-		if (messageMapping) {
-			for (const [mapKey, mapMessage] of Object.entries(messageMapping)) {
-				if ((message || '').toUpperCase().includes(mapKey.toUpperCase())) {
-					newMessage = mapMessage;
-					newDescription = this.updateDescription(message, description);
-					break;
-				}
-			}
-			if (newMessage !== message) {
-				return [newMessage, newDescription];
-			}
-		}
-
-		// 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;
-			newDescription = this.updateDescription(message, description);
-			return [newMessage, newDescription];
-		}
-
-		// 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;
-				newDescription = this.updateDescription(message, description);
-				break;
-			}
-		}
-
-		return [newMessage, newDescription];
-	}
-
-	protected updateDescription(message: string, description: string | undefined | null) {
-		return `${message}${description ? ` - ${description}` : ''}`;
-	}
-}
-
-/**
- * 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;
-		if (options.severity) this.severity = options.severity;
-		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.description] = this.setDescriptiveErrorMessage(
-			this.message,
-			this.description,
-			undefined,
-			options.messageMapping,
-		);
-	}
-}
-
-/**
- * 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,
-			severity,
-			messageMapping,
-		}: NodeApiErrorOptions = {},
-	) {
-		super(node, error);
-
-		if (severity) this.severity = severity;
-		else if (httpCode?.charAt(0) !== '5') this.severity = 'warning';
-
-		// only for request library error
-		if (error.error) {
-			removeCircularRefs(error.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 && (error.description || (error?.reason as IDataObject)?.description)) {
-			// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-			this.description = (error.description ||
-				(error?.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 && (error.message || (error?.reason as IDataObject)?.message || description)) {
-			// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-			this.message = (error.message ||
-				// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-				(error?.reason as IDataObject)?.message ||
-				description) as string;
-		}
-
-		// 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;
-			}
-		}
-
-		// set http code of this error
-		if (httpCode) {
-			this.httpCode = httpCode;
-		} else {
-			this.httpCode =
-				this.findProperty(error, ERROR_STATUS_PROPERTIES, ERROR_NESTING_PROPERTIES) ?? null;
-		}
-
-		// set description of this error
-		if (description) {
-			this.description = description;
-		}
-
-		if (!this.description) {
-			if (parseXml) {
-				this.setDescriptionFromXml(error.error as string);
-			} else {
-				this.description = this.findProperty(
-					error,
-					ERROR_MESSAGE_PROPERTIES,
-					ERROR_NESTING_PROPERTIES,
-				);
-			}
-		}
-
-		// set message if provided or set default message based on http code
-		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.description] = this.setDescriptiveErrorMessage(
-			this.message,
-			this.description,
-			// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-			this.httpCode ||
-				(error?.code as string) ||
-				((error?.reason as JsonObject)?.code as string) ||
-				undefined,
-			messageMapping,
-		);
-
-		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;
-			// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-			this.message = this.message || this.description || UNKNOWN_ERROR_MESSAGE;
-			return;
-		}
-
-		if (STATUS_CODE_MESSAGES[this.httpCode]) {
-			this.description = this.updateDescription(this.message, this.description);
-			this.message = STATUS_CODE_MESSAGES[this.httpCode];
-			return;
-		}
-
-		switch (this.httpCode.charAt(0)) {
-			case '4':
-				this.description = this.updateDescription(this.message, this.description);
-				this.message = STATUS_CODE_MESSAGES['4XX'];
-				break;
-			case '5':
-				this.description = this.updateDescription(this.message, this.description);
-				this.message = STATUS_CODE_MESSAGES['5XX'];
-				break;
-			default:
-				// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-				this.message = this.message || this.description || UNKNOWN_ERROR_MESSAGE;
-		}
-		if (this.node.type === 'n8n-nodes-base.noOp' && this.message === UNKNOWN_ERROR_MESSAGE) {
-			this.message = `${UNKNOWN_ERROR_MESSAGE_CRED} - ${this.httpCode}`;
-		}
-	}
-}
-
-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/NodeHelpers.ts b/packages/workflow/src/NodeHelpers.ts
index e1ae6e5365..7a840b05fd 100644
--- a/packages/workflow/src/NodeHelpers.ts
+++ b/packages/workflow/src/NodeHelpers.ts
@@ -10,9 +10,12 @@
 
 import get from 'lodash/get';
 import isEqual from 'lodash/isEqual';
+import uniqBy from 'lodash/uniqBy';
 
 import type {
+	FieldType,
 	IContextObject,
+	IHttpRequestMethods,
 	INode,
 	INodeCredentialDescription,
 	INodeIssueObjectProperty,
@@ -23,30 +26,33 @@ import type {
 	INodePropertyCollection,
 	INodePropertyMode,
 	INodePropertyModeValidation,
+	INodePropertyOptions,
 	INodePropertyRegexValidation,
 	INodeType,
-	IVersionedNodeType,
 	IParameterDependencies,
 	IRunExecutionData,
+	IVersionedNodeType,
 	IWebhookData,
 	IWorkflowExecuteAdditionalData,
 	NodeParameterValue,
-	IHttpRequestMethods,
-	FieldType,
-	INodePropertyOptions,
 	ResourceMapperValue,
-	ValidationResult,
 	ConnectionTypes,
 	INodeTypeDescription,
 	INodeOutputConfiguration,
 	INodeInputConfiguration,
 	GenericValue,
 } from './Interfaces';
-import { isResourceMapperValue, isValidResourceLocatorParameterValue } from './type-guards';
+import {
+	isFilterValue,
+	isResourceMapperValue,
+	isValidResourceLocatorParameterValue,
+} from './type-guards';
 import { deepCopy } from './utils';
 
 import type { Workflow } from './Workflow';
-import { DateTime } from 'luxon';
+import { validateFilterParameter } from './NodeParameters/FilterParameter';
+import { validateFieldType } from './TypeValidation';
+import { ApplicationError } from './errors/application.error';
 
 export const cronNodeOptions: INodePropertyCollection[] = [
 	{
@@ -235,7 +241,7 @@ export const cronNodeOptions: INodePropertyCollection[] = [
 	},
 ];
 
-const specialNodeParameters: INodeProperties[] = [
+const commonPollingParameters: INodeProperties[] = [
 	{
 		displayName: 'Poll Times',
 		name: 'pollTimes',
@@ -251,12 +257,28 @@ const specialNodeParameters: INodeProperties[] = [
 	},
 ];
 
+const commonCORSParameters: INodeProperties[] = [
+	{
+		displayName: 'Allowed Origins (CORS)',
+		name: 'allowedOrigins',
+		type: 'string',
+		default: '*',
+		description: 'The origin(s) to allow cross-origin non-preflight requests from in a browser',
+	},
+];
+
 /**
  * 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!.push(...commonCORSParameters);
+		else properties.push(...commonCORSParameters);
 	}
 }
 
@@ -271,7 +293,7 @@ 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) {
@@ -369,7 +391,7 @@ export function displayParameterPath(
 	nodeValues: INodeParameters,
 	parameter: INodeProperties | INodeCredentialDescription,
 	path: string,
-	node: INode | null,
+	node: Pick<INode, 'typeVersion'> | null,
 ) {
 	let resolvedNodeValues = nodeValues;
 	if (path !== '') {
@@ -399,7 +421,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;
@@ -407,11 +429,16 @@ 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) {
@@ -513,7 +540,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.',
 			);
 		}
@@ -537,10 +564,10 @@ export function getParameterResolveOrder(
  */
 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,
@@ -587,16 +614,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;
@@ -755,9 +783,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!;
@@ -885,7 +913,6 @@ export function getNodeWebhooks(
 			node,
 			webhookDescription.path,
 			mode,
-			additionalData.timezone,
 			{},
 		);
 		if (nodeWebhookPath === undefined) {
@@ -909,7 +936,6 @@ export function getNodeWebhooks(
 			node,
 			webhookDescription.isFullPath,
 			'internal',
-			additionalData.timezone,
 			{},
 			undefined,
 			false,
@@ -918,7 +944,6 @@ export function getNodeWebhooks(
 			node,
 			webhookDescription.restartWebhook,
 			'internal',
-			additionalData.timezone,
 			{},
 			undefined,
 			false,
@@ -929,7 +954,6 @@ export function getNodeWebhooks(
 			node,
 			webhookDescription.httpMethod,
 			mode,
-			additionalData.timezone,
 			{},
 			undefined,
 			'GET',
@@ -1037,11 +1061,12 @@ export function getNodeInputs(
 			node,
 			nodeTypeData.inputs,
 			'internal',
-			'',
 			{},
 		) || []) as ConnectionTypes[];
 	} catch (e) {
-		throw new Error(`Could not calculate inputs dynamically for node "${node.name}"`);
+		throw new ApplicationError('Could not calculate inputs dynamically for node', {
+			extra: { nodeName: node.name },
+		});
 	}
 }
 
@@ -1050,22 +1075,50 @@ export function getNodeOutputs(
 	node: INode,
 	nodeTypeData: INodeTypeDescription,
 ): Array<ConnectionTypes | INodeOutputConfiguration> {
+	let outputs: Array<ConnectionTypes | INodeOutputConfiguration> = [];
+
 	if (Array.isArray(nodeTypeData.outputs)) {
-		return nodeTypeData.outputs;
+		outputs = nodeTypeData.outputs;
+	} else {
+		// Calculate the outputs dynamically
+		try {
+			outputs = (workflow.expression.getSimpleParameterValue(
+				node,
+				nodeTypeData.outputs,
+				'internal',
+				{},
+			) || []) as ConnectionTypes[];
+		} catch (e) {
+			throw new ApplicationError('Could not calculate outputs dynamically for node', {
+				extra: { nodeName: node.name },
+			});
+		}
 	}
 
-	// Calculate the outputs dynamically
-	try {
-		return (workflow.expression.getSimpleParameterValue(
-			node,
-			nodeTypeData.outputs,
-			'internal',
-			'',
-			{},
-		) || []) as ConnectionTypes[];
-	} catch (e) {
-		throw new Error(`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;
 }
 
 /**
@@ -1137,186 +1190,6 @@ export function nodeIssuesToString(issues: INodeIssues, node?: INode): string[]
 	return nodeIssues;
 }
 
-// Validates field against the schema and tries to parse it to the correct type
-export const validateFieldType = (
-	fieldName: string,
-	value: unknown,
-	type: FieldType,
-	options?: INodePropertyOptions[],
-): ValidationResult => {
-	if (value === null || value === undefined) return { valid: true };
-	const defaultErrorMessage = `'${fieldName}' expects a ${type} but we got '${String(value)}'`;
-	switch (type.toLowerCase()) {
-		case 'number': {
-			try {
-				return { valid: true, newValue: tryToParseNumber(value) };
-			} catch (e) {
-				return { valid: false, errorMessage: defaultErrorMessage };
-			}
-		}
-		case 'boolean': {
-			try {
-				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 {
-				return { valid: true, newValue: tryToParseObject(value) };
-			} catch (e) {
-				return { valid: false, errorMessage: defaultErrorMessage };
-			}
-		}
-		case 'array': {
-			try {
-				return { valid: true, newValue: tryToParseArray(value) };
-			} catch (e) {
-				return { valid: false, errorMessage: defaultErrorMessage };
-			}
-		}
-		case 'options': {
-			const validOptions = options?.map((option) => option.value).join(', ') || '';
-			const isValidOption = options?.some((option) => option.value === value) || false;
-
-			if (!isValidOption) {
-				return {
-					valid: false,
-					errorMessage: `'${fieldName}' expects one of the following values: [${validOptions}] but we got '${String(
-						value,
-					)}'`,
-				};
-			}
-			return { valid: true, newValue: value };
-		}
-		default: {
-			return { valid: true, newValue: value };
-		}
-	}
-};
-
-export const tryToParseNumber = (value: unknown): number => {
-	const isValidNumber = !isNaN(Number(value));
-
-	if (!isValidNumber) {
-		throw new Error(`Could not parse '${String(value)}' to number.`);
-	}
-	return Number(value);
-};
-
-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 Error(`Could not parse '${String(value)}' to boolean.`);
-};
-
-export const tryToParseDateTime = (value: unknown): DateTime => {
-	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;
-	}
-
-	throw new Error(`The value "${dateString}" is not a valid date.`);
-};
-
-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 Error(`The value "${String(value)}" is not a valid time.`);
-	}
-	return String(value);
-};
-
-export const tryToParseArray = (value: unknown): unknown[] => {
-	try {
-		if (typeof value === 'object' && Array.isArray(value)) {
-			return value;
-		}
-
-		let parsed;
-		try {
-			parsed = JSON.parse(String(value));
-		} catch (e) {
-			parsed = JSON.parse(String(value).replace(/'/g, '"'));
-		}
-
-		if (!Array.isArray(parsed)) {
-			throw new Error(`The value "${String(value)}" is not a valid array.`);
-		}
-		return parsed;
-	} catch (e) {
-		throw new Error(`The value "${String(value)}" is not a valid array.`);
-	}
-};
-
-export const tryToParseObject = (value: unknown): object => {
-	if (value && typeof value === 'object' && !Array.isArray(value)) {
-		return value;
-	}
-	try {
-		const o = JSON.parse(String(value));
-		if (typeof o !== 'object' || Array.isArray(o)) {
-			throw new Error(`The value "${String(value)}" is not a valid object.`);
-		}
-		return o;
-	} catch (e) {
-		throw new Error(`The value "${String(value)}" is not a valid object.`);
-	}
-};
-
 /*
  * Validates resource locator node parameters based on validation ruled defined in each parameter mode
  *
@@ -1357,6 +1230,11 @@ export const validateResourceMapperParameter = (
 	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';
@@ -1372,7 +1250,9 @@ export const validateResourceMapperParameter = (
 			}
 		}
 		if (!fieldValue?.toString().startsWith('=') && field.type) {
-			const validationResult = validateFieldType(field.id, fieldValue, field.type, field.options);
+			const validationResult = validateFieldType(field.id, fieldValue, field.type, {
+				valueOptions: field.options,
+			});
 			if (!validationResult.valid && validationResult.errorMessage) {
 				fieldErrors.push(validationResult.errorMessage);
 			}
@@ -1393,12 +1273,9 @@ export const validateParameter = (
 	const options = type === 'options' ? nodeProperties.options : undefined;
 
 	if (!value?.toString().startsWith('=')) {
-		const validationResult = validateFieldType(
-			nodeName,
-			value,
-			type,
-			options as INodePropertyOptions[],
-		);
+		const validationResult = validateFieldType(nodeName, value, type, {
+			valueOptions: options as INodePropertyOptions[],
+		});
 
 		if (!validationResult.valid && validationResult.errorMessage) {
 			return validationResult.errorMessage;
@@ -1532,6 +1409,14 @@ export function getParameterIssues(
 				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);
@@ -1712,10 +1597,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 0000000000..9f8423f75b
--- /dev/null
+++ b/packages/workflow/src/NodeParameters/FilterParameter.ts
@@ -0,0 +1,345 @@
+import type { DateTime } from 'luxon';
+import type {
+	FilterConditionValue,
+	FilterOperatorType,
+	FilterOptionsValue,
+	FilterValue,
+	INodeProperties,
+	ValidationResult,
+} from '../Interfaces';
+import { validateFieldType } from '../TypeValidation';
+import * as LoggerProxy from '../LoggerProxy';
+
+type Result<T, E> = { ok: true; result: T } | { ok: false; error: E };
+
+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 {
+	return type === 'any' || value === null || value === undefined || value === ''
+		? ({ valid: true, newValue: value } as ValidationResult)
+		: validateFieldType('filter', value, type, { strict, parseStrings: true });
+}
+
+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 errorDescription = 'Try to change the operator, or change the type with an expression';
+	const inCondition = errorFormat === 'full' ? ` in condition ${index + 1} ` : ' ';
+	const itemSuffix = `[item ${itemIndex}]`;
+
+	if (!leftValid && !rightValid) {
+		const providedValues = 'The provided values';
+		let types = `'${operator.type}'`;
+		if (rightType !== operator.type) {
+			types = `'${operator.type}' and '${rightType}' respectively`;
+		}
+		if (strict) {
+			return {
+				ok: false,
+				error: new FilterError(
+					`${providedValues} '${leftValueString}' and '${rightValueString}'${inCondition}are not of the expected type ${types} ${itemSuffix}`,
+					errorDescription,
+				),
+			};
+		}
+
+		return {
+			ok: false,
+			error: new FilterError(
+				`${providedValues} '${leftValueString}' and '${rightValueString}'${inCondition}cannot be converted to the expected type ${types} ${itemSuffix}`,
+				errorDescription,
+			),
+		};
+	}
+
+	const composeInvalidTypeMessage = (field: 'left' | 'right', type: string, value: string) => {
+		const fieldNumber = field === 'left' ? 1 : 2;
+
+		if (strict) {
+			return `The provided value ${fieldNumber} '${value}'${inCondition}is not of the expected type '${type}' ${itemSuffix}`;
+		}
+		return `The provided value ${fieldNumber} '${value}'${inCondition}cannot be converted to the expected type '${type}' ${itemSuffix}`;
+	};
+
+	if (!leftValid) {
+		return {
+			ok: false,
+			error: new FilterError(
+				composeInvalidTypeMessage('left', operator.type, leftValueString),
+				errorDescription,
+			),
+		};
+	}
+
+	if (!rightValid) {
+		return {
+			ok: false,
+			error: new FilterError(
+				composeInvalidTypeMessage('right', rightType, rightValueString),
+				errorDescription,
+			),
+		};
+	}
+
+	return { ok: true, result: { left: parsedLeftValue.newValue, right: parsedRightValue.newValue } };
+}
+
+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 '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 new RegExp(right).test(left);
+				case 'notRegex':
+					return !new RegExp(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/RoutingNode.ts b/packages/workflow/src/RoutingNode.ts
index 4253a0d19a..0a635d06bf 100644
--- a/packages/workflow/src/RoutingNode.ts
+++ b/packages/workflow/src/RoutingNode.ts
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-unsafe-call */
 /* eslint-disable @typescript-eslint/no-unsafe-argument */
 
 /* eslint-disable @typescript-eslint/prefer-nullish-coalescing */
@@ -35,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;
@@ -77,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[] = [];
@@ -87,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,
@@ -97,6 +106,8 @@ export class RoutingNode {
 			this.additionalData,
 			executeData,
 			this.mode,
+			closeFunctions,
+			abortSignal,
 		);
 
 		let credentials: ICredentialDataDecryptedObject | undefined;
@@ -121,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,
@@ -133,6 +145,7 @@ export class RoutingNode {
 					this.additionalData,
 					executeData,
 					this.mode,
+					abortSignal,
 				);
 				const requestData: DeclarativeRestApiSettings.ResultOptions = {
 					options: {
@@ -209,17 +222,30 @@ 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 NodeError });
 					continue;
 				}
-				if (error instanceof NodeApiError) error = error.cause;
-				throw new NodeApiError(this.node, error, {
+
+				interface AxiosError extends NodeError {
+					isAxiosError: boolean;
+					description: string | undefined;
+					response?: { status: number };
+				}
+
+				let routingError = error as AxiosError;
+
+				if (error instanceof NodeApiError && error.cause) routingError = error.cause as AxiosError;
+
+				throw new NodeApiError(this.node, error as JsonObject, {
 					runIndex,
 					itemIndex: i,
-					message: error?.message,
-					description: error?.description,
-					httpCode: error.isAxiosError && error.response && String(error.response?.status),
+					message: routingError?.message,
+					description: routingError?.description,
+					httpCode:
+						routingError.isAxiosError && routingError.response
+							? String(routingError.response?.status)
+							: 'none',
 				});
 			}
 		}
@@ -275,7 +301,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.`,
@@ -701,7 +727,6 @@ export class RoutingNode {
 				this.node.name,
 				this.connectionInputData,
 				this.mode,
-				this.additionalData.timezone,
 				additionalKeys ?? {},
 				executeData,
 				returnObjectAsString,
diff --git a/packages/workflow/src/TelemetryHelpers.ts b/packages/workflow/src/TelemetryHelpers.ts
index 29c1c28761..e4c5ed30f4 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,8 +8,8 @@ import type {
 	INodesGraphResult,
 	IWorkflowBase,
 	INodeTypes,
-	INodeType,
 } from './Interfaces';
+import { ApplicationError } from './errors/application.error';
 
 const STICKY_NODE_TYPE = 'n8n-nodes-base.stickyNote';
 
@@ -20,28 +21,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 +74,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 +90,152 @@ 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 };
 	},
 ): 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);
+	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);
+	notes.forEach((stickyNote: INode, index: number) => {
+		const stickyType = nodeTypes.getByNameAndVersion(STICKY_NODE_TYPE, stickyNote.typeVersion);
+		if (!stickyType) {
+			return;
+		}
 
-			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,
-			};
-		});
+		const nodeParameters =
+			getNodeParameters(
+				stickyType.description.properties,
+				stickyNote.parameters,
+				true,
+				false,
+				stickyNote,
+			) ?? {};
 
-		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 height: number = typeof nodeParameters.height === 'number' ? nodeParameters.height : 0;
+		const width: number = typeof nodeParameters.width === 'number' ? nodeParameters.width : 0;
 
-			if (options?.sourceInstanceId) {
-				nodeItem.src_instance_id = options.sourceInstanceId;
-			}
+		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,
+		};
+	});
 
-			if (node.id && options?.nodeIdMap?.[node.id]) {
-				nodeItem.src_node_id = options.nodeIdMap[node.id];
-			}
-
-			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);
-				}
-			} 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;
-					}
-				});
-
-				nodeItem.operation = node.parameters.operation?.toString() ?? nodeItem.operation;
-				nodeItem.resource = node.parameters.resource?.toString() ?? nodeItem.resource;
-				nodeItem.mode = node.parameters.mode?.toString() ?? nodeItem.mode;
-			}
-			nodesGraph.nodes[`${index}`] = nodeItem;
-			nodeNameAndIndex[node.name] = index.toString();
-		});
-
-		const getGraphConnectionItem = (startNode: string, connectionItem: IConnection) => {
-			return { start: nodeNameAndIndex[startNode], end: nodeNameAndIndex[connectionItem.node] };
+	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,
 		};
 
-		Object.keys(workflow.connections).forEach((nodeName) => {
-			const connections = workflow.connections[nodeName];
-			connections.main.forEach((element) => {
+		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 === '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);
+			}
+		} else if (node.type === 'n8n-nodes-base.httpRequest' && 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 === 'n8n-nodes-base.webhook') {
+			webhookNodeNames.push(node.name);
+		} else {
+			try {
+				const nodeType = nodeTypes.getByNameAndVersion(node.type);
+				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;
+				}
+			}
+		}
+
+		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) => {
-					nodesGraph.node_connections.push(getGraphConnectionItem(nodeName, 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 0000000000..fb71825e93
--- /dev/null
+++ b/packages/workflow/src/TypeValidation.ts
@@ -0,0 +1,252 @@
+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 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 => {
+	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;
+	}
+
+	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);
+};
+
+type ValidateFieldTypeOptions = Partial<{
+	valueOptions: INodePropertyOptions[];
+	strict: boolean;
+	parseStrings: boolean;
+}>;
+// Validates field against the schema and tries to parse it to the correct type
+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 '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 };
+			}
+		}
+		default: {
+			return { valid: true, newValue: value };
+		}
+	}
+};
diff --git a/packages/workflow/src/Workflow.ts b/packages/workflow/src/Workflow.ts
index d4f228c8e8..c5d6cb91dd 100644
--- a/packages/workflow/src/Workflow.ts
+++ b/packages/workflow/src/Workflow.ts
@@ -42,6 +42,7 @@ import type {
 	IRunNodeResponse,
 	NodeParameterValueType,
 	ConnectionTypes,
+	CloseFunction,
 } from './Interfaces';
 import { Node } from './Interfaces';
 import type { IDeferredPromise } from './DeferredPromise';
@@ -51,6 +52,7 @@ import * as ObservableObject from './ObservableObject';
 import { RoutingNode } from './RoutingNode';
 import { Expression } from './Expression';
 import { NODES_WITH_RENAMABLE_CONTENT } from './Constants';
+import { ApplicationError } from './errors/application.error';
 
 function dedupe<T>(arr: T[]): T[] {
 	return [...new Set(arr)];
@@ -93,7 +95,7 @@ export class Workflow {
 		settings?: IWorkflowSettings;
 		pinData?: IPinData;
 	}) {
-		this.id = parameters.id as string;
+		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;
@@ -113,7 +115,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
@@ -312,15 +317,15 @@ 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.staticData[key] === undefined) {
@@ -934,6 +939,11 @@ export class Workflow {
 
 			nodeType = this.nodeTypes.getByNameAndVersion(node.type, node.typeVersion);
 
+			// TODO: Identify later differently
+			if (nodeType.description.name === '@n8n/n8n-nodes-langchain.manualChatTrigger') {
+				continue;
+			}
+
 			if (nodeType && (nodeType.trigger !== undefined || nodeType.poll !== undefined)) {
 				if (node.disabled === true) {
 					continue;
@@ -1000,7 +1010,6 @@ export class Workflow {
 		nodeExecuteFunctions: INodeExecuteFunctions,
 		mode: WorkflowExecuteMode,
 		activation: WorkflowActivateMode,
-		isTest?: boolean,
 	): Promise<void> {
 		const webhookExists = await this.runWebhookMethod(
 			'checkExists',
@@ -1008,18 +1017,10 @@ export class Workflow {
 			nodeExecuteFunctions,
 			mode,
 			activation,
-			isTest,
 		);
 		if (!webhookExists) {
 			// If webhook does not exist yet create it
-			await this.runWebhookMethod(
-				'create',
-				webhookData,
-				nodeExecuteFunctions,
-				mode,
-				activation,
-				isTest,
-			);
+			await this.runWebhookMethod('create', webhookData, nodeExecuteFunctions, mode, activation);
 		}
 	}
 
@@ -1028,16 +1029,8 @@ export class Workflow {
 		nodeExecuteFunctions: INodeExecuteFunctions,
 		mode: WorkflowExecuteMode,
 		activation: WorkflowActivateMode,
-		isTest?: boolean,
 	) {
-		await this.runWebhookMethod(
-			'delete',
-			webhookData,
-			nodeExecuteFunctions,
-			mode,
-			activation,
-			isTest,
-		);
+		await this.runWebhookMethod('delete', webhookData, nodeExecuteFunctions, mode, activation);
 	}
 
 	private async runWebhookMethod(
@@ -1046,9 +1039,11 @@ export class Workflow {
 		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];
@@ -1060,7 +1055,6 @@ export class Workflow {
 			webhookData.workflowExecuteAdditionalData,
 			mode,
 			activation,
-			isTest,
 			webhookData,
 		);
 
@@ -1084,13 +1078,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') {
@@ -1161,13 +1159,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.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);
@@ -1187,17 +1189,24 @@ 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 closeFunctions: CloseFunction[] = [];
+
 		const context = nodeExecuteFunctions.getExecuteWebhookFunctions(
 			this,
 			node,
 			additionalData,
 			mode,
 			webhookData,
+			closeFunctions,
 		);
 		return nodeType instanceof Node ? nodeType.webhook(context) : nodeType.webhook.call(context);
 	}
@@ -1213,6 +1222,7 @@ export class Workflow {
 		additionalData: IWorkflowExecuteAdditionalData,
 		nodeExecuteFunctions: INodeExecuteFunctions,
 		mode: WorkflowExecuteMode,
+		abortSignal?: AbortSignal,
 	): Promise<IRunNodeResponse> {
 		const { node } = executionData;
 		let inputData = executionData.data;
@@ -1232,7 +1242,9 @@ 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[] = [];
@@ -1290,6 +1302,7 @@ export class Workflow {
 		}
 
 		if (nodeType.execute) {
+			const closeFunctions: CloseFunction[] = [];
 			const context = nodeExecuteFunctions.getExecuteFunctions(
 				this,
 				runExecutionData,
@@ -1300,11 +1313,31 @@ 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) => fn()),
+			);
+
+			const closingErrors = closeFunctionsResults
+				.filter((result): result is PromiseRejectedResult => result.status === 'rejected')
+				.map((result) => result.reason);
+
+			if (closingErrors.length > 0) {
+				if (closingErrors[0] instanceof Error) throw closingErrors[0];
+				throw new ApplicationError("Error on execution node's close function(s)", {
+					extra: { nodeName: node.name },
+					tags: { nodeType: node.type },
+					cause: closingErrors,
+				});
+			}
+
 			return { data };
 		} else if (nodeType.poll) {
 			if (mode === 'manual') {
@@ -1382,6 +1415,8 @@ export class Workflow {
 					nodeType,
 					executionData,
 					nodeExecuteFunctions,
+					undefined,
+					abortSignal,
 				),
 			};
 		}
diff --git a/packages/workflow/src/WorkflowActivationError.ts b/packages/workflow/src/WorkflowActivationError.ts
deleted file mode 100644
index d9a7943a99..0000000000
--- a/packages/workflow/src/WorkflowActivationError.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import type { INode } from './Interfaces';
-import { ExecutionBaseError, type Severity } from './NodeErrors';
-
-interface WorkflowActivationErrorOptions {
-	cause?: Error;
-	node?: INode;
-	severity?: Severity;
-}
-
-/**
- * Class for instantiating an workflow activation error
- */
-export class WorkflowActivationError extends ExecutionBaseError {
-	node: INode | undefined;
-
-	constructor(message: string, { cause, node, severity }: 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;
-		if (severity) this.severity = severity;
-	}
-}
-
-export class WebhookPathAlreadyTakenError 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.`,
-			{ severity: 'warning', cause },
-		);
-	}
-}
diff --git a/packages/workflow/src/WorkflowDataProxy.ts b/packages/workflow/src/WorkflowDataProxy.ts
index 629d34c1d2..96c77452a2 100644
--- a/packages/workflow/src/WorkflowDataProxy.ts
+++ b/packages/workflow/src/WorkflowDataProxy.ts
@@ -24,10 +24,12 @@ import type {
 	ProxyInput,
 } from './Interfaces';
 import * as NodeHelpers from './NodeHelpers';
-import { ExpressionError } from './ExpressionError';
+import { ExpressionError } 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';
 
 export function isResourceLocatorValue(value: unknown): value is INodeParameterResourceLocator {
 	return Boolean(
@@ -48,57 +50,28 @@ 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 contextNodeName: 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 = {},
-		contextNodeName?: string,
+		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.contextNodeName = contextNodeName || activeNodeName;
-		this.workflow = workflow;
-
 		this.runExecutionData = isScriptingNode(this.contextNodeName, workflow)
 			? runExecutionData !== null
 				? augmentObject(runExecutionData)
@@ -109,16 +82,7 @@ export class WorkflowDataProxy {
 			? 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;
 	}
 
@@ -227,7 +191,9 @@ export class WorkflowDataProxy {
 				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 {
@@ -266,7 +232,6 @@ export class WorkflowDataProxy {
 						that.activeNodeName,
 						that.connectionInputData,
 						that.mode,
-						that.timezone,
 						that.additionalKeys,
 						that.executeData,
 						false,
@@ -338,8 +303,8 @@ export class WorkflowDataProxy {
 			const taskData = that.runExecutionData.resultData.runData[nodeName][runIndex].data!;
 
 			if (!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.', {
+				// 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,
 				});
@@ -803,7 +768,7 @@ export class WorkflowDataProxy {
 								if (itemInput >= taskData.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);
@@ -1185,7 +1150,6 @@ export class WorkflowDataProxy {
 					that.activeNodeName,
 					that.connectionInputData,
 					that.mode,
-					that.timezone,
 					that.additionalKeys,
 					that.executeData,
 					false,
@@ -1204,10 +1168,10 @@ export class WorkflowDataProxy {
 					this.connectionInputData,
 					that.siblingParameters,
 					that.mode,
-					that.defaultTimezone,
 					that.additionalKeys,
 					that.executeData,
 					defaultReturnRunIndex,
+					{},
 					that.contextNodeName,
 				);
 				return dataProxy.getDataProxy();
@@ -1250,6 +1214,7 @@ export class WorkflowDataProxy {
 			// eslint-disable-next-line @typescript-eslint/naming-convention
 			Duration,
 			...that.additionalKeys,
+			$getPairedItem: getPairedItem,
 
 			// deprecated
 			$jmespath: jmespathWrapper,
diff --git a/packages/workflow/src/WorkflowErrors.ts b/packages/workflow/src/WorkflowErrors.ts
deleted file mode 100644
index 79ab34f715..0000000000
--- a/packages/workflow/src/WorkflowErrors.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import type { INode } from './Interfaces';
-import { ExecutionBaseError } from './NodeErrors';
-
-/**
- * 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) {
-		super(message, { cause: undefined });
-		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/errors/abstract/execution-base.error.ts b/packages/workflow/src/errors/abstract/execution-base.error.ts
new file mode 100644
index 0000000000..2e8bb265cb
--- /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 } from '../application.error';
+
+interface ExecutionBaseErrorOptions {
+	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, { cause, errorResponse }: 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;
+		}
+
+		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 0000000000..6b22e71ada
--- /dev/null
+++ b/packages/workflow/src/errors/abstract/node.error.ts
@@ -0,0 +1,172 @@
+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 {
+	node: INode;
+
+	constructor(node: INode, error: Error | JsonObject) {
+		if (error instanceof Error) {
+			super(error.message, { cause: error });
+		} else {
+			super('', { errorResponse: 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 {
+		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;
+	}
+
+	/**
+	 * 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,
+		description: string | undefined | null,
+		code?: string | null,
+		messageMapping?: { [key: string]: string },
+	) {
+		let newMessage = message;
+		let newDescription = description as string;
+
+		if (messageMapping) {
+			for (const [mapKey, mapMessage] of Object.entries(messageMapping)) {
+				if ((message || '').toUpperCase().includes(mapKey.toUpperCase())) {
+					newMessage = mapMessage;
+					newDescription = this.updateDescription(message, description);
+					break;
+				}
+			}
+			if (newMessage !== message) {
+				return [newMessage, newDescription];
+			}
+		}
+
+		// 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;
+			newDescription = this.updateDescription(message, description);
+			return [newMessage, newDescription];
+		}
+
+		// 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;
+				newDescription = this.updateDescription(message, description);
+				break;
+			}
+		}
+
+		return [newMessage, newDescription];
+	}
+
+	protected updateDescription(message: string, description: string | undefined | null) {
+		return `${message}${description ? ` - ${description}` : ''}`;
+	}
+}
diff --git a/packages/workflow/src/errors/application.error.ts b/packages/workflow/src/errors/application.error.ts
new file mode 100644
index 0000000000..e48ae91bee
--- /dev/null
+++ b/packages/workflow/src/errors/application.error.ts
@@ -0,0 +1,35 @@
+import callsites from 'callsites';
+import type { Event } from '@sentry/node';
+
+type Level = 'warning' | 'error' | 'fatal' | 'info';
+
+export type ReportingOptions = {
+	level?: Level;
+} & Pick<Event, 'tags' | 'extra'>;
+
+export class ApplicationError extends Error {
+	level: Level;
+
+	readonly tags?: 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 0000000000..59236957c6
--- /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/expression-extension.error.ts b/packages/workflow/src/errors/expression-extension.error.ts
new file mode 100644
index 0000000000..f5f60b3c2e
--- /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/ExpressionError.ts b/packages/workflow/src/errors/expression.error.ts
similarity index 85%
rename from packages/workflow/src/ExpressionError.ts
rename to packages/workflow/src/errors/expression.error.ts
index 7e06065424..1b647018a8 100644
--- a/packages/workflow/src/ExpressionError.ts
+++ b/packages/workflow/src/errors/expression.error.ts
@@ -1,5 +1,5 @@
-import type { IDataObject } from './Interfaces';
-import { ExecutionBaseError } from './NodeErrors';
+import type { IDataObject } from '../Interfaces';
+import { ExecutionBaseError } from './abstract/execution-base.error';
 
 /**
  * Class for instantiating an expression error
@@ -47,5 +47,3 @@ export class ExpressionError extends ExecutionBaseError {
 		}
 	}
 }
-
-export class ExpressionExtensionError extends ExpressionError {}
diff --git a/packages/workflow/src/errors/index.ts b/packages/workflow/src/errors/index.ts
new file mode 100644
index 0000000000..8cf0b8de0c
--- /dev/null
+++ b/packages/workflow/src/errors/index.ts
@@ -0,0 +1,15 @@
+export { ApplicationError } from './application.error';
+export { ExpressionError } from './expression.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 { 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 0000000000..c1dc5c86b0
--- /dev/null
+++ b/packages/workflow/src/errors/node-api.error.ts
@@ -0,0 +1,283 @@
+/* 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';
+
+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;
+}
+
+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?',
+};
+
+const UNKNOWN_ERROR_MESSAGE = 'UNKNOWN ERROR - check the detailed error for more information';
+const UNKNOWN_ERROR_MESSAGE_CRED = 'UNKNOWN ERROR';
+
+/**
+ * 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,
+		errorResponse: JsonObject,
+		{
+			message,
+			description,
+			httpCode,
+			parseXml,
+			runIndex,
+			itemIndex,
+			level,
+			functionality,
+			messageMapping,
+		}: NodeApiErrorOptions = {},
+	) {
+		super(node, errorResponse);
+
+		// 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 {
+			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';
+		}
+
+		// 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 or set default message based on http code
+		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.description] = this.setDescriptiveErrorMessage(
+			this.message,
+			this.description,
+			// 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;
+			// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+			this.message = this.message || this.description || UNKNOWN_ERROR_MESSAGE;
+			return;
+		}
+
+		if (STATUS_CODE_MESSAGES[this.httpCode]) {
+			this.description = this.updateDescription(this.message, this.description);
+			this.message = STATUS_CODE_MESSAGES[this.httpCode];
+			return;
+		}
+
+		switch (this.httpCode.charAt(0)) {
+			case '4':
+				this.description = this.updateDescription(this.message, this.description);
+				this.message = STATUS_CODE_MESSAGES['4XX'];
+				break;
+			case '5':
+				this.description = this.updateDescription(this.message, this.description);
+				this.message = STATUS_CODE_MESSAGES['5XX'];
+				break;
+			default:
+				// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+				this.message = this.message || this.description || 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/errors/node-operation.error.ts b/packages/workflow/src/errors/node-operation.error.ts
new file mode 100644
index 0000000000..2db531510a
--- /dev/null
+++ b/packages/workflow/src/errors/node-operation.error.ts
@@ -0,0 +1,39 @@
+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;
+
+	constructor(
+		node: INode,
+		error: Error | string | JsonObject,
+		options: NodeOperationErrorOptions = {},
+	) {
+		if (typeof error === 'string') {
+			error = new Error(error);
+		}
+		super(node, error);
+
+		if (options.message) this.message = options.message;
+		if (options.level) this.level = options.level;
+		if (options.functionality) this.functionality = options.functionality;
+		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.description] = this.setDescriptiveErrorMessage(
+			this.message,
+			this.description,
+			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 0000000000..2a16a20f1a
--- /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 0000000000..7bf2bf385c
--- /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/webhook-taken.error.ts b/packages/workflow/src/errors/webhook-taken.error.ts
new file mode 100644
index 0000000000..091094ade5
--- /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 0000000000..16e68effda
--- /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 0000000000..275544fd2b
--- /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 0000000000..25b47e149c
--- /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 ddc41baca4..e3fc71cb0c 100644
--- a/packages/workflow/src/index.ts
+++ b/packages/workflow/src/index.ts
@@ -5,30 +5,30 @@ 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 {
 	isObjectEmpty,
 	deepCopy,
 	jsonParse,
 	jsonStringify,
+	replaceCircularReferences,
 	sleep,
 	fileTypeFromMimeType,
 	assert,
@@ -42,11 +42,13 @@ export {
 	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, NativeDoc } from './Extensions';
 
diff --git a/packages/workflow/src/type-guards.ts b/packages/workflow/src/type-guards.ts
index 6e3fb9ab12..2e3bc7fb3d 100644
--- a/packages/workflow/src/type-guards.ts
+++ b/packages/workflow/src/type-guards.ts
@@ -4,6 +4,7 @@ import type {
 	INodePropertyCollection,
 	INodeParameterResourceLocator,
 	ResourceMapperValue,
+	FilterValue,
 } from './Interfaces';
 
 export const isINodeProperties = (
@@ -54,3 +55,9 @@ export const isResourceMapperValue = (value: unknown): value is ResourceMapperVa
 		'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/utils.ts b/packages/workflow/src/utils.ts
index 790903c1b7..e5c56d8caa 100644
--- a/packages/workflow/src/utils.ts
+++ b/packages/workflow/src/utils.ts
@@ -1,5 +1,6 @@
 import FormData from 'form-data';
 import type { BinaryFileType, JsonObject } from './Interfaces';
+import { ApplicationError } from './errors/application.error';
 
 const readStreamClasses = new Set(['ReadStream', 'Readable', 'ReadableStream']);
 
@@ -77,7 +78,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;
@@ -88,7 +89,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;
diff --git a/packages/workflow/test/Expression.test.ts b/packages/workflow/test/Expression.test.ts
index c38032b001..a224f9f8dd 100644
--- a/packages/workflow/test/Expression.test.ts
+++ b/packages/workflow/test/Expression.test.ts
@@ -3,14 +3,13 @@
  */
 
 import { DateTime, Duration, Interval } from 'luxon';
-import { Expression } from '@/Expression';
 import { Workflow } from '@/Workflow';
 import * as Helpers from './Helpers';
 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 '@/ExpressionError';
+import { ExpressionError } from '@/errors/expression.error';
 import { setDifferEnabled, setEvaluator } from '@/ExpressionEvaluatorProxy';
 
 setDifferEnabled(true);
@@ -21,6 +20,7 @@ for (const evaluator of ['tmpl', 'tournament'] as const) {
 		describe('getParameterValue()', () => {
 			const nodeTypes = Helpers.NodeTypes();
 			const workflow = new Workflow({
+				id: '1',
 				nodes: [
 					{
 						name: 'node',
@@ -35,10 +35,10 @@ for (const evaluator of ['tmpl', 'tournament'] as const) {
 				active: false,
 				nodeTypes,
 			});
-			const expression = new Expression(workflow);
+			const expression = workflow.expression;
 
 			const evaluate = (value: string) =>
-				expression.getParameterValue(value, null, 0, 0, 'node', [], 'manual', '', {});
+				expression.getParameterValue(value, null, 0, 0, 'node', [], 'manual', {});
 
 			it('should not be able to use global built-ins from denylist', () => {
 				expect(evaluate('={{document}}')).toEqual({});
@@ -84,9 +84,13 @@ for (const evaluator of ['tmpl', 'tournament'] as const) {
 				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());
@@ -170,6 +174,7 @@ for (const evaluator of ['tmpl', 'tournament'] as const) {
 		describe('Test all expression value fixtures', () => {
 			const nodeTypes = Helpers.NodeTypes();
 			const workflow = new Workflow({
+				id: '1',
 				nodes: [
 					{
 						name: 'node',
@@ -185,21 +190,11 @@ for (const evaluator of ['tmpl', 'tournament'] as const) {
 				nodeTypes,
 			});
 
-			const expression = new Expression(workflow);
+			const expression = workflow.expression;
 
 			const evaluate = (value: string, data: INodeExecutionData[]) => {
 				const itemIndex = data.length === 0 ? -1 : 0;
-				return expression.getParameterValue(
-					value,
-					null,
-					0,
-					itemIndex,
-					'node',
-					data,
-					'manual',
-					'',
-					{},
-				);
+				return expression.getParameterValue(value, null, 0, itemIndex, 'node', data, 'manual', {});
 			};
 
 			for (const t of baseFixtures) {
diff --git a/packages/workflow/test/ExpressionExtensions/DateExtensions.test.ts b/packages/workflow/test/ExpressionExtensions/DateExtensions.test.ts
index 7c18a0b709..9e914bf93f 100644
--- a/packages/workflow/test/ExpressionExtensions/DateExtensions.test.ts
+++ b/packages/workflow/test/ExpressionExtensions/DateExtensions.test.ts
@@ -3,7 +3,10 @@
  */
 
 import { DateTime } from 'luxon';
-import { evaluate, getLocalISOString, TEST_TIMEZONE } from './Helpers';
+import { getGlobalState } from '@/GlobalState';
+import { evaluate, getLocalISOString } from './Helpers';
+
+const { defaultTimezone } = getGlobalState();
 
 describe('Data Transformation Functions', () => {
 	describe('Date Data Transformation Functions', () => {
@@ -16,17 +19,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 }),
+				DateTime.local(2023, 1, 16, { zone: defaultTimezone }),
 			);
 
 			expect(evaluate('={{ new Date(2023, 0, 20).beginningOf("week") }}')).toEqual(
-				DateTime.local(2023, 1, 16, { zone: TEST_TIMEZONE }).toJSDate(),
+				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());
@@ -35,7 +38,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());
@@ -44,7 +47,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());
@@ -53,10 +56,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 }),
+				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: TEST_TIMEZONE }).toJSDate(),
+				DateTime.local(2023, 1, 31, 23, 59, 59, 999, { zone: defaultTimezone }).toJSDate(),
 			);
 		});
 
diff --git a/packages/workflow/test/ExpressionExtensions/ExpressionExtension.test.ts b/packages/workflow/test/ExpressionExtensions/ExpressionExtension.test.ts
index cfc825fdae..2c2f8e391a 100644
--- a/packages/workflow/test/ExpressionExtensions/ExpressionExtension.test.ts
+++ b/packages/workflow/test/ExpressionExtensions/ExpressionExtension.test.ts
@@ -228,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 f742210040..54836960e5 100644
--- a/packages/workflow/test/ExpressionExtensions/Helpers.ts
+++ b/packages/workflow/test/ExpressionExtensions/Helpers.ts
@@ -1,10 +1,7 @@
 import type { IDataObject } from '@/Interfaces';
-import { Expression } from '@/Expression';
 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: [
@@ -20,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(
@@ -35,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/StringExtensions.test.ts b/packages/workflow/test/ExpressionExtensions/StringExtensions.test.ts
index ce67491ab2..16f298376f 100644
--- a/packages/workflow/test/ExpressionExtensions/StringExtensions.test.ts
+++ b/packages/workflow/test/ExpressionExtensions/StringExtensions.test.ts
@@ -1,8 +1,6 @@
 /**
  * @jest-environment jsdom
  */
-
-import { stringExtensions } from '@/Extensions/StringExtensions';
 import { evaluate } from './Helpers';
 
 describe('Data Transformation Functions', () => {
@@ -15,28 +13,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', () => {
diff --git a/packages/workflow/test/FilterParameter.test.ts b/packages/workflow/test/FilterParameter.test.ts
new file mode 100644
index 0000000000..6c725e2ed8
--- /dev/null
+++ b/packages/workflow/test/FilterParameter.test.ts
@@ -0,0 +1,1012 @@
+import { executeFilter } from '@/NodeParameters/FilterParameter';
+import type { FilterConditionValue, FilterValue } from '@/Interfaces';
+import merge from 'lodash/merge';
+
+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(
+						"The provided values '15' and 'true' in condition 1 are not of the expected type 'number' [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(
+						"The provided value 1 '[]' in condition 1 is not of the expected type 'array' [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(
+						"The provided value 1 '{}' in condition 1 is not of the expected type 'object' [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' },
+								},
+							],
+							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: 'boolean' },
+									},
+								],
+								options: { typeValidation: 'loose' },
+							}),
+						),
+					).toThrowError(
+						"The provided values 'a string' and '15' in condition 1 cannot be converted to the expected type 'boolean'",
+					);
+				});
+			});
+		});
+
+		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: '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 },
+				])('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 },
+				])('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 },
+				])('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: false },
+					{ left: null, expected: false },
+				])('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 c01b8269e4..37016d4a14 100644
--- a/packages/workflow/test/Helpers.ts
+++ b/packages/workflow/test/Helpers.ts
@@ -20,9 +20,6 @@ import type {
 	INodeExecutionData,
 	INodeParameters,
 	INodeType,
-	INodeTypeData,
-	INodeTypes,
-	IVersionedNodeType,
 	IRunExecutionData,
 	ITaskDataConnections,
 	IWorkflowBase,
@@ -37,6 +34,10 @@ 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';
 
 export interface INodeTypesObject {
 	[key: string]: INodeType;
@@ -53,14 +54,14 @@ export class Credentials extends ICredentials {
 
 	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);
 	}
 
 	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 {
@@ -127,20 +128,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;
@@ -153,7 +155,6 @@ export function getNodeParameter(
 			node.name,
 			connectionInputData,
 			mode,
-			timezone,
 			additionalKeys,
 		);
 	} catch (e) {
@@ -211,12 +212,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[];
@@ -240,7 +244,6 @@ export function getExecuteFunctions(
 					parameterName,
 					itemIndex,
 					mode,
-					additionalData.timezone,
 					{},
 					fallbackValue,
 				);
@@ -255,7 +258,7 @@ export function getExecuteFunctions(
 				return additionalData.restApiUrl;
 			},
 			getTimezone: (): string => {
-				return additionalData.timezone;
+				return workflow.settings.timezone ?? getGlobalState().defaultTimezone;
 			},
 			getExecuteData: (): IExecuteData => {
 				return executeData;
@@ -277,7 +280,6 @@ export function getExecuteFunctions(
 					connectionInputData,
 					{},
 					mode,
-					additionalData.timezone,
 					{},
 					executeData,
 				);
@@ -389,21 +391,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];
@@ -421,7 +425,7 @@ export function getExecuteSingleFunctions(
 				return additionalData.restApiUrl;
 			},
 			getTimezone: (): string => {
-				return additionalData.timezone;
+				return workflow.settings.timezone ?? getGlobalState().defaultTimezone;
 			},
 			getExecuteData: (): IExecuteData => {
 				return executeData;
@@ -444,7 +448,6 @@ export function getExecuteSingleFunctions(
 					parameterName,
 					itemIndex,
 					mode,
-					additionalData.timezone,
 					{},
 					fallbackValue,
 				);
@@ -466,7 +469,6 @@ export function getExecuteSingleFunctions(
 					connectionInputData,
 					{},
 					mode,
-					additionalData.timezone,
 					{},
 					executeData,
 				);
@@ -524,135 +526,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 {
@@ -679,7 +552,6 @@ export function WorkflowExecuteAdditionalData(): IWorkflowExecuteAdditionalData
 		executeWorkflow: async (workflowInfo: IExecuteWorkflowInfo): Promise<any> => {},
 		sendDataToUI: (message: string) => {},
 		restApiUrl: '',
-		timezone: 'America/New_York',
 		webhookBaseUrl: 'webhook',
 		webhookWaitingBaseUrl: 'webhook-waiting',
 		webhookTestBaseUrl: 'webhook-test',
diff --git a/packages/workflow/test/NodeErrors.test.ts b/packages/workflow/test/NodeErrors.test.ts
index 04b9abc8b8..547a8d0533 100644
--- a/packages/workflow/test/NodeErrors.test.ts
+++ b/packages/workflow/test/NodeErrors.test.ts
@@ -1,5 +1,6 @@
 import type { INode } from '@/Interfaces';
-import { NodeApiError, NodeOperationError } from '@/NodeErrors';
+import { NodeOperationError } from '@/errors';
+import { NodeApiError } from '@/errors/node-api.error';
 
 const node: INode = {
 	id: '1',
diff --git a/packages/workflow/test/NodeHelpers.test.ts b/packages/workflow/test/NodeHelpers.test.ts
index 0814bf40f0..a35dd9cd2e 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 0000000000..5b39d44dd1
--- /dev/null
+++ b/packages/workflow/test/NodeTypes.ts
@@ -0,0 +1,670 @@
+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)];
+		},
+	},
+};
+
+export class NodeTypes implements INodeTypes {
+	nodeTypes: INodeTypeData = {
+		'n8n-nodes-base.stickyNote': stickyNode,
+		'test.googleSheets': googleSheetsNode,
+		'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 {
+		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 a2ca525ba7..9496e84d6a 100644
--- a/packages/workflow/test/RoutingNode.test.ts
+++ b/packages/workflow/test/RoutingNode.test.ts
@@ -706,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 763d528d98..97015194ca 100644
--- a/packages/workflow/test/TelemetryHelpers.test.ts
+++ b/packages/workflow/test/TelemetryHelpers.test.ts
@@ -1,5 +1,12 @@
 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 type { IWorkflowBase } from '@/index';
+import { nodeTypes } from './ExpressionExtensions/Helpers';
 
 describe('getDomainBase should return protocol plus domain', () => {
 	test('in valid URLs', () => {
@@ -67,6 +74,697 @@ 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: [],
+		});
+	});
+});
+
 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
index 3561ff18ad..9c26105b34 100644
--- a/packages/workflow/test/TypeValidation.test.ts
+++ b/packages/workflow/test/TypeValidation.test.ts
@@ -1,4 +1,4 @@
-import { validateFieldType } from '@/NodeHelpers';
+import { validateFieldType } from '@/TypeValidation';
 import type { DateTime } from 'luxon';
 
 const VALID_ISO_DATES = [
@@ -174,16 +174,20 @@ describe('Type Validation', () => {
 
 	it('should validate options properly', () => {
 		expect(
-			validateFieldType('options', 'oranges', 'options', [
-				{ name: 'apples', value: 'apples' },
-				{ name: 'oranges', value: 'oranges' },
-			]).valid,
+			validateFieldType('options', 'oranges', 'options', {
+				valueOptions: [
+					{ name: 'apples', value: 'apples' },
+					{ name: 'oranges', value: 'oranges' },
+				],
+			}).valid,
 		).toEqual(true);
 		expect(
-			validateFieldType('options', 'something else', 'options', [
-				{ name: 'apples', value: 'apples' },
-				{ name: 'oranges', value: 'oranges' },
-			]).valid,
+			validateFieldType('options', 'something else', 'options', {
+				valueOptions: [
+					{ name: 'apples', value: 'apples' },
+					{ name: 'oranges', value: 'oranges' },
+				],
+			}).valid,
 		).toEqual(false);
 	});
 
@@ -202,4 +206,24 @@ describe('Type Validation', () => {
 		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 ad8ba4f290..5d00775cc2 100644
--- a/packages/workflow/test/Workflow.test.ts
+++ b/packages/workflow/test/Workflow.test.ts
@@ -1182,7 +1182,6 @@ describe('Workflow', () => {
 		];
 
 		const nodeTypes = Helpers.NodeTypes();
-		const timezone = 'America/New_York';
 
 		for (const testData of tests) {
 			test(testData.description, () => {
@@ -1310,7 +1309,6 @@ describe('Workflow', () => {
 						activeNodeName,
 						connectionInputData,
 						'manual',
-						timezone,
 						{},
 					);
 					expect(result).toEqual(testData.output[parameterName]);
@@ -1465,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 7123f86f9d..b681a80b06 100644
--- a/packages/workflow/test/WorkflowDataProxy.test.ts
+++ b/packages/workflow/test/WorkflowDataProxy.test.ts
@@ -2,7 +2,7 @@ import type { IConnections, IExecuteData, INode, IRunExecutionData } from '@/Int
 import { Workflow } from '@/Workflow';
 import { WorkflowDataProxy } from '@/WorkflowDataProxy';
 import * as Helpers from './Helpers';
-import { ExpressionError } from '@/ExpressionError';
+import { ExpressionError } from '@/errors/expression.error';
 
 describe('WorkflowDataProxy', () => {
 	describe('test data proxy', () => {
@@ -253,10 +253,9 @@ describe('WorkflowDataProxy', () => {
 			0,
 			0,
 			nameLastNode,
-			lastNodeConnectionInputData || [],
+			lastNodeConnectionInputData ?? [],
 			{},
 			'manual',
-			'America/New_York',
 			{},
 			executeData,
 		);
diff --git a/packages/workflow/test/utils.test.ts b/packages/workflow/test/utils.test.ts
index ce481d22cb..a0867f5517 100644
--- a/packages/workflow/test/utils.test.ts
+++ b/packages/workflow/test/utils.test.ts
@@ -1,3 +1,4 @@
+import { ApplicationError } from '@/errors/application.error';
 import { jsonParse, jsonStringify, deepCopy, isObjectEmpty, fileTypeFromMimeType } from '@/utils';
 
 describe('isObjectEmpty', () => {
@@ -58,7 +59,11 @@ describe('isObjectEmpty', () => {
 		const { calls } = keySpy.mock;
 
 		const assertCalls = (count: number) => {
-			if (calls.length !== count) throw new Error(`Object.keys was called ${calls.length} times`);
+			if (calls.length !== count) {
+				throw new ApplicationError('`Object.keys()` was called an unexpected number of times', {
+					extra: { times: calls.length },
+				});
+			}
 		};
 
 		assertCalls(0);
diff --git a/packages/workflow/tsconfig.json b/packages/workflow/tsconfig.json
index 8f02947053..cf7874454e 100644
--- a/packages/workflow/tsconfig.json
+++ b/packages/workflow/tsconfig.json
@@ -7,9 +7,7 @@
 		"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/typedi@0.10.0.patch b/patches/typedi@0.10.0.patch
index fcbd9d56d7..d9b4ab659c 100644
--- a/patches/typedi@0.10.0.patch
+++ b/patches/typedi@0.10.0.patch
@@ -1,20 +1,14 @@
 diff --git a/cjs/container-instance.class.js b/cjs/container-instance.class.js
-index e473b1e652aa0b6e7462f7ba93fcef2812483b20..1e406113d68c401ee170c997afb53e5f71edeee2 100644
+index e473b1e652aa0b6e7462f7ba93fcef2812483b20..9e57857e5584373b88a9fad3fbb37bbcc56b554a 100644
 --- a/cjs/container-instance.class.js
 +++ b/cjs/container-instance.class.js
-@@ -209,6 +209,7 @@ class ContainerInstance {
-             // this allows us to support javascript where we don't have decorators and emitted metadata about dependencies
-             // need to be injected, and user can use provided container to get instances he needs
-             params.push(this);
-+            if (process.env.NODE_ENV === 'production') Object.freeze(constructableTargetType.prototype);
-             value = new constructableTargetType(...params);
-             // TODO: Calling this here, leads to infinite loop, because @Inject decorator registerds a handler
-             // TODO: which calls Container.get, which will check if the requested type has a value set and if not
-@@ -234,6 +235,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/pnpm-lock.yaml b/pnpm-lock.yaml
index 342f6c71df..ccd855c9a5 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -11,16 +11,17 @@ overrides:
   '@types/node': ^18.16.16
   chokidar: 3.5.2
   jsonwebtoken: 9.0.0
-  prettier: ^3.0.3
+  prettier: ^3.1.0
   semver: ^7.5.4
   tough-cookie: ^4.1.3
   tslib: ^2.6.1
   tsconfig-paths: ^4.2.0
   ts-node: ^10.9.1
-  typescript: ^5.2.2
+  typescript: ^5.3.0
   xml2js: ^0.5.0
   cpy@8>globby: ^11.1.0
   qqjs>globby: ^11.1.0
+  '@langchain/core': ^0.1.8
 
 patchedDependencies:
   '@sentry/cli@2.17.0':
@@ -36,7 +37,7 @@ patchedDependencies:
     hash: kzcwsjcayy5m6iezu7r4tdimjq
     path: patches/pyodide@0.23.4.patch
   typedi@0.10.0:
-    hash: 62r6bc2crgimafeyruodhqlgo4
+    hash: sk6omkefrosihg7lmqbzh7vfxe
     path: patches/typedi@0.10.0.patch
 
 importers:
@@ -60,20 +61,20 @@ importers:
         specifier: ^2.0.12
         version: 2.0.12
       '@vitest/coverage-v8':
-        specifier: ^0.33.0
-        version: 0.33.0(vitest@0.33.0)
+        specifier: ^1.1.0
+        version: 1.1.0(vitest@1.1.0)
       cross-env:
         specifier: ^7.0.3
         version: 7.0.3
       cypress:
-        specifier: ^12.17.2
-        version: 12.17.2
+        specifier: ^13.6.2
+        version: 13.6.2
       cypress-otp:
         specifier: ^1.0.3
         version: 1.0.3
       cypress-real-events:
-        specifier: ^1.9.1
-        version: 1.9.1(cypress@12.17.2)
+        specifier: ^1.11.0
+        version: 1.11.0(cypress@13.6.2)
       jest:
         specifier: ^29.6.2
         version: 29.6.2
@@ -88,7 +89,7 @@ importers:
         version: 29.6.2
       jest-mock-extended:
         specifier: ^3.0.4
-        version: 3.0.4(jest@29.6.2)(typescript@5.2.2)
+        version: 3.0.4(jest@29.6.2)(typescript@5.3.2)
       nock:
         specifier: ^13.3.2
         version: 13.3.2
@@ -105,238 +106,413 @@ importers:
         specifier: ^1.0.7
         version: 1.1.6
       start-server-and-test:
-        specifier: ^2.0.0
-        version: 2.0.0
+        specifier: ^2.0.3
+        version: 2.0.3
       supertest:
         specifier: ^6.3.3
         version: 6.3.3
       ts-jest:
         specifier: ^29.1.1
-        version: 29.1.1(@babel/core@7.22.9)(jest@29.6.2)(typescript@5.2.2)
+        version: 29.1.1(@babel/core@7.22.9)(jest@29.6.2)(typescript@5.3.2)
       tsc-alias:
         specifier: ^1.8.7
         version: 1.8.7
       tsc-watch:
         specifier: ^6.0.4
-        version: 6.0.4(typescript@5.2.2)
+        version: 6.0.4(typescript@5.3.2)
       turbo:
         specifier: 1.10.12
         version: 1.10.12
       typescript:
-        specifier: ^5.2.2
-        version: 5.2.2
+        specifier: ^5.3.0
+        version: 5.3.2
       vite:
-        specifier: ^4.4.7
-        version: 4.4.7(less@4.1.3)(sass@1.64.1)
+        specifier: ^5.0.10
+        version: 5.0.10(sass@1.64.1)
       vitest:
-        specifier: ^0.33.0
-        version: 0.33.0
+        specifier: ^1.1.0
+        version: 1.1.0
       vue-tsc:
-        specifier: ^1.8.8
-        version: 1.8.8(typescript@5.2.2)
+        specifier: ^1.8.25
+        version: 1.8.25(typescript@5.3.2)
+
+  packages/@n8n/chat:
+    dependencies:
+      highlight.js:
+        specifier: ^11.8.0
+        version: 11.9.0
+      uuid:
+        specifier: ^8.3.2
+        version: 8.3.2
+      vue:
+        specifier: ^3.3.4
+        version: 3.3.4
+      vue-markdown-render:
+        specifier: ^2.0.1
+        version: 2.0.1
+    devDependencies:
+      '@iconify-json/mdi':
+        specifier: ^1.1.54
+        version: 1.1.63
+      shelljs:
+        specifier: ^0.8.5
+        version: 0.8.5
+      unbuild:
+        specifier: ^2.0.0
+        version: 2.0.0(typescript@5.3.2)
+      unplugin-icons:
+        specifier: ^0.17.0
+        version: 0.17.4
+      vite-plugin-dts:
+        specifier: ^3.6.4
+        version: 3.6.4(rollup@3.29.4)(typescript@5.3.2)(vite@5.0.10)
 
   packages/@n8n/client-oauth2:
     dependencies:
       axios:
-        specifier: ^0.21.1
-        version: 0.21.4
+        specifier: 1.6.2
+        version: 1.6.2(debug@3.2.7)
+
+  packages/@n8n/nodes-langchain:
+    dependencies:
+      '@aws-sdk/client-bedrock-runtime':
+        specifier: 3.454.0
+        version: 3.454.0
+      '@aws-sdk/credential-provider-node':
+        specifier: 3.451.0
+        version: 3.451.0
+      '@getzep/zep-js':
+        specifier: 0.9.0
+        version: 0.9.0
+      '@google-ai/generativelanguage':
+        specifier: 0.2.1
+        version: 0.2.1
+      '@huggingface/inference':
+        specifier: 2.6.4
+        version: 2.6.4
+      '@langchain/core':
+        specifier: ^0.1.8
+        version: 0.1.8
+      '@langchain/mistralai':
+        specifier: 0.0.6
+        version: 0.0.6
+      '@n8n/vm2':
+        specifier: 3.9.20
+        version: 3.9.20
+      '@pinecone-database/pinecone':
+        specifier: 1.1.2
+        version: 1.1.2
+      '@qdrant/js-client-rest':
+        specifier: 1.7.0
+        version: 1.7.0(typescript@5.3.2)
+      '@supabase/supabase-js':
+        specifier: 2.38.5
+        version: 2.38.5
+      '@xata.io/client':
+        specifier: 0.25.3
+        version: 0.25.3(typescript@5.3.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.1
+        version: 3.0.1(ts-toolbelt@9.6.0)
+      html-to-text:
+        specifier: 9.0.5
+        version: 9.0.5
+      json-schema-to-zod:
+        specifier: 1.2.0
+        version: 1.2.0
+      langchain:
+        specifier: 0.0.198
+        version: 0.0.198(@aws-sdk/client-bedrock-runtime@3.454.0)(@aws-sdk/credential-provider-node@3.451.0)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@0.2.1)(@huggingface/inference@2.6.4)(@pinecone-database/pinecone@1.1.2)(@qdrant/js-client-rest@1.7.0)(@supabase/supabase-js@2.38.5)(@xata.io/client@0.25.3)(axios@1.6.2)(cohere-ai@6.2.2)(d3-dsv@2.0.0)(epub2@3.0.1)(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.11)(typeorm@0.3.17)
+      lodash:
+        specifier: 4.17.21
+        version: 4.17.21
+      mammoth:
+        specifier: 1.6.0
+        version: 1.6.0
+      mssql:
+        specifier: 9.1.1
+        version: 9.1.1
+      n8n-nodes-base:
+        specifier: workspace:*
+        version: link:../../nodes-base
+      n8n-workflow:
+        specifier: workspace:*
+        version: link:../../workflow
+      openai:
+        specifier: 4.20.0
+        version: 4.20.0
+      pdf-parse:
+        specifier: 1.1.1
+        version: 1.1.1
+      pg:
+        specifier: 8.11.3
+        version: 8.11.3
+      redis:
+        specifier: 4.6.11
+        version: 4.6.11
+      sqlite3:
+        specifier: 5.1.6
+        version: 5.1.6
+      temp:
+        specifier: 0.9.4
+        version: 0.9.4
+      typeorm:
+        specifier: 0.3.17
+        version: 0.3.17(mssql@9.1.1)(pg@8.11.3)(redis@4.6.11)(sqlite3@5.1.6)
+      zod:
+        specifier: 3.22.4
+        version: 3.22.4
+      zod-to-json-schema:
+        specifier: 3.22.0
+        version: 3.22.0(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.6
+        version: 4.17.14
+      '@types/html-to-text':
+        specifier: ^9.0.1
+        version: 9.0.4
+      '@types/json-schema':
+        specifier: ^7.0.12
+        version: 7.0.12
+      '@types/request-promise-native':
+        specifier: ~1.0.15
+        version: 1.0.18
+      '@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.54.0)(typescript@5.3.2)
+      gulp:
+        specifier: ^4.0.2
+        version: 4.0.2
+      n8n-core:
+        specifier: workspace:*
+        version: link:../../core
+
+  packages/@n8n/permissions: {}
 
   packages/@n8n_io/eslint-config:
     devDependencies:
       '@types/eslint':
-        specifier: ^8.44.1
-        version: 8.44.1
+        specifier: ^8.44.7
+        version: 8.44.7
       '@typescript-eslint/eslint-plugin':
-        specifier: ^6.2.0
-        version: 6.2.0(@typescript-eslint/parser@6.2.0)(eslint@8.45.0)(typescript@5.2.2)
+        specifier: ^6.12.0
+        version: 6.12.0(@typescript-eslint/parser@6.12.0)(eslint@8.54.0)(typescript@5.3.2)
       '@typescript-eslint/parser':
-        specifier: ^6.2.0
-        version: 6.2.0(eslint@8.45.0)(typescript@5.2.2)
+        specifier: ^6.12.0
+        version: 6.12.0(eslint@8.54.0)(typescript@5.3.2)
+      '@vue/eslint-config-prettier':
+        specifier: ^8.0.0
+        version: 8.0.0(@types/eslint@8.44.7)(eslint@8.54.0)(prettier@3.1.0)
       '@vue/eslint-config-typescript':
-        specifier: ^11.0.3
-        version: 11.0.3(eslint-plugin-vue@9.15.1)(eslint@8.45.0)(typescript@5.2.2)
+        specifier: ^12.0.0
+        version: 12.0.0(eslint-plugin-vue@9.18.1)(eslint@8.54.0)(typescript@5.3.2)
       eslint:
-        specifier: ^8.45.0
-        version: 8.45.0
+        specifier: ^8.54.0
+        version: 8.54.0
       eslint-config-airbnb-typescript:
         specifier: ^17.1.0
-        version: 17.1.0(@typescript-eslint/eslint-plugin@6.2.0)(@typescript-eslint/parser@6.2.0)(eslint-plugin-import@2.28.0)(eslint@8.45.0)
+        version: 17.1.0(@typescript-eslint/eslint-plugin@6.12.0)(@typescript-eslint/parser@6.12.0)(eslint-plugin-import@2.29.0)(eslint@8.54.0)
       eslint-config-prettier:
-        specifier: ^8.9.0
-        version: 8.9.0(eslint@8.45.0)
+        specifier: ^9.0.0
+        version: 9.0.0(eslint@8.54.0)
       eslint-import-resolver-typescript:
-        specifier: ^3.5.5
-        version: 3.5.5(@typescript-eslint/parser@6.2.0)(eslint-plugin-import@2.28.0)(eslint@8.45.0)
+        specifier: ^3.6.1
+        version: 3.6.1(@typescript-eslint/parser@6.12.0)(eslint-plugin-import@2.29.0)(eslint@8.54.0)
       eslint-plugin-import:
-        specifier: ^2.28.0
-        version: 2.28.0(@typescript-eslint/parser@6.2.0)(eslint-import-resolver-typescript@3.5.5)(eslint@8.45.0)
+        specifier: ^2.29.0
+        version: 2.29.0(@typescript-eslint/parser@6.12.0)(eslint-import-resolver-typescript@3.6.1)(eslint@8.54.0)
       eslint-plugin-n8n-local-rules:
         specifier: ^1.0.0
         version: 1.0.0
       eslint-plugin-prettier:
-        specifier: ^5.0.0
-        version: 5.0.0(@types/eslint@8.44.1)(eslint-config-prettier@8.9.0)(eslint@8.45.0)(prettier@3.0.3)
+        specifier: ^5.0.1
+        version: 5.0.1(@types/eslint@8.44.7)(eslint-config-prettier@9.0.0)(eslint@8.54.0)(prettier@3.1.0)
       eslint-plugin-unicorn:
-        specifier: ^48.0.1
-        version: 48.0.1(eslint@8.45.0)
+        specifier: ^49.0.0
+        version: 49.0.0(eslint@8.54.0)
       eslint-plugin-unused-imports:
         specifier: ^3.0.0
-        version: 3.0.0(@typescript-eslint/eslint-plugin@6.2.0)(eslint@8.45.0)
+        version: 3.0.0(@typescript-eslint/eslint-plugin@6.12.0)(eslint@8.54.0)
       eslint-plugin-vue:
-        specifier: ^9.15.1
-        version: 9.15.1(eslint@8.45.0)
+        specifier: ^9.18.1
+        version: 9.18.1(eslint@8.54.0)
       vue-eslint-parser:
-        specifier: ^9.3.1
-        version: 9.3.1(eslint@8.45.0)
+        specifier: ^9.3.2
+        version: 9.3.2(eslint@8.54.0)
 
   packages/cli:
     dependencies:
       '@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_io/license-sdk':
-        specifier: ~2.7.1
-        version: 2.7.1
+        specifier: 2.7.2
+        version: 2.7.2
       '@oclif/command':
-        specifier: ^1.8.16
+        specifier: 1.8.18
         version: 1.8.18(@oclif/config@1.18.17)(supports-color@8.1.1)
       '@oclif/config':
-        specifier: ^1.18.17
+        specifier: 1.18.17
         version: 1.18.17
       '@oclif/core':
-        specifier: ^1.16.4
+        specifier: 1.16.6
         version: 1.16.6
       '@oclif/errors':
-        specifier: ^1.3.6
+        specifier: 1.3.6
         version: 1.3.6
       '@rudderstack/rudder-sdk-node':
         specifier: 1.0.6
         version: 1.0.6
       '@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
       axios:
-        specifier: ^0.21.1
-        version: 0.21.4
+        specifier: 1.6.2
+        version: 1.6.2(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
       bull:
-        specifier: ^4.10.2
+        specifier: 4.10.2
         version: 4.10.2
       cache-manager:
-        specifier: ^5.2.3
+        specifier: 5.2.3
         version: 5.2.3
-      cache-manager-ioredis-yet:
-        specifier: ^1.2.2
-        version: 1.2.2
       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
       compression:
-        specifier: ^1.7.4
+        specifier: 1.7.4
         version: 1.7.4
       connect-history-api-fallback:
-        specifier: ^1.6.0
+        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
       csrf:
-        specifier: ^3.1.0
+        specifier: 3.1.0
         version: 3.1.0
       curlconverter:
         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
+        specifier: 4.18.2
         version: 4.18.2
       express-async-errors:
-        specifier: ^3.1.1
+        specifier: 3.1.1
         version: 3.1.1(express@4.18.2)
       express-handlebars:
-        specifier: ^7.0.2
+        specifier: 7.0.2
         version: 7.0.2
       express-openapi-validator:
-        specifier: ^4.13.6
+        specifier: 4.13.8
         version: 4.13.8
       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.1.3
+        version: 7.1.3(express@4.18.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.0
+        specifier: 3.5.0
         version: 3.5.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
       infisical-node:
-        specifier: ^1.3.0
+        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
+        specifier: 5.2.4
         version: 5.2.4
       isbot:
-        specifier: ^3.6.13
+        specifier: 3.6.13
         version: 3.6.13
       json-diff:
-        specifier: ^1.0.6
+        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
+        specifier: 3.0.1
         version: 3.0.1
       ldapts:
-        specifier: ^4.2.6
+        specifier: 4.2.6
         version: 4.2.6
-      localtunnel:
-        specifier: ^2.0.0
-        version: 2.0.2
       lodash:
-        specifier: ^4.17.21
+        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
+        specifier: 2.3.3
         version: 2.3.3
       n8n-core:
         specifier: workspace:*
@@ -351,121 +527,121 @@ importers:
         specifier: workspace:*
         version: link:../workflow
       nanoid:
-        specifier: ^3.3.6
+        specifier: 3.3.6
         version: 3.3.6
       nodemailer:
-        specifier: ^6.7.1
+        specifier: 6.8.0
         version: 6.8.0
       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-types:
-        specifier: ^10.0.0
+        specifier: 10.0.0
         version: 10.0.0
       otpauth:
-        specifier: ^9.1.1
+        specifier: 9.1.1
         version: 9.1.1
       p-cancelable:
-        specifier: ^2.0.0
+        specifier: 2.1.1
         version: 2.1.1
       p-lazy:
-        specifier: ^3.1.0
+        specifier: 3.1.0
         version: 3.1.0
       passport:
-        specifier: ^0.6.0
+        specifier: 0.6.0
         version: 0.6.0
       passport-cookie:
-        specifier: ^1.0.9
+        specifier: 1.0.9
         version: 1.0.9
       passport-jwt:
-        specifier: ^4.0.0
-        version: 4.0.0
+        specifier: 4.0.1
+        version: 4.0.1
       pg:
-        specifier: ^8.8.0
+        specifier: 8.8.0
         version: 8.8.0
       picocolors:
-        specifier: ^1.0.0
+        specifier: 1.0.0
         version: 1.0.0
       pkce-challenge:
-        specifier: ^3.0.0
+        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
+        specifier: 2.5.1
         version: 2.5.1
       reflect-metadata:
-        specifier: ^0.1.13
+        specifier: 0.1.13
         version: 0.1.13
       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.5.4
         version: 7.5.4
       shelljs:
-        specifier: ^0.8.5
+        specifier: 0.8.5
         version: 0.8.5
       simple-git:
-        specifier: ^3.17.0
+        specifier: 3.17.0
         version: 3.17.0
       source-map-support:
-        specifier: ^0.5.21
+        specifier: 0.5.21
         version: 0.5.21
       sqlite3:
-        specifier: ^5.1.6
+        specifier: 5.1.6
         version: 5.1.6
       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
+        specifier: 4.5.0
         version: 4.5.0(express@4.18.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=62r6bc2crgimafeyruodhqlgo4)
+        specifier: 0.10.0
+        version: 0.10.0(patch_hash=sk6omkefrosihg7lmqbzh7vfxe)
       typeorm:
-        specifier: ^0.3.17
+        specifier: 0.3.17
         version: 0.3.17(ioredis@5.2.4)(mysql2@2.3.3)(pg@8.8.0)(sqlite3@5.1.6)
       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
+        specifier: 8.12.0
         version: 8.12.0
       xml2js:
         specifier: ^0.5.0
         version: 0.5.0
       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
     devDependencies:
       '@apidevtools/swagger-cli':
@@ -504,9 +680,6 @@ importers:
       '@types/jsonwebtoken':
         specifier: ^9.0.1
         version: 9.0.1
-      '@types/localtunnel':
-        specifier: ^1.9.0
-        version: 1.9.0
       '@types/lodash':
         specifier: ^4.14.195
         version: 4.14.195
@@ -563,7 +736,7 @@ importers:
         version: 8.8.1(@types/ioredis-mock@8.2.2)(ioredis@5.2.4)
       ts-essentials:
         specifier: ^7.0.3
-        version: 7.0.3(typescript@5.2.2)
+        version: 7.0.3(typescript@5.3.2)
 
   packages/core:
     dependencies:
@@ -571,37 +744,31 @@ importers:
         specifier: workspace:*
         version: link:../@n8n/client-oauth2
       aws4:
-        specifier: ^1.8.0
+        specifier: 1.11.0
         version: 1.11.0
       axios:
-        specifier: ^0.21.1
-        version: 0.21.4
+        specifier: 1.6.2
+        version: 1.6.2(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:
-        specifier: ^4.17.21
+        specifier: 4.17.21
         version: 4.17.21
       mime-types:
-        specifier: ^2.1.27
+        specifier: 2.1.35
         version: 2.1.35
       n8n-nodes-base:
         specifier: workspace:*
@@ -610,22 +777,22 @@ importers:
         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
       typedi:
-        specifier: ^0.10.0
-        version: 0.10.0(patch_hash=62r6bc2crgimafeyruodhqlgo4)
+        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.5.0
@@ -640,9 +807,6 @@ importers:
       '@types/cron':
         specifier: ~1.7.1
         version: 1.7.3
-      '@types/crypto-js':
-        specifier: ^4.1.3
-        version: 4.1.3
       '@types/express':
         specifier: ^4.17.6
         version: 4.17.14
@@ -664,6 +828,18 @@ importers:
 
   packages/design-system:
     dependencies:
+      '@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.3.4)
       element-plus:
         specifier: ^2.3.6
         version: 2.3.6(vue@3.3.4)
@@ -692,51 +868,54 @@ importers:
         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: ^3.0.3
-        version: 3.0.3(@fortawesome/fontawesome-svg-core@1.2.36)(vue@3.3.4)
       '@storybook/addon-a11y':
-        specifier: ^7.1.1
-        version: 7.1.1(react-dom@18.2.0)(react@17.0.2)
+        specifier: ^7.5.2
+        version: 7.5.2(react-dom@18.2.0)(react@18.2.0)
       '@storybook/addon-actions':
-        specifier: ^7.1.1
-        version: 7.1.1(react-dom@18.2.0)(react@17.0.2)
+        specifier: ^7.5.2
+        version: 7.5.2(react-dom@18.2.0)(react@18.2.0)
       '@storybook/addon-docs':
-        specifier: ^7.1.1
-        version: 7.1.1(react-dom@18.2.0)(react@17.0.2)
+        specifier: ^7.5.2
+        version: 7.5.2(react-dom@18.2.0)(react@18.2.0)
       '@storybook/addon-essentials':
-        specifier: ^7.1.1
-        version: 7.1.1(react-dom@18.2.0)(react@17.0.2)
+        specifier: ^7.5.2
+        version: 7.5.2(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/addon-interactions':
+        specifier: ^7.5.2
+        version: 7.5.3(react-dom@18.2.0)(react@18.2.0)
       '@storybook/addon-links':
-        specifier: ^7.1.1
-        version: 7.1.1(react-dom@18.2.0)(react@17.0.2)
+        specifier: ^7.5.2
+        version: 7.5.2(react-dom@18.2.0)(react@18.2.0)
       '@storybook/addon-postcss':
         specifier: 3.0.0-alpha.1
         version: 3.0.0-alpha.1(webpack@5.75.0)
-      '@storybook/addon-styling':
-        specifier: ^1.3.4
-        version: 1.3.4(less@4.1.3)(postcss@8.4.27)(react-dom@18.2.0)(react@17.0.2)(sass@1.64.1)(webpack@5.75.0)
+      '@storybook/blocks':
+        specifier: ^7.5.2
+        version: 7.5.2(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/testing-library':
+        specifier: ^0.2.2
+        version: 0.2.2
       '@storybook/vue3':
-        specifier: ^7.1.1
-        version: 7.1.1(@vue/compiler-core@3.3.4)(vue@3.3.4)
+        specifier: ^7.5.2
+        version: 7.5.2(@vue/compiler-core@3.3.4)(vue@3.3.4)
       '@storybook/vue3-vite':
-        specifier: ^7.1.1
-        version: 7.1.1(@vue/compiler-core@3.3.4)(react-dom@18.2.0)(react@17.0.2)(typescript@5.2.2)(vite@4.4.7)(vue@3.3.4)
+        specifier: ^7.5.2
+        version: 7.5.2(@vue/compiler-core@3.3.4)(react-dom@18.2.0)(react@18.2.0)(typescript@5.3.2)(vite@5.0.10)(vue@3.3.4)
       '@testing-library/jest-dom':
-        specifier: ^5.17.0
-        version: 5.17.0
+        specifier: ^6.1.5
+        version: 6.1.5(@types/jest@29.5.3)(jest@29.6.2)(vitest@1.1.0)
       '@testing-library/user-event':
-        specifier: ^14.4.3
-        version: 14.4.3(@testing-library/dom@9.3.1)
+        specifier: ^14.5.1
+        version: 14.5.1(@testing-library/dom@9.3.3)
       '@testing-library/vue':
-        specifier: ^7.0.0
-        version: 7.0.0(@vue/compiler-sfc@3.3.4)(vue@3.3.4)
+        specifier: ^8.0.1
+        version: 8.0.1(@vue/compiler-sfc@3.3.4)(vue@3.3.4)
+      '@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
@@ -750,20 +929,29 @@ importers:
         specifier: ^2.9.0
         version: 2.9.0
       '@vitejs/plugin-vue':
-        specifier: ^4.2.3
-        version: 4.2.3(vite@4.4.7)(vue@3.3.4)
+        specifier: ^4.5.2
+        version: 4.5.2(vite@5.0.10)(vue@3.3.4)
       '@vue/test-utils':
-        specifier: ^2.4.1
-        version: 2.4.1(vue@3.3.4)
+        specifier: ^2.4.3
+        version: 2.4.3(vue@3.3.4)
+      '@vue/tsconfig':
+        specifier: ^0.5.1
+        version: 0.5.1
       autoprefixer:
         specifier: ^10.4.14
-        version: 10.4.14(postcss@8.4.27)
+        version: 10.4.14(postcss@8.4.32)
       core-js:
         specifier: ^3.31.0
         version: 3.31.0
       jsdom:
-        specifier: 21.1.0
-        version: 21.1.0
+        specifier: ^23.0.1
+        version: 23.0.1
+      react:
+        specifier: ^18.2.0
+        version: 18.2.0
+      react-dom:
+        specifier: ^18.2.0
+        version: 18.2.0(react@18.2.0)
       sass:
         specifier: ^1.64.1
         version: 1.64.1
@@ -771,58 +959,58 @@ importers:
         specifier: ^13.3.2
         version: 13.3.2(sass@1.64.1)(webpack@5.75.0)
       storybook:
-        specifier: ^7.1.1
-        version: 7.1.1
+        specifier: ^7.5.2
+        version: 7.5.2
       storybook-addon-themes:
         specifier: ^6.1.0
-        version: 6.1.0(react-dom@18.2.0)(react@17.0.2)(vue@3.3.4)
+        version: 6.1.0(react-dom@18.2.0)(react@18.2.0)(vue@3.3.4)
       storybook-dark-mode:
         specifier: ^3.0.1
-        version: 3.0.1(react-dom@18.2.0)(react@17.0.2)
+        version: 3.0.1(react-dom@18.2.0)(react@18.2.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.1.0)
+        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
+        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.2
-        version: 6.1.2(@codemirror/state@6.1.4)(@codemirror/view@6.5.1)(@lezer/common@1.1.0)
+        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.2.1
-        version: 6.2.1
+        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: ^3.0.3
+        specifier: '*'
         version: 3.0.3(@fortawesome/fontawesome-svg-core@1.2.36)(vue@3.3.4)
       '@jsplumb/browser-ui':
         specifier: ^5.13.2
@@ -842,27 +1030,33 @@ importers:
       '@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.5.1)(@lezer/common@1.1.0)
+        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.2.0
-        version: 10.2.0(vue@3.3.4)
+        specifier: ^10.5.0
+        version: 10.5.0(vue@3.3.4)
       '@vueuse/core':
-        specifier: ^10.2.0
-        version: 10.2.0(vue@3.3.4)
+        specifier: ^10.5.0
+        version: 10.5.0(vue@3.3.4)
       axios:
-        specifier: ^0.21.1
-        version: 0.21.4
+        specifier: ^1.6.2
+        version: 1.6.2(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.1.0)
-      copy-to-clipboard:
-        specifier: ^3.3.3
-        version: 3.3.3
+        version: 0.2.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
@@ -898,10 +1092,10 @@ importers:
         version: link:../workflow
       pinia:
         specifier: ^2.1.6
-        version: 2.1.6(typescript@5.2.2)(vue@3.3.4)
+        version: 2.1.6(typescript@5.3.2)(vue@3.3.4)
       prettier:
-        specifier: ^3.0.3
-        version: 3.0.3
+        specifier: ^3.1.0
+        version: 3.1.0
       qrcode.vue:
         specifier: ^3.3.4
         version: 3.3.4(vue@3.3.4)
@@ -923,6 +1117,9 @@ importers:
       vue-agile:
         specifier: ^2.0.0
         version: 2.0.0
+      vue-chartjs:
+        specifier: ^5.2.0
+        version: 5.2.0(chart.js@4.4.0)(vue@3.3.4)
       vue-i18n:
         specifier: ^9.2.2
         version: 9.2.2(vue@3.3.4)
@@ -975,6 +1172,9 @@ importers:
       miragejs:
         specifier: ^0.1.47
         version: 0.1.47
+      unplugin-icons:
+        specifier: ^0.17.0
+        version: 0.17.4
 
   packages/node-dev:
     dependencies:
@@ -1007,7 +1207,7 @@ importers:
         version: 3.0.3
       typedi:
         specifier: ^0.10.0
-        version: 0.10.0(patch_hash=62r6bc2crgimafeyruodhqlgo4)
+        version: 0.10.0(patch_hash=sk6omkefrosihg7lmqbzh7vfxe)
     devDependencies:
       '@oclif/dev-cli':
         specifier: ^1.22.2
@@ -1022,19 +1222,19 @@ importers:
         specifier: 1.0.6
         version: 1.0.6
       '@n8n/vm2':
-        specifier: ^3.9.20
+        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
@@ -1043,160 +1243,160 @@ 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
+        specifier: 5.5.0
         version: 5.5.0
       currency-codes:
-        specifier: ^2.1.0
+        specifier: 2.1.0
         version: 2.1.0
       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
       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
       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
+        specifier: 4.3.0
         version: 4.3.0
       isbot:
-        specifier: ^3.6.13
+        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
       kafkajs:
-        specifier: ^1.14.0
+        specifier: 1.16.0
         version: 1.16.0
       ldapts:
-        specifier: ^4.2.6
+        specifier: 4.2.6
         version: 4.2.6
       lodash:
-        specifier: ^4.17.21
+        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
+        specifier: 3.5.0
         version: 3.5.0
       minifaker:
-        specifier: ^1.34.1
+        specifier: 1.34.1
         version: 1.34.1
-      moment:
-        specifier: ~2.29.2
-        version: 2.29.4
       moment-timezone:
-        specifier: ^0.5.28
+        specifier: 0.5.37
         version: 0.5.37
       mongodb:
-        specifier: ^4.17.1
+        specifier: 4.17.1
         version: 4.17.1
       mqtt:
-        specifier: ^5.0.2
+        specifier: 5.0.2
         version: 5.0.2
       mssql:
-        specifier: ^8.1.2
+        specifier: 8.1.4
         version: 8.1.4
       mysql2:
-        specifier: ~2.3.0
+        specifier: 2.3.3
         version: 2.3.3
       n8n-workflow:
         specifier: workspace:*
         version: link:../workflow
       nanoid:
-        specifier: ^3.3.6
+        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
+        specifier: 6.8.0
         version: 6.8.0
       otpauth:
-        specifier: ^9.1.1
+        specifier: 9.1.1
         version: 9.1.1
       pdfjs-dist:
-        specifier: ^2.16.105
+        specifier: 2.16.105
         version: 2.16.105
       pg:
-        specifier: ^8.3.0
+        specifier: 8.8.0
         version: 8.8.0
       pg-promise:
-        specifier: ^10.5.8
+        specifier: 10.12.0
         version: 10.12.0
       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
+        specifier: 0.23.4
         version: 0.23.4(patch_hash=kzcwsjcayy5m6iezu7r4tdimjq)
       redis:
-        specifier: ^3.1.1
+        specifier: 3.1.2
         version: 3.1.2
       rfc2047:
-        specifier: ^4.0.1
+        specifier: 4.0.1
         version: 4.0.1
       rhea:
-        specifier: ^1.0.11
+        specifier: 1.0.24
         version: 1.0.24
       rss-parser:
-        specifier: ^3.7.0
+        specifier: 3.12.0
         version: 3.12.0
       semver:
         specifier: ^7.5.4
         version: 7.5.4
       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.8.0
-        version: 1.8.0(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=62r6bc2crgimafeyruodhqlgo4)
+        specifier: 0.10.0
+        version: 0.10.0(patch_hash=sk6omkefrosihg7lmqbzh7vfxe)
       uuid:
-        specifier: ^8.3.2
+        specifier: 8.3.2
         version: 8.3.2
       xlsx:
         specifier: https://cdn.sheetjs.com/xlsx-0.19.3/xlsx-0.19.3.tgz
@@ -1275,8 +1475,8 @@ importers:
         specifier: ^1.9.4
         version: 1.9.4
       '@types/snowflake-sdk':
-        specifier: ^1.6.12
-        version: 1.6.12
+        specifier: ^1.6.20
+        version: 1.6.20
       '@types/ssh2-sftp-client':
         specifier: ^5.1.0
         version: 5.3.2
@@ -1291,7 +1491,7 @@ importers:
         version: 0.4.11
       eslint-plugin-n8n-nodes-base:
         specifier: ^1.16.0
-        version: 1.16.0(eslint@8.45.0)(typescript@5.2.2)
+        version: 1.16.0(eslint@8.54.0)(typescript@5.3.2)
       gulp:
         specifier: ^4.0.0
         version: 4.0.2
@@ -1302,54 +1502,57 @@ importers:
   packages/workflow:
     dependencies:
       '@n8n/tournament':
-        specifier: ^1.0.2
+        specifier: 1.0.2
         version: 1.0.2
       '@n8n_io/riot-tmpl':
-        specifier: ^4.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
+      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
       form-data:
-        specifier: ^4.0.0
+        specifier: 4.0.0
         version: 4.0.0
       jmespath:
-        specifier: ^0.16.0
+        specifier: 0.16.0
         version: 0.16.0
       js-base64:
-        specifier: ^3.7.2
+        specifier: 3.7.2
         version: 3.7.2
+      jssha:
+        specifier: 3.3.1
+        version: 3.3.1
       lodash:
-        specifier: ^4.17.21
+        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
     devDependencies:
-      '@types/crypto-js':
-        specifier: ^4.1.3
-        version: 4.1.3
       '@types/deep-equal':
         specifier: ^1.0.1
         version: 1.0.1
@@ -1365,6 +1568,9 @@ importers:
       '@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
@@ -1387,8 +1593,8 @@ 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.1:
@@ -1396,9 +1602,37 @@ packages:
     engines: {node: '>=6.0.0'}
     dependencies:
       '@jridgewell/gen-mapping': 0.3.2
-      '@jridgewell/trace-mapping': 0.3.17
+      '@jridgewell/trace-mapping': 0.3.18
     dev: true
 
+  /@antfu/install-pkg@0.1.1:
+    resolution: {integrity: sha512-LyB/8+bSfa0DFGC06zpCEfs89/XoWZwws5ygEa5D+Xsm3OfI+aXQ86VgVG7Acyef+rSZ5HE7J8rrxzrQeM3PjQ==}
+    dependencies:
+      execa: 5.1.1
+      find-up: 5.0.0
+    dev: true
+
+  /@antfu/utils@0.7.6:
+    resolution: {integrity: sha512-pvFiLP2BeOKA/ZOS6jxx4XhKzdVLHDhGlFEaZ2flWWYf2xOqVniqpk38I04DFRyz+L0ASggl7SkItTc+ZLju4w==}
+    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/json-schema-ref-parser@8.0.0:
     resolution: {integrity: sha512-n4YBtwQhdpLto1BaUCyAeflizmIbaloGShsPyRtFf5qdFJxfssj+GgLavczgKJFa3Bq+3St2CKcpRJdjtB4EBw==}
     dependencies:
@@ -1468,17 +1702,35 @@ packages:
     resolution: {integrity: sha512-IzSgsrxUcsrejQbPVilIKy16kAT52EwB6zSaI+M3xxIhKh5+aldEyvI+z6erM7TCLB2BJsFrtHjp6/4/sr+3dA==}
     dependencies:
       '@aws-crypto/util': 3.0.0
-      '@aws-sdk/types': 3.398.0
+      '@aws-sdk/types': 3.357.0
+      tslib: 2.6.1
+    dev: false
+
+  /@aws-crypto/crc32c@3.0.0:
+    resolution: {integrity: sha512-ENNPPManmnVJ4BTXlOjAgD7URidbAznURqD0KvfREyc4o20DPYdEldU1f5cQ7Jbj0CJJSPaMIk/9ZshdB3210w==}
+    dependencies:
+      '@aws-crypto/util': 3.0.0
+      '@aws-sdk/types': 3.357.0
       tslib: 2.6.1
     dev: false
-    optional: true
 
   /@aws-crypto/ie11-detection@3.0.0:
     resolution: {integrity: sha512-341lBBkiY1DfDNKai/wXM3aujNBkXR7tq1URPQDL9wi3AUbI80NR74uF1TXHMm7po1AcnFk8iu2S2IeU/+/A+Q==}
     dependencies:
       tslib: 2.6.1
     dev: false
-    optional: true
+
+  /@aws-crypto/sha1-browser@3.0.0:
+    resolution: {integrity: sha512-NJth5c997GLHs6nOYTzFKTbYdMNA6/1XlKVgnZoaZcQ7z7UJlOgj2JdbHE8tiYLS3fzXNCguct77SPGat2raSw==}
+    dependencies:
+      '@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.1
+    dev: false
 
   /@aws-crypto/sha256-browser@3.0.0:
     resolution: {integrity: sha512-8VLmW2B+gjFbU5uMeqtQM6Nj0/F1bro80xQXCW6CQBWgosFWXTx77aeOF5CAIAmbOK64SdMBJdNr6J41yP5mvQ==}
@@ -1487,37 +1739,84 @@ packages:
       '@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.398.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.1
     dev: false
-    optional: true
 
   /@aws-crypto/sha256-js@3.0.0:
     resolution: {integrity: sha512-PnNN7os0+yd1XvXAy23CFOmTbMaDxgxXtTKHybrJ39Y8kGzBATgBFibWJKH6BhytLI/Zyszs87xCOBNyBig6vQ==}
     dependencies:
       '@aws-crypto/util': 3.0.0
-      '@aws-sdk/types': 3.398.0
+      '@aws-sdk/types': 3.357.0
       tslib: 2.6.1
     dev: false
-    optional: true
 
   /@aws-crypto/supports-web-crypto@3.0.0:
     resolution: {integrity: sha512-06hBdMwUAb2WFTuGG73LSC0wfPu93xWwo5vL2et9eymgmu3Id5vFAHBbajVWiGhPO37qcsdCap/FqXvJGJWPIg==}
     dependencies:
       tslib: 2.6.1
     dev: false
-    optional: true
 
   /@aws-crypto/util@3.0.0:
     resolution: {integrity: sha512-2OJlpeJpCR48CC8r+uKVChzs9Iungj9wkZrl8Z041DWEWvyIHILYKCPNzJghKsivj+S3mLo6BVc7mBNzdxA46w==}
     dependencies:
-      '@aws-sdk/types': 3.398.0
+      '@aws-sdk/types': 3.357.0
       '@aws-sdk/util-utf8-browser': 3.259.0
       tslib: 2.6.1
     dev: false
-    optional: true
+
+  /@aws-sdk/client-bedrock-runtime@3.454.0:
+    resolution: {integrity: sha512-egTzXn18flcd7s+EdBWyMufVvIaiGZQZT4hoYxoBCr+nMhxaFcugl8QSY3IymPoHN89KzTfx4QBT/qczj/p/jg==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@aws-crypto/sha256-browser': 3.0.0
+      '@aws-crypto/sha256-js': 3.0.0
+      '@aws-sdk/client-sts': 3.454.0
+      '@aws-sdk/core': 3.451.0
+      '@aws-sdk/credential-provider-node': 3.451.0
+      '@aws-sdk/middleware-host-header': 3.451.0
+      '@aws-sdk/middleware-logger': 3.451.0
+      '@aws-sdk/middleware-recursion-detection': 3.451.0
+      '@aws-sdk/middleware-signing': 3.451.0
+      '@aws-sdk/middleware-user-agent': 3.451.0
+      '@aws-sdk/region-config-resolver': 3.451.0
+      '@aws-sdk/types': 3.451.0
+      '@aws-sdk/util-endpoints': 3.451.0
+      '@aws-sdk/util-user-agent-browser': 3.451.0
+      '@aws-sdk/util-user-agent-node': 3.451.0
+      '@smithy/config-resolver': 2.0.19
+      '@smithy/eventstream-serde-browser': 2.0.14
+      '@smithy/eventstream-serde-config-resolver': 2.0.14
+      '@smithy/eventstream-serde-node': 2.0.14
+      '@smithy/fetch-http-handler': 2.2.7
+      '@smithy/hash-node': 2.0.16
+      '@smithy/invalid-dependency': 2.0.14
+      '@smithy/middleware-content-length': 2.0.16
+      '@smithy/middleware-endpoint': 2.2.1
+      '@smithy/middleware-retry': 2.0.21
+      '@smithy/middleware-serde': 2.0.14
+      '@smithy/middleware-stack': 2.0.8
+      '@smithy/node-config-provider': 2.1.6
+      '@smithy/node-http-handler': 2.1.10
+      '@smithy/protocol-http': 3.0.10
+      '@smithy/smithy-client': 2.1.16
+      '@smithy/types': 2.6.0
+      '@smithy/url-parser': 2.0.14
+      '@smithy/util-base64': 2.0.1
+      '@smithy/util-body-length-browser': 2.0.0
+      '@smithy/util-body-length-node': 2.1.0
+      '@smithy/util-defaults-mode-browser': 2.0.20
+      '@smithy/util-defaults-mode-node': 2.0.26
+      '@smithy/util-endpoints': 1.0.5
+      '@smithy/util-retry': 2.0.7
+      '@smithy/util-stream': 2.0.21
+      '@smithy/util-utf8': 2.0.2
+      tslib: 2.6.1
+    transitivePeerDependencies:
+      - aws-crt
+    dev: false
 
   /@aws-sdk/client-cognito-identity@3.398.0:
     resolution: {integrity: sha512-Pr/S1f8R2FsJ8DwBC6g0CSdtZNNV5dMHhlIi+t8YAmCJvP4KT+UhzFjbvQRINlBRLFuGUuP7p5vRcGVELD3+wA==}
@@ -1536,34 +1835,100 @@ packages:
       '@aws-sdk/util-endpoints': 3.398.0
       '@aws-sdk/util-user-agent-browser': 3.398.0
       '@aws-sdk/util-user-agent-node': 3.398.0
-      '@smithy/config-resolver': 2.0.5
-      '@smithy/fetch-http-handler': 2.0.5
-      '@smithy/hash-node': 2.0.5
-      '@smithy/invalid-dependency': 2.0.5
-      '@smithy/middleware-content-length': 2.0.5
-      '@smithy/middleware-endpoint': 2.0.5
-      '@smithy/middleware-retry': 2.0.5
-      '@smithy/middleware-serde': 2.0.5
-      '@smithy/middleware-stack': 2.0.0
-      '@smithy/node-config-provider': 2.0.5
-      '@smithy/node-http-handler': 2.0.5
+      '@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/protocol-http': 2.0.5
-      '@smithy/smithy-client': 2.0.5
-      '@smithy/types': 2.2.2
-      '@smithy/url-parser': 2.0.5
-      '@smithy/util-base64': 2.0.0
-      '@smithy/util-body-length-browser': 2.0.0
+      '@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.5
-      '@smithy/util-defaults-mode-node': 2.0.5
-      '@smithy/util-retry': 2.0.0
-      '@smithy/util-utf8': 2.0.0
+      '@smithy/util-defaults-mode-browser': 2.0.22
+      '@smithy/util-defaults-mode-node': 2.0.29
+      '@smithy/util-retry': 2.0.8
+      '@smithy/util-utf8': 2.0.2
       tslib: 2.6.1
     transitivePeerDependencies:
       - aws-crt
     dev: false
     optional: true
 
+  /@aws-sdk/client-s3@3.478.0:
+    resolution: {integrity: sha512-OUpbCCnK71lQQ07BohJOx9ZER0rPqRAGOVIIVhNEkeN0uYFLzB7/o5a7+FEPUQXEd5rZRZgbxN5xEmnNW/0Waw==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@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.1
+    transitivePeerDependencies:
+      - aws-crt
+    dev: false
+
   /@aws-sdk/client-sso@3.398.0:
     resolution: {integrity: sha512-CygL0jhfibw4kmWXG/3sfZMFNjcXo66XUuPC4BqZBk8Rj5vFoxp1vZeMkDLzTIk97Nvo5J5Bh+QnXKhub6AckQ==}
     engines: {node: '>=14.0.0'}
@@ -1578,34 +1943,123 @@ packages:
       '@aws-sdk/util-endpoints': 3.398.0
       '@aws-sdk/util-user-agent-browser': 3.398.0
       '@aws-sdk/util-user-agent-node': 3.398.0
-      '@smithy/config-resolver': 2.0.5
-      '@smithy/fetch-http-handler': 2.0.5
-      '@smithy/hash-node': 2.0.5
-      '@smithy/invalid-dependency': 2.0.5
-      '@smithy/middleware-content-length': 2.0.5
-      '@smithy/middleware-endpoint': 2.0.5
-      '@smithy/middleware-retry': 2.0.5
-      '@smithy/middleware-serde': 2.0.5
-      '@smithy/middleware-stack': 2.0.0
-      '@smithy/node-config-provider': 2.0.5
-      '@smithy/node-http-handler': 2.0.5
+      '@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/protocol-http': 2.0.5
-      '@smithy/smithy-client': 2.0.5
-      '@smithy/types': 2.2.2
-      '@smithy/url-parser': 2.0.5
-      '@smithy/util-base64': 2.0.0
-      '@smithy/util-body-length-browser': 2.0.0
+      '@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.5
-      '@smithy/util-defaults-mode-node': 2.0.5
-      '@smithy/util-retry': 2.0.0
-      '@smithy/util-utf8': 2.0.0
+      '@smithy/util-defaults-mode-browser': 2.0.22
+      '@smithy/util-defaults-mode-node': 2.0.29
+      '@smithy/util-retry': 2.0.8
+      '@smithy/util-utf8': 2.0.2
       tslib: 2.6.1
     transitivePeerDependencies:
       - aws-crt
     dev: false
     optional: true
 
+  /@aws-sdk/client-sso@3.451.0:
+    resolution: {integrity: sha512-KkYSke3Pdv3MfVH/5fT528+MKjMyPKlcLcd4zQb0x6/7Bl7EHrPh1JZYjzPLHelb+UY5X0qN8+cb8iSu1eiwIQ==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@aws-crypto/sha256-browser': 3.0.0
+      '@aws-crypto/sha256-js': 3.0.0
+      '@aws-sdk/core': 3.451.0
+      '@aws-sdk/middleware-host-header': 3.451.0
+      '@aws-sdk/middleware-logger': 3.451.0
+      '@aws-sdk/middleware-recursion-detection': 3.451.0
+      '@aws-sdk/middleware-user-agent': 3.451.0
+      '@aws-sdk/region-config-resolver': 3.451.0
+      '@aws-sdk/types': 3.451.0
+      '@aws-sdk/util-endpoints': 3.451.0
+      '@aws-sdk/util-user-agent-browser': 3.451.0
+      '@aws-sdk/util-user-agent-node': 3.451.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/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.1
+    transitivePeerDependencies:
+      - aws-crt
+    dev: false
+
+  /@aws-sdk/client-sso@3.478.0:
+    resolution: {integrity: sha512-Jxy9cE1JMkPR0PklCpq3cORHnZq/Z4klhSTNGgZNeBWovMa+plor52kyh8iUNHKl3XEJvTbHM7V+dvrr/x0P1g==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@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.1
+    transitivePeerDependencies:
+      - aws-crt
+    dev: false
+
   /@aws-sdk/client-sts@3.398.0:
     resolution: {integrity: sha512-/3Pa9wLMvBZipKraq3AtbmTfXW6q9kyvhwOno64f1Fz7kFb8ijQFMGoATS70B2pGEZTlxkUqJFWDiisT6Q6dFg==}
     engines: {node: '>=14.0.0'}
@@ -1623,28 +2077,28 @@ packages:
       '@aws-sdk/util-endpoints': 3.398.0
       '@aws-sdk/util-user-agent-browser': 3.398.0
       '@aws-sdk/util-user-agent-node': 3.398.0
-      '@smithy/config-resolver': 2.0.5
-      '@smithy/fetch-http-handler': 2.0.5
-      '@smithy/hash-node': 2.0.5
-      '@smithy/invalid-dependency': 2.0.5
-      '@smithy/middleware-content-length': 2.0.5
-      '@smithy/middleware-endpoint': 2.0.5
-      '@smithy/middleware-retry': 2.0.5
-      '@smithy/middleware-serde': 2.0.5
-      '@smithy/middleware-stack': 2.0.0
-      '@smithy/node-config-provider': 2.0.5
-      '@smithy/node-http-handler': 2.0.5
+      '@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/protocol-http': 2.0.5
-      '@smithy/smithy-client': 2.0.5
-      '@smithy/types': 2.2.2
-      '@smithy/url-parser': 2.0.5
-      '@smithy/util-base64': 2.0.0
-      '@smithy/util-body-length-browser': 2.0.0
+      '@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.5
-      '@smithy/util-defaults-mode-node': 2.0.5
-      '@smithy/util-retry': 2.0.0
-      '@smithy/util-utf8': 2.0.0
+      '@smithy/util-defaults-mode-browser': 2.0.22
+      '@smithy/util-defaults-mode-node': 2.0.29
+      '@smithy/util-retry': 2.0.8
+      '@smithy/util-utf8': 2.0.2
       fast-xml-parser: 4.2.5
       tslib: 2.6.1
     transitivePeerDependencies:
@@ -1652,14 +2106,130 @@ packages:
     dev: false
     optional: true
 
+  /@aws-sdk/client-sts@3.454.0:
+    resolution: {integrity: sha512-0fDvr8WeB6IYO8BUCzcivWmahgGl/zDbaYfakzGnt4mrl5ztYaXE875WI6b7+oFcKMRvN+KLvwu5TtyFuNY+GQ==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@aws-crypto/sha256-browser': 3.0.0
+      '@aws-crypto/sha256-js': 3.0.0
+      '@aws-sdk/core': 3.451.0
+      '@aws-sdk/credential-provider-node': 3.451.0
+      '@aws-sdk/middleware-host-header': 3.451.0
+      '@aws-sdk/middleware-logger': 3.451.0
+      '@aws-sdk/middleware-recursion-detection': 3.451.0
+      '@aws-sdk/middleware-sdk-sts': 3.451.0
+      '@aws-sdk/middleware-signing': 3.451.0
+      '@aws-sdk/middleware-user-agent': 3.451.0
+      '@aws-sdk/region-config-resolver': 3.451.0
+      '@aws-sdk/types': 3.451.0
+      '@aws-sdk/util-endpoints': 3.451.0
+      '@aws-sdk/util-user-agent-browser': 3.451.0
+      '@aws-sdk/util-user-agent-node': 3.451.0
+      '@smithy/config-resolver': 2.0.19
+      '@smithy/fetch-http-handler': 2.2.7
+      '@smithy/hash-node': 2.0.16
+      '@smithy/invalid-dependency': 2.0.14
+      '@smithy/middleware-content-length': 2.0.16
+      '@smithy/middleware-endpoint': 2.2.1
+      '@smithy/middleware-retry': 2.0.21
+      '@smithy/middleware-serde': 2.0.14
+      '@smithy/middleware-stack': 2.0.8
+      '@smithy/node-config-provider': 2.1.6
+      '@smithy/node-http-handler': 2.1.10
+      '@smithy/protocol-http': 3.0.10
+      '@smithy/smithy-client': 2.1.16
+      '@smithy/types': 2.6.0
+      '@smithy/url-parser': 2.0.14
+      '@smithy/util-base64': 2.0.1
+      '@smithy/util-body-length-browser': 2.0.0
+      '@smithy/util-body-length-node': 2.1.0
+      '@smithy/util-defaults-mode-browser': 2.0.20
+      '@smithy/util-defaults-mode-node': 2.0.26
+      '@smithy/util-endpoints': 1.0.5
+      '@smithy/util-retry': 2.0.7
+      '@smithy/util-utf8': 2.0.2
+      fast-xml-parser: 4.2.5
+      tslib: 2.6.1
+    transitivePeerDependencies:
+      - aws-crt
+    dev: false
+
+  /@aws-sdk/client-sts@3.478.0:
+    resolution: {integrity: sha512-D+QID0dYzmn9dcxgKP3/nMndUqiQbDLsqI0Zf2pG4MW5gPhVNKlDGIV3Ztz8SkMjzGJExNOLW2L569o8jshJVw==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@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.1
+    transitivePeerDependencies:
+      - aws-crt
+    dev: false
+
+  /@aws-sdk/core@3.451.0:
+    resolution: {integrity: sha512-SamWW2zHEf1ZKe3j1w0Piauryl8BQIlej0TBS18A4ACzhjhWXhCs13bO1S88LvPR5mBFXok3XOT6zPOnKDFktw==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@smithy/smithy-client': 2.1.16
+      tslib: 2.6.1
+    dev: false
+
+  /@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.1
+    dev: false
+
   /@aws-sdk/credential-provider-cognito-identity@3.398.0:
     resolution: {integrity: sha512-MFUhy1YayHg5ypRTk4OTfDumQRP+OJBagaGv14kA8DzhKH1sNrU4HV7A7y2J4SvkN5hG/KnLJqxpakCtB2/O2g==}
     engines: {node: '>=14.0.0'}
     dependencies:
       '@aws-sdk/client-cognito-identity': 3.398.0
       '@aws-sdk/types': 3.398.0
-      '@smithy/property-provider': 2.0.5
-      '@smithy/types': 2.2.2
+      '@smithy/property-provider': 2.0.16
+      '@smithy/types': 2.7.0
       tslib: 2.6.1
     transitivePeerDependencies:
       - aws-crt
@@ -1671,12 +2241,32 @@ packages:
     engines: {node: '>=14.0.0'}
     dependencies:
       '@aws-sdk/types': 3.398.0
-      '@smithy/property-provider': 2.0.5
-      '@smithy/types': 2.2.2
+      '@smithy/property-provider': 2.0.16
+      '@smithy/types': 2.7.0
       tslib: 2.6.1
     dev: false
     optional: true
 
+  /@aws-sdk/credential-provider-env@3.451.0:
+    resolution: {integrity: sha512-9dAav7DcRgaF7xCJEQR5ER9ErXxnu/tdnVJ+UPmb1NPeIZdESv1A3lxFDEq1Fs8c4/lzAj9BpshGyJVIZwZDKg==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@aws-sdk/types': 3.451.0
+      '@smithy/property-provider': 2.0.16
+      '@smithy/types': 2.7.0
+      tslib: 2.6.1
+    dev: false
+
+  /@aws-sdk/credential-provider-env@3.468.0:
+    resolution: {integrity: sha512-k/1WHd3KZn0EQYjadooj53FC0z24/e4dUZhbSKTULgmxyO62pwh9v3Brvw4WRa/8o2wTffU/jo54tf4vGuP/ZA==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@aws-sdk/types': 3.468.0
+      '@smithy/property-provider': 2.0.16
+      '@smithy/types': 2.7.0
+      tslib: 2.6.1
+    dev: false
+
   /@aws-sdk/credential-provider-ini@3.398.0:
     resolution: {integrity: sha512-AsK1lStK3nB9Cn6S6ODb1ktGh7SRejsNVQVKX3t5d3tgOaX+aX1Iwy8FzM/ZEN8uCloeRifUGIY9uQFygg5mSw==}
     engines: {node: '>=14.0.0'}
@@ -1686,16 +2276,52 @@ packages:
       '@aws-sdk/credential-provider-sso': 3.398.0
       '@aws-sdk/credential-provider-web-identity': 3.398.0
       '@aws-sdk/types': 3.398.0
-      '@smithy/credential-provider-imds': 2.0.5
-      '@smithy/property-provider': 2.0.5
-      '@smithy/shared-ini-file-loader': 2.0.5
-      '@smithy/types': 2.2.2
+      '@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.1
     transitivePeerDependencies:
       - aws-crt
     dev: false
     optional: true
 
+  /@aws-sdk/credential-provider-ini@3.451.0:
+    resolution: {integrity: sha512-TySt64Ci5/ZbqFw1F9Z0FIGvYx5JSC9e6gqDnizIYd8eMnn8wFRUscRrD7pIHKfrhvVKN5h0GdYovmMO/FMCBw==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@aws-sdk/credential-provider-env': 3.451.0
+      '@aws-sdk/credential-provider-process': 3.451.0
+      '@aws-sdk/credential-provider-sso': 3.451.0
+      '@aws-sdk/credential-provider-web-identity': 3.451.0
+      '@aws-sdk/types': 3.451.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.1
+    transitivePeerDependencies:
+      - aws-crt
+    dev: false
+
+  /@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.1
+    transitivePeerDependencies:
+      - aws-crt
+    dev: false
+
   /@aws-sdk/credential-provider-node@3.398.0:
     resolution: {integrity: sha512-odmI/DSKfuWUYeDnGTCEHBbC8/MwnF6yEq874zl6+owoVv0ZsYP8qBHfiJkYqrwg7wQ7Pi40sSAPC1rhesGwzg==}
     engines: {node: '>=14.0.0'}
@@ -1706,28 +2332,88 @@ packages:
       '@aws-sdk/credential-provider-sso': 3.398.0
       '@aws-sdk/credential-provider-web-identity': 3.398.0
       '@aws-sdk/types': 3.398.0
-      '@smithy/credential-provider-imds': 2.0.5
-      '@smithy/property-provider': 2.0.5
-      '@smithy/shared-ini-file-loader': 2.0.5
-      '@smithy/types': 2.2.2
+      '@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.1
     transitivePeerDependencies:
       - aws-crt
     dev: false
     optional: true
 
+  /@aws-sdk/credential-provider-node@3.451.0:
+    resolution: {integrity: sha512-AEwM1WPyxUdKrKyUsKyFqqRFGU70e4qlDyrtBxJnSU9NRLZI8tfEZ67bN7fHSxBUBODgDXpMSlSvJiBLh5/3pw==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@aws-sdk/credential-provider-env': 3.451.0
+      '@aws-sdk/credential-provider-ini': 3.451.0
+      '@aws-sdk/credential-provider-process': 3.451.0
+      '@aws-sdk/credential-provider-sso': 3.451.0
+      '@aws-sdk/credential-provider-web-identity': 3.451.0
+      '@aws-sdk/types': 3.451.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.1
+    transitivePeerDependencies:
+      - aws-crt
+    dev: false
+
+  /@aws-sdk/credential-provider-node@3.478.0:
+    resolution: {integrity: sha512-nwDutJYeHiIZCQDgKIUrsgwAWTil0mNe+cbd+j8fi+wwxkWUzip+F0+z02molJ8WrUUKNRhqB1V5aVx7IranuA==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@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.1
+    transitivePeerDependencies:
+      - aws-crt
+    dev: false
+
   /@aws-sdk/credential-provider-process@3.398.0:
     resolution: {integrity: sha512-WrkBL1W7TXN508PA9wRXPFtzmGpVSW98gDaHEaa8GolAPHMPa5t2QcC/z/cFpglzrcVv8SA277zu9Z8tELdZhg==}
     engines: {node: '>=14.0.0'}
     dependencies:
       '@aws-sdk/types': 3.398.0
-      '@smithy/property-provider': 2.0.5
-      '@smithy/shared-ini-file-loader': 2.0.5
-      '@smithy/types': 2.2.2
+      '@smithy/property-provider': 2.0.16
+      '@smithy/shared-ini-file-loader': 2.2.7
+      '@smithy/types': 2.7.0
       tslib: 2.6.1
     dev: false
     optional: true
 
+  /@aws-sdk/credential-provider-process@3.451.0:
+    resolution: {integrity: sha512-HQywSdKeD5PErcLLnZfSyCJO+6T+ZyzF+Lm/QgscSC+CbSUSIPi//s15qhBRVely/3KBV6AywxwNH+5eYgt4lQ==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@aws-sdk/types': 3.451.0
+      '@smithy/property-provider': 2.0.16
+      '@smithy/shared-ini-file-loader': 2.2.7
+      '@smithy/types': 2.7.0
+      tslib: 2.6.1
+    dev: false
+
+  /@aws-sdk/credential-provider-process@3.468.0:
+    resolution: {integrity: sha512-OYSn1A/UsyPJ7Z8Q2cNhTf55O36shPmSsvOfND04nSfu1nPaR+VUvvsP7v+brhGpwC/GAKTIdGAo4blH31BS6A==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@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.1
+    dev: false
+
   /@aws-sdk/credential-provider-sso@3.398.0:
     resolution: {integrity: sha512-2Dl35587xbnzR/GGZqA2MnFs8+kS4wbHQO9BioU0okA+8NRueohNMdrdQmQDdSNK4BfIpFspiZmFkXFNyEAfgw==}
     engines: {node: '>=14.0.0'}
@@ -1735,26 +2421,76 @@ packages:
       '@aws-sdk/client-sso': 3.398.0
       '@aws-sdk/token-providers': 3.398.0
       '@aws-sdk/types': 3.398.0
-      '@smithy/property-provider': 2.0.5
-      '@smithy/shared-ini-file-loader': 2.0.5
-      '@smithy/types': 2.2.2
+      '@smithy/property-provider': 2.0.16
+      '@smithy/shared-ini-file-loader': 2.2.7
+      '@smithy/types': 2.7.0
       tslib: 2.6.1
     transitivePeerDependencies:
       - aws-crt
     dev: false
     optional: true
 
+  /@aws-sdk/credential-provider-sso@3.451.0:
+    resolution: {integrity: sha512-Usm/N51+unOt8ID4HnQzxIjUJDrkAQ1vyTOC0gSEEJ7h64NSSPGD5yhN7il5WcErtRd3EEtT1a8/GTC5TdBctg==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@aws-sdk/client-sso': 3.451.0
+      '@aws-sdk/token-providers': 3.451.0
+      '@aws-sdk/types': 3.451.0
+      '@smithy/property-provider': 2.0.16
+      '@smithy/shared-ini-file-loader': 2.2.7
+      '@smithy/types': 2.7.0
+      tslib: 2.6.1
+    transitivePeerDependencies:
+      - aws-crt
+    dev: false
+
+  /@aws-sdk/credential-provider-sso@3.478.0:
+    resolution: {integrity: sha512-LsDShG51X/q+s5ZFN7kHVqrd8ZHdyEyHqdhoocmRvvw2Dif50M0AqQfvCrW1ndj5CNzXO4x/eH8EK5ZOVlS6Sg==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@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.1
+    transitivePeerDependencies:
+      - aws-crt
+    dev: false
+
   /@aws-sdk/credential-provider-web-identity@3.398.0:
     resolution: {integrity: sha512-iG3905Alv9pINbQ8/MIsshgqYMbWx+NDQWpxbIW3W0MkSH3iAqdVpSCteYidYX9G/jv2Um1nW3y360ib20bvNg==}
     engines: {node: '>=14.0.0'}
     dependencies:
       '@aws-sdk/types': 3.398.0
-      '@smithy/property-provider': 2.0.5
-      '@smithy/types': 2.2.2
+      '@smithy/property-provider': 2.0.16
+      '@smithy/types': 2.7.0
       tslib: 2.6.1
     dev: false
     optional: true
 
+  /@aws-sdk/credential-provider-web-identity@3.451.0:
+    resolution: {integrity: sha512-Xtg3Qw65EfDjWNG7o2xD6sEmumPfsy3WDGjk2phEzVg8s7hcZGxf5wYwe6UY7RJvlEKrU0rFA+AMn6Hfj5oOzg==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@aws-sdk/types': 3.451.0
+      '@smithy/property-provider': 2.0.16
+      '@smithy/types': 2.7.0
+      tslib: 2.6.1
+    dev: false
+
+  /@aws-sdk/credential-provider-web-identity@3.468.0:
+    resolution: {integrity: sha512-rexymPmXjtkwCPfhnUq3EjO1rSkf39R4Jz9CqiM7OsqK2qlT5Y/V3gnMKn0ZMXsYaQOMfM3cT5xly5R+OKDHlw==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@aws-sdk/types': 3.468.0
+      '@smithy/property-provider': 2.0.16
+      '@smithy/types': 2.7.0
+      tslib: 2.6.1
+    dev: false
+
   /@aws-sdk/credential-providers@3.398.0:
     resolution: {integrity: sha512-355vXmImn2e85mIWSYDVb101AF2lIVHKNCaH6sV1U/8i0ZOXh2cJYNdkRYrxNt1ezDB0k97lSKvuDx7RDvJyRg==}
     engines: {node: '>=14.0.0'}
@@ -1770,72 +2506,236 @@ packages:
       '@aws-sdk/credential-provider-sso': 3.398.0
       '@aws-sdk/credential-provider-web-identity': 3.398.0
       '@aws-sdk/types': 3.398.0
-      '@smithy/credential-provider-imds': 2.0.5
-      '@smithy/property-provider': 2.0.5
-      '@smithy/types': 2.2.2
+      '@smithy/credential-provider-imds': 2.1.4
+      '@smithy/property-provider': 2.0.16
+      '@smithy/types': 2.7.0
       tslib: 2.6.1
     transitivePeerDependencies:
       - aws-crt
     dev: false
     optional: true
 
+  /@aws-sdk/middleware-bucket-endpoint@3.470.0:
+    resolution: {integrity: sha512-vLXXNWtsRmEIwzJ9HUQfIuTNAsEzvCv0Icsnkvt2BiBZXnmHdp2vIC3e3+kfy1D7dVQloXqMmnfcLu/BUMu2Jw==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@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.1
+    dev: false
+
+  /@aws-sdk/middleware-expect-continue@3.468.0:
+    resolution: {integrity: sha512-/wmLjmfgeulxhhmnxX3X3N933TvGsYckVIFjAtDSpLjqkbwzEcNiLq7AdmNJ4BfxG0MCMgcht561DCCD19x8Bg==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@aws-sdk/types': 3.468.0
+      '@smithy/protocol-http': 3.0.11
+      '@smithy/types': 2.7.0
+      tslib: 2.6.1
+    dev: false
+
+  /@aws-sdk/middleware-flexible-checksums@3.468.0:
+    resolution: {integrity: sha512-LQwL/N5MCj3Y5keLLewHTqeAXUIMsHFZyxDXRm/uxrOon9ufLKDvGvzAmfwn1/CuSUo66ZfT8VPSA4BsC90RtA==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@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.1
+    dev: false
+
   /@aws-sdk/middleware-host-header@3.398.0:
     resolution: {integrity: sha512-m+5laWdBaxIZK2ko0OwcCHJZJ5V1MgEIt8QVQ3k4/kOkN9ICjevOYmba751pHoTnbOYB7zQd6D2OT3EYEEsUcA==}
     engines: {node: '>=14.0.0'}
     dependencies:
       '@aws-sdk/types': 3.398.0
       '@smithy/protocol-http': 2.0.5
-      '@smithy/types': 2.2.2
+      '@smithy/types': 2.7.0
       tslib: 2.6.1
     dev: false
     optional: true
 
+  /@aws-sdk/middleware-host-header@3.451.0:
+    resolution: {integrity: sha512-j8a5jAfhWmsK99i2k8oR8zzQgXrsJtgrLxc3js6U+525mcZytoiDndkWTmD5fjJ1byU1U2E5TaPq+QJeDip05Q==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@aws-sdk/types': 3.451.0
+      '@smithy/protocol-http': 3.0.10
+      '@smithy/types': 2.6.0
+      tslib: 2.6.1
+    dev: false
+
+  /@aws-sdk/middleware-host-header@3.468.0:
+    resolution: {integrity: sha512-gwQ+/QhX+lhof304r6zbZ/V5l5cjhGRxLL3CjH1uJPMcOAbw9wUlMdl+ibr8UwBZ5elfKFGiB1cdW/0uMchw0w==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@aws-sdk/types': 3.468.0
+      '@smithy/protocol-http': 3.0.11
+      '@smithy/types': 2.7.0
+      tslib: 2.6.1
+    dev: false
+
+  /@aws-sdk/middleware-location-constraint@3.468.0:
+    resolution: {integrity: sha512-0gBX/lDynQr4YIhM9h1dVnkVWqrg+34iOCVIUq8jHxzUzgZWglGkG9lHGGg0r1xkLTmegeoo1OKH8wrQ6n33Cg==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@aws-sdk/types': 3.468.0
+      '@smithy/types': 2.7.0
+      tslib: 2.6.1
+    dev: false
+
   /@aws-sdk/middleware-logger@3.398.0:
     resolution: {integrity: sha512-CiJjW+FL12elS6Pn7/UVjVK8HWHhXMfvHZvOwx/Qkpy340sIhkuzOO6fZEruECDTZhl2Wqn81XdJ1ZQ4pRKpCg==}
     engines: {node: '>=14.0.0'}
     dependencies:
       '@aws-sdk/types': 3.398.0
-      '@smithy/types': 2.2.2
+      '@smithy/types': 2.7.0
       tslib: 2.6.1
     dev: false
     optional: true
 
+  /@aws-sdk/middleware-logger@3.451.0:
+    resolution: {integrity: sha512-0kHrYEyVeB2QBfP6TfbI240aRtatLZtcErJbhpiNUb+CQPgEL3crIjgVE8yYiJumZ7f0jyjo8HLPkwD1/2APaw==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@aws-sdk/types': 3.451.0
+      '@smithy/types': 2.6.0
+      tslib: 2.6.1
+    dev: false
+
+  /@aws-sdk/middleware-logger@3.468.0:
+    resolution: {integrity: sha512-X5XHKV7DHRXI3f29SAhJPe/OxWRFgDWDMMCALfzhmJfCi6Jfh0M14cJKoC+nl+dk9lB+36+jKjhjETZaL2bPlA==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@aws-sdk/types': 3.468.0
+      '@smithy/types': 2.7.0
+      tslib: 2.6.1
+    dev: false
+
   /@aws-sdk/middleware-recursion-detection@3.398.0:
     resolution: {integrity: sha512-7QpOqPQAZNXDXv6vsRex4R8dLniL0E/80OPK4PPFsrCh9btEyhN9Begh4i1T+5lL28hmYkztLOkTQ2N5J3hgRQ==}
     engines: {node: '>=14.0.0'}
     dependencies:
       '@aws-sdk/types': 3.398.0
       '@smithy/protocol-http': 2.0.5
-      '@smithy/types': 2.2.2
+      '@smithy/types': 2.7.0
       tslib: 2.6.1
     dev: false
     optional: true
 
+  /@aws-sdk/middleware-recursion-detection@3.451.0:
+    resolution: {integrity: sha512-J6jL6gJ7orjHGM70KDRcCP7so/J2SnkN4vZ9YRLTeeZY6zvBuHDjX8GCIgSqPn/nXFXckZO8XSnA7u6+3TAT0w==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@aws-sdk/types': 3.451.0
+      '@smithy/protocol-http': 3.0.10
+      '@smithy/types': 2.6.0
+      tslib: 2.6.1
+    dev: false
+
+  /@aws-sdk/middleware-recursion-detection@3.468.0:
+    resolution: {integrity: sha512-vch9IQib2Ng9ucSyRW2eKNQXHUPb5jUPCLA5otTW/8nGjcOU37LxQG4WrxO7uaJ9Oe8hjHO+hViE3P0KISUhtA==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@aws-sdk/types': 3.468.0
+      '@smithy/protocol-http': 3.0.11
+      '@smithy/types': 2.7.0
+      tslib: 2.6.1
+    dev: false
+
+  /@aws-sdk/middleware-sdk-s3@3.474.0:
+    resolution: {integrity: sha512-62aAo/8u5daIabeJ+gseYeHeShe9eYH6mH+kfWmLsHybXCCv1EaD/ZkdXWNhL0HZ3bUI1z1SF1p8jjTAWALnwA==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@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.1
+    dev: false
+
   /@aws-sdk/middleware-sdk-sts@3.398.0:
     resolution: {integrity: sha512-+JH76XHEgfVihkY+GurohOQ5Z83zVN1nYcQzwCFnCDTh4dG4KwhnZKG+WPw6XJECocY0R+H0ivofeALHvVWJtQ==}
     engines: {node: '>=14.0.0'}
     dependencies:
       '@aws-sdk/middleware-signing': 3.398.0
       '@aws-sdk/types': 3.398.0
-      '@smithy/types': 2.2.2
+      '@smithy/types': 2.7.0
       tslib: 2.6.1
     dev: false
     optional: true
 
+  /@aws-sdk/middleware-sdk-sts@3.451.0:
+    resolution: {integrity: sha512-UJ6UfVUEgp0KIztxpAeelPXI5MLj9wUtUCqYeIMP7C1ZhoEMNm3G39VLkGN43dNhBf1LqjsV9jkKMZbVfYXuwg==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@aws-sdk/middleware-signing': 3.451.0
+      '@aws-sdk/types': 3.451.0
+      '@smithy/types': 2.7.0
+      tslib: 2.6.1
+    dev: false
+
   /@aws-sdk/middleware-signing@3.398.0:
     resolution: {integrity: sha512-O0KqXAix1TcvZBFt1qoFkHMUNJOSgjJTYS7lFTRKSwgsD27bdW2TM2r9R8DAccWFt5Amjkdt+eOwQMIXPGTm8w==}
     engines: {node: '>=14.0.0'}
     dependencies:
       '@aws-sdk/types': 3.398.0
-      '@smithy/property-provider': 2.0.5
+      '@smithy/property-provider': 2.0.16
       '@smithy/protocol-http': 2.0.5
       '@smithy/signature-v4': 2.0.5
-      '@smithy/types': 2.2.2
-      '@smithy/util-middleware': 2.0.0
+      '@smithy/types': 2.7.0
+      '@smithy/util-middleware': 2.0.8
       tslib: 2.6.1
     dev: false
     optional: true
 
+  /@aws-sdk/middleware-signing@3.451.0:
+    resolution: {integrity: sha512-s5ZlcIoLNg1Huj4Qp06iKniE8nJt/Pj1B/fjhWc6cCPCM7XJYUCejCnRh6C5ZJoBEYodjuwZBejPc1Wh3j+znA==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@aws-sdk/types': 3.451.0
+      '@smithy/property-provider': 2.0.15
+      '@smithy/protocol-http': 3.0.10
+      '@smithy/signature-v4': 2.0.5
+      '@smithy/types': 2.6.0
+      '@smithy/util-middleware': 2.0.7
+      tslib: 2.6.1
+    dev: false
+
+  /@aws-sdk/middleware-signing@3.468.0:
+    resolution: {integrity: sha512-s+7fSB1gdnnTj5O0aCCarX3z5Vppop8kazbNSZADdkfHIDWCN80IH4ZNjY3OWqaAz0HmR4LNNrovdR304ojb4Q==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@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.1
+    dev: false
+
+  /@aws-sdk/middleware-ssec@3.468.0:
+    resolution: {integrity: sha512-y1qLW24wRkOGBTK5d6eJXf6d8HYo4rzT4a1mNDN1rd18NSffwQ6Yke5qeUiIaxa0y/l+FvvNYErbhYtij2rJoQ==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@aws-sdk/types': 3.468.0
+      '@smithy/types': 2.7.0
+      tslib: 2.6.1
+    dev: false
+
   /@aws-sdk/middleware-user-agent@3.398.0:
     resolution: {integrity: sha512-nF1jg0L+18b5HvTcYzwyFgfZQQMELJINFqI0mi4yRKaX7T5a3aGp5RVLGGju/6tAGTuFbfBoEhkhU3kkxexPYQ==}
     engines: {node: '>=14.0.0'}
@@ -1843,11 +2743,67 @@ packages:
       '@aws-sdk/types': 3.398.0
       '@aws-sdk/util-endpoints': 3.398.0
       '@smithy/protocol-http': 2.0.5
-      '@smithy/types': 2.2.2
+      '@smithy/types': 2.7.0
       tslib: 2.6.1
     dev: false
     optional: true
 
+  /@aws-sdk/middleware-user-agent@3.451.0:
+    resolution: {integrity: sha512-8NM/0JiKLNvT9wtAQVl1DFW0cEO7OvZyLSUBLNLTHqyvOZxKaZ8YFk7d8PL6l76LeUKRxq4NMxfZQlUIRe0eSA==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@aws-sdk/types': 3.451.0
+      '@aws-sdk/util-endpoints': 3.451.0
+      '@smithy/protocol-http': 3.0.10
+      '@smithy/types': 2.6.0
+      tslib: 2.6.1
+    dev: false
+
+  /@aws-sdk/middleware-user-agent@3.478.0:
+    resolution: {integrity: sha512-Rec+nAPIzzwxgHPW+xqY6tooJGFOytpYg/xSRv8/IXl3xKGhmpMGs6gDWzmMBv/qy5nKTvLph/csNWJ98GWXCw==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@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.1
+    dev: false
+
+  /@aws-sdk/region-config-resolver@3.451.0:
+    resolution: {integrity: sha512-3iMf4OwzrFb4tAAmoROXaiORUk2FvSejnHIw/XHvf/jjR4EqGGF95NZP/n/MeFZMizJWVssrwS412GmoEyoqhg==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@smithy/node-config-provider': 2.1.6
+      '@smithy/types': 2.6.0
+      '@smithy/util-config-provider': 2.0.0
+      '@smithy/util-middleware': 2.0.7
+      tslib: 2.6.1
+    dev: false
+
+  /@aws-sdk/region-config-resolver@3.470.0:
+    resolution: {integrity: sha512-C1o1J06iIw8cyAAOvHqT4Bbqf+PgQ/RDlSyjt2gFfP2OovDpc2o2S90dE8f8iZdSGpg70N5MikT1DBhW9NbhtQ==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@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.1
+    dev: false
+
+  /@aws-sdk/signature-v4-multi-region@3.474.0:
+    resolution: {integrity: sha512-93OWRQgTJZASXLrlUNX7mmXknNkYxFYldRLARmYQccONmnIqgYQW0lQj8BFwqkHJTzSMik3/UsU0SHKwZ9ynYA==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@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.1
+    dev: false
+
   /@aws-sdk/token-providers@3.398.0:
     resolution: {integrity: sha512-nrYgjzavGCKJL/48Vt0EL+OlIc5UZLfNGpgyUW9cv3XZwl+kXV0QB+HH0rHZZLfpbBgZ2RBIJR9uD5ieu/6hpQ==}
     engines: {node: '>=14.0.0'}
@@ -1862,45 +2818,164 @@ packages:
       '@aws-sdk/util-endpoints': 3.398.0
       '@aws-sdk/util-user-agent-browser': 3.398.0
       '@aws-sdk/util-user-agent-node': 3.398.0
-      '@smithy/config-resolver': 2.0.5
-      '@smithy/fetch-http-handler': 2.0.5
-      '@smithy/hash-node': 2.0.5
-      '@smithy/invalid-dependency': 2.0.5
-      '@smithy/middleware-content-length': 2.0.5
-      '@smithy/middleware-endpoint': 2.0.5
-      '@smithy/middleware-retry': 2.0.5
-      '@smithy/middleware-serde': 2.0.5
-      '@smithy/middleware-stack': 2.0.0
-      '@smithy/node-config-provider': 2.0.5
-      '@smithy/node-http-handler': 2.0.5
-      '@smithy/property-provider': 2.0.5
+      '@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': 2.0.5
-      '@smithy/shared-ini-file-loader': 2.0.5
-      '@smithy/smithy-client': 2.0.5
-      '@smithy/types': 2.2.2
-      '@smithy/url-parser': 2.0.5
-      '@smithy/util-base64': 2.0.0
-      '@smithy/util-body-length-browser': 2.0.0
+      '@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.5
-      '@smithy/util-defaults-mode-node': 2.0.5
-      '@smithy/util-retry': 2.0.0
-      '@smithy/util-utf8': 2.0.0
+      '@smithy/util-defaults-mode-browser': 2.0.22
+      '@smithy/util-defaults-mode-node': 2.0.29
+      '@smithy/util-retry': 2.0.8
+      '@smithy/util-utf8': 2.0.2
       tslib: 2.6.1
     transitivePeerDependencies:
       - aws-crt
     dev: false
     optional: true
 
+  /@aws-sdk/token-providers@3.451.0:
+    resolution: {integrity: sha512-ij1L5iUbn6CwxVOT1PG4NFjsrsKN9c4N1YEM0lkl6DwmaNOscjLKGSNyj9M118vSWsOs1ZDbTwtj++h0O/BWrQ==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@aws-crypto/sha256-browser': 3.0.0
+      '@aws-crypto/sha256-js': 3.0.0
+      '@aws-sdk/middleware-host-header': 3.451.0
+      '@aws-sdk/middleware-logger': 3.451.0
+      '@aws-sdk/middleware-recursion-detection': 3.451.0
+      '@aws-sdk/middleware-user-agent': 3.451.0
+      '@aws-sdk/region-config-resolver': 3.451.0
+      '@aws-sdk/types': 3.451.0
+      '@aws-sdk/util-endpoints': 3.451.0
+      '@aws-sdk/util-user-agent-browser': 3.451.0
+      '@aws-sdk/util-user-agent-node': 3.451.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.1
+    transitivePeerDependencies:
+      - aws-crt
+    dev: false
+
+  /@aws-sdk/token-providers@3.478.0:
+    resolution: {integrity: sha512-7b5tj1y/wGHZIZ+ckjOUKgKrMuCJMF/G1UKZKIqqdekeEsjcThbvoxAMeY0FEowu2ODVk/ggOmpBFxcu0iYd6A==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@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.1
+    transitivePeerDependencies:
+      - aws-crt
+    dev: false
+
+  /@aws-sdk/types@3.357.0:
+    resolution: {integrity: sha512-/riCRaXg3p71BeWnShrai0y0QTdXcouPSM0Cn1olZbzTf7s71aLEewrc96qFrL70XhY4XvnxMpqQh+r43XIL3g==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      tslib: 2.6.1
+
   /@aws-sdk/types@3.398.0:
     resolution: {integrity: sha512-r44fkS+vsEgKCuEuTV+TIk0t0m5ZlXHNjSDYEUvzLStbbfUFiNus/YG4UCa0wOk9R7VuQI67badsvvPeVPCGDQ==}
     engines: {node: '>=14.0.0'}
     dependencies:
-      '@smithy/types': 2.2.2
+      '@smithy/types': 2.7.0
       tslib: 2.6.1
     dev: false
     optional: true
 
+  /@aws-sdk/types@3.451.0:
+    resolution: {integrity: sha512-rhK+qeYwCIs+laJfWCcrYEjay2FR/9VABZJ2NRM89jV/fKqGVQR52E5DQqrI+oEIL5JHMhhnr4N4fyECMS35lw==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@smithy/types': 2.7.0
+      tslib: 2.6.1
+    dev: false
+
+  /@aws-sdk/types@3.468.0:
+    resolution: {integrity: sha512-rx/9uHI4inRbp2tw3Y4Ih4PNZkVj32h7WneSg3MVgVjAoVD5Zti9KhS5hkvsBxfgmQmg0AQbE+b1sy5WGAgntA==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@smithy/types': 2.7.0
+      tslib: 2.6.1
+    dev: false
+
+  /@aws-sdk/util-arn-parser@3.465.0:
+    resolution: {integrity: sha512-zOJ82vzDJFqBX9yZBlNeHHrul/kpx/DCoxzW5UBbZeb26kfV53QhMSoEmY8/lEbBqlqargJ/sgRC845GFhHNQw==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      tslib: 2.6.1
+    dev: false
+
   /@aws-sdk/util-endpoints@3.398.0:
     resolution: {integrity: sha512-Fy0gLYAei/Rd6BrXG4baspCnWTUSd0NdokU1pZh4KlfEAEN1i8SPPgfiO5hLk7+2inqtCmqxVJlfqbMVe9k4bw==}
     engines: {node: '>=14.0.0'}
@@ -1910,24 +2985,59 @@ packages:
     dev: false
     optional: true
 
+  /@aws-sdk/util-endpoints@3.451.0:
+    resolution: {integrity: sha512-giqLGBTnRIcKkDqwU7+GQhKbtJ5Ku35cjGQIfMyOga6pwTBUbaK0xW1Sdd8sBQ1GhApscnChzI9o/R9x0368vw==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@aws-sdk/types': 3.451.0
+      '@smithy/util-endpoints': 1.0.5
+      tslib: 2.6.1
+    dev: false
+
+  /@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.1
+    dev: false
+
   /@aws-sdk/util-locate-window@3.310.0:
     resolution: {integrity: sha512-qo2t/vBTnoXpjKxlsC2e1gBrRm80M3bId27r0BRB2VniSSe7bL1mmzM+/HFtujm0iAxtPM+aLEflLJlJeDPg0w==}
     engines: {node: '>=14.0.0'}
     dependencies:
       tslib: 2.6.1
     dev: false
-    optional: true
 
   /@aws-sdk/util-user-agent-browser@3.398.0:
     resolution: {integrity: sha512-A3Tzx1tkDHlBT+IgxmsMCHbV8LM7SwwCozq2ZjJRx0nqw3MCrrcxQFXldHeX/gdUMO+0Oocb7HGSnVODTq+0EA==}
     dependencies:
       '@aws-sdk/types': 3.398.0
-      '@smithy/types': 2.2.2
+      '@smithy/types': 2.7.0
       bowser: 2.11.0
       tslib: 2.6.1
     dev: false
     optional: true
 
+  /@aws-sdk/util-user-agent-browser@3.451.0:
+    resolution: {integrity: sha512-Ws5mG3J0TQifH7OTcMrCTexo7HeSAc3cBgjfhS/ofzPUzVCtsyg0G7I6T7wl7vJJETix2Kst2cpOsxygPgPD9w==}
+    dependencies:
+      '@aws-sdk/types': 3.451.0
+      '@smithy/types': 2.6.0
+      bowser: 2.11.0
+      tslib: 2.6.1
+    dev: false
+
+  /@aws-sdk/util-user-agent-browser@3.468.0:
+    resolution: {integrity: sha512-OJyhWWsDEizR3L+dCgMXSUmaCywkiZ7HSbnQytbeKGwokIhD69HTiJcibF/sgcM5gk4k3Mq3puUhGnEZ46GIig==}
+    dependencies:
+      '@aws-sdk/types': 3.468.0
+      '@smithy/types': 2.7.0
+      bowser: 2.11.0
+      tslib: 2.6.1
+    dev: false
+
   /@aws-sdk/util-user-agent-node@3.398.0:
     resolution: {integrity: sha512-RTVQofdj961ej4//fEkppFf4KXqKGMTCqJYghx3G0C/MYXbg7MGl7LjfNGtJcboRE8pfHHQ/TUWBDA7RIAPPlQ==}
     engines: {node: '>=14.0.0'}
@@ -1938,18 +3048,55 @@ packages:
         optional: true
     dependencies:
       '@aws-sdk/types': 3.398.0
-      '@smithy/node-config-provider': 2.0.5
-      '@smithy/types': 2.2.2
+      '@smithy/node-config-provider': 2.1.8
+      '@smithy/types': 2.7.0
       tslib: 2.6.1
     dev: false
     optional: true
 
+  /@aws-sdk/util-user-agent-node@3.451.0:
+    resolution: {integrity: sha512-TBzm6P+ql4mkGFAjPlO1CI+w3yUT+NulaiALjl/jNX/nnUp6HsJsVxJf4nVFQTG5KRV0iqMypcs7I3KIhH+LmA==}
+    engines: {node: '>=14.0.0'}
+    peerDependencies:
+      aws-crt: '>=1.0.0'
+    peerDependenciesMeta:
+      aws-crt:
+        optional: true
+    dependencies:
+      '@aws-sdk/types': 3.451.0
+      '@smithy/node-config-provider': 2.1.6
+      '@smithy/types': 2.6.0
+      tslib: 2.6.1
+    dev: false
+
+  /@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:
+      '@aws-sdk/types': 3.468.0
+      '@smithy/node-config-provider': 2.1.8
+      '@smithy/types': 2.7.0
+      tslib: 2.6.1
+    dev: false
+
   /@aws-sdk/util-utf8-browser@3.259.0:
     resolution: {integrity: sha512-UvFa/vR+e19XookZF8RzFZBrw2EUkQWxiBW0yYQAhvk3C+QVGl0H3ouca8LDBlBfQKXwmW3huo/59H8rwb1wJw==}
     dependencies:
       tslib: 2.6.1
     dev: false
-    optional: true
+
+  /@aws-sdk/xml-builder@3.472.0:
+    resolution: {integrity: sha512-PwjVxz1hr9up8QkddabuScPZ/d5aDHgvHYgK4acHYzltXL4wngfvimi5ZqXTzVWF2QANxHmWnHUr45QJX71oJQ==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@smithy/types': 2.7.0
+      tslib: 2.6.1
+    dev: false
 
   /@azure/abort-controller@1.1.0:
     resolution: {integrity: sha512-TrRLIoSQVzfAJX9H1JeFjzAoDGcoK1IYX1UImfceTZpsyYfWr09Ss1aHW1y5TrrR3iq6RZLBwJ3E24uwPhwahw==}
@@ -2004,7 +3151,7 @@ packages:
       '@types/node-fetch': 2.6.4
       '@types/tunnel': 0.0.3
       form-data: 4.0.0
-      node-fetch: 2.6.8
+      node-fetch: 2.7.0(encoding@0.1.13)
       process: 0.11.10
       tough-cookie: 4.1.3
       tslib: 2.6.1
@@ -2125,6 +3272,7 @@ packages:
   /@azure/msal-browser@2.30.0:
     resolution: {integrity: sha512-4Y9+rjJiTFP7KEmuq1btmIrBgk0ImNyKsXj6A6NHZALd1X0M6W7L7kxpH6F+d1tEkMv8bYnZdn7IcauXbL8Llw==}
     engines: {node: '>=0.8.0'}
+    deprecated: A newer major version of this library is available. Please upgrade to the latest available version.
     dependencies:
       '@azure/msal-common': 7.6.0
     dev: false
@@ -2137,6 +3285,7 @@ packages:
   /@azure/msal-node@1.14.2:
     resolution: {integrity: sha512-t3whVhhLdZVVeDEtUPD2Wqfa8BDi3EDMnpWp8dbuRW0GhUpikBfs4AQU0Fe6P9zS87n9LpmUTLrIcPEEuzkvfA==}
     engines: {node: 10 || 12 || 14 || 16 || 18}
+    deprecated: A newer major version of this library is available. Please upgrade to the latest available version.
     dependencies:
       '@azure/msal-common': 7.6.0
       jsonwebtoken: 9.0.0
@@ -2166,6 +3315,15 @@ packages:
       '@babel/highlight': 7.22.5
     dev: true
 
+  /@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
+    dev: true
+    optional: true
+
   /@babel/compat-data@7.22.9:
     resolution: {integrity: sha512-5UamI7xkUcJ3i9qVDS+KFDEK8/7oJ55/sJMB1Ge7IEapr7KfdfV/HErR+koZwOfd+SgtFKOKRhRakdg++DcJpQ==}
     engines: {node: '>=6.9.0'}
@@ -2232,24 +3390,6 @@ packages:
       semver: 7.5.4
     dev: true
 
-  /@babel/helper-create-class-features-plugin@7.21.8(@babel/core@7.22.9):
-    resolution: {integrity: sha512-+THiN8MqiH2AczyuZrnrKL6cAxFRRQDKW9h1YkBvbgKmAm6mwiacig1qT73DHIWMGo40GRnsEfN3LA+E6NtmSw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0
-    dependencies:
-      '@babel/core': 7.22.9
-      '@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.21.5
-      '@babel/helper-optimise-call-expression': 7.22.5
-      '@babel/helper-replace-supers': 7.22.9(@babel/core@7.22.9)
-      '@babel/helper-skip-transparent-expression-wrappers': 7.22.5
-      '@babel/helper-split-export-declaration': 7.22.6
-      semver: 7.5.4
-    dev: true
-
   /@babel/helper-create-class-features-plugin@7.22.9(@babel/core@7.22.9):
     resolution: {integrity: sha512-Pwyi89uO4YrGKxL/eNJ8lfEH55DnRloGPOseaA8NFNL6jAUnn+KccaISiFazCj5IolPPDjGSdzQzXVzODVRqUQ==}
     engines: {node: '>=6.9.0'}
@@ -2268,17 +3408,6 @@ packages:
       semver: 7.5.4
     dev: true
 
-  /@babel/helper-create-regexp-features-plugin@7.20.5(@babel/core@7.22.9):
-    resolution: {integrity: sha512-m68B1lkg3XDGX5yCvGO0kPx3v9WIYLnzjKfPcQiwntEQa5ZeRkPmo2X/ISJc8qxWGfwUr+kvZAeEzAwLec2r2w==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0
-    dependencies:
-      '@babel/core': 7.22.9
-      '@babel/helper-annotate-as-pure': 7.22.5
-      regexpu-core: 5.2.2
-    dev: true
-
   /@babel/helper-create-regexp-features-plugin@7.22.9(@babel/core@7.22.9):
     resolution: {integrity: sha512-+svjVa/tFwsNSG4NEy1h85+HQ5imbT92Q5/bgtS7P0GTQlP8WuFdqsiABmQouhiFGyV66oGxZFpeYHza1rNsKw==}
     engines: {node: '>=6.9.0'}
@@ -2301,7 +3430,7 @@ packages:
       '@babel/helper-plugin-utils': 7.22.5
       debug: 4.3.4(supports-color@8.1.1)
       lodash.debounce: 4.0.8
-      resolve: 1.22.3
+      resolve: 1.22.8
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -2326,13 +3455,6 @@ packages:
       '@babel/types': 7.22.5
     dev: true
 
-  /@babel/helper-member-expression-to-functions@7.21.5:
-    resolution: {integrity: sha512-nIcGfgwpH2u4n9GG1HpStW5Ogx7x7ekiFHbjjFRKXbn5zUvqO9ZgotCO4x1aNbKn/x/xOUaXEhyNHCwtFCpxWg==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/types': 7.22.5
-    dev: true
-
   /@babel/helper-member-expression-to-functions@7.22.5:
     resolution: {integrity: sha512-aBiH1NKMG0H2cGZqspNvsaBe6wNGjbJjuLy29aU+eDZjSbbN53BaxlpB02xm9v34pLTZ1nIQPFYn2qMZoa5BQQ==}
     engines: {node: '>=6.9.0'}
@@ -2358,7 +3480,7 @@ packages:
       '@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.5
+      '@babel/helper-validator-identifier': 7.22.20
     dev: true
 
   /@babel/helper-optimise-call-expression@7.22.5:
@@ -2368,11 +3490,6 @@ packages:
       '@babel/types': 7.22.5
     dev: true
 
-  /@babel/helper-plugin-utils@7.21.5:
-    resolution: {integrity: sha512-0WDaIlXKOX/3KfBK/dwP1oQGiPh6rjMkT7HIRv7i5RR2VUMwrx5ZL0dwBkKx7+SW1zwNdgjHd34IMk5ZjTeHVg==}
-    engines: {node: '>=6.9.0'}
-    dev: true
-
   /@babel/helper-plugin-utils@7.22.5:
     resolution: {integrity: sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==}
     engines: {node: '>=6.9.0'}
@@ -2423,17 +3540,17 @@ packages:
       '@babel/types': 7.22.5
     dev: true
 
-  /@babel/helper-string-parser@7.21.5:
-    resolution: {integrity: sha512-5pTUx3hAJaZIdW99sJ6ZUUgWq/Y+Hja7TowEnLNMm1VivRgZQL3vpBY3qUACVsvw+yQU6+YgfBVmcbLaZtrA1w==}
-    engines: {node: '>=6.9.0'}
-    dev: true
-
   /@babel/helper-string-parser@7.22.5:
     resolution: {integrity: sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==}
     engines: {node: '>=6.9.0'}
 
-  /@babel/helper-validator-identifier@7.22.5:
-    resolution: {integrity: sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==}
+  /@babel/helper-string-parser@7.23.4:
+    resolution: {integrity: sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==}
+    engines: {node: '>=6.9.0'}
+    dev: true
+
+  /@babel/helper-validator-identifier@7.22.20:
+    resolution: {integrity: sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==}
     engines: {node: '>=6.9.0'}
 
   /@babel/helper-validator-option@7.22.5:
@@ -2465,11 +3582,21 @@ packages:
     resolution: {integrity: sha512-BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/helper-validator-identifier': 7.22.5
+      '@babel/helper-validator-identifier': 7.22.20
       chalk: 2.4.2
       js-tokens: 4.0.0
     dev: true
 
+  /@babel/highlight@7.23.4:
+    resolution: {integrity: sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/helper-validator-identifier': 7.22.20
+      chalk: 2.4.2
+      js-tokens: 4.0.0
+    dev: true
+    optional: true
+
   /@babel/parser@7.22.7:
     resolution: {integrity: sha512-7NF8pOkHP5o2vpmGgNGcfAeCvOYhGLyA3Z4eBQkT1RJlWu47n63bCs93QfJ2hIAFCil7L5P2IWhs1oToVgrL0Q==}
     engines: {node: '>=6.0.0'}
@@ -2477,6 +3604,14 @@ packages:
     dependencies:
       '@babel/types': 7.22.5
 
+  /@babel/parser@7.23.6:
+    resolution: {integrity: sha512-Z2uID7YJ7oNvAI20O9X0bblw7Qqs8Q2hFy0R9tAfnfLkp5MW0UH9eUvnDSnFwKZ0AvgS1ucqR4KzvVHgnke1VQ==}
+    engines: {node: '>=6.0.0'}
+    hasBin: true
+    dependencies:
+      '@babel/types': 7.23.6
+    dev: true
+
   /@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@7.22.5(@babel/core@7.22.9):
     resolution: {integrity: sha512-NP1M5Rf+u2Gw9qfSO4ihjcTGW5zXTi36ITLd4/EoAcEhIZ0yjMqmftDNl3QC19CX7olhrjpyU454g/2W7X0jvQ==}
     engines: {node: '>=6.9.0'}
@@ -2502,17 +3637,19 @@ packages:
   /@babel/plugin-proposal-class-properties@7.18.6(@babel/core@7.22.9):
     resolution: {integrity: sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==}
     engines: {node: '>=6.9.0'}
+    deprecated: This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-class-properties instead.
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.22.9
-      '@babel/helper-create-class-features-plugin': 7.21.8(@babel/core@7.22.9)
+      '@babel/helper-create-class-features-plugin': 7.22.9(@babel/core@7.22.9)
       '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
   /@babel/plugin-proposal-nullish-coalescing-operator@7.18.6(@babel/core@7.22.9):
     resolution: {integrity: sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==}
     engines: {node: '>=6.9.0'}
+    deprecated: This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-nullish-coalescing-operator instead.
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
@@ -2524,6 +3661,7 @@ packages:
   /@babel/plugin-proposal-optional-chaining@7.21.0(@babel/core@7.22.9):
     resolution: {integrity: sha512-p4zeefM72gpmEe2fkUr/OnOXpWEf8nAgk7ZYVqqfFiyIG7oFfVZcCrU64hWn5xp4tQ9LkV4bTIa5rD0KANpKNA==}
     engines: {node: '>=6.9.0'}
+    deprecated: This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-optional-chaining instead.
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
@@ -2545,6 +3683,7 @@ packages:
   /@babel/plugin-proposal-unicode-property-regex@7.18.6(@babel/core@7.22.9):
     resolution: {integrity: sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==}
     engines: {node: '>=4'}
+    deprecated: This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-unicode-property-regex instead.
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
@@ -2757,7 +3896,7 @@ packages:
       '@babel/core': ^7.0.0
     dependencies:
       '@babel/core': 7.22.9
-      '@babel/helper-create-regexp-features-plugin': 7.20.5(@babel/core@7.22.9)
+      '@babel/helper-create-regexp-features-plugin': 7.22.9(@babel/core@7.22.9)
       '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
@@ -3018,18 +4157,6 @@ packages:
       '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-modules-commonjs@7.21.5(@babel/core@7.22.9):
-    resolution: {integrity: sha512-OVryBEgKUbtqMoB7eG2rs6UFexJi6Zj6FDXx+esBLPTCxCNxAY9o+8Di7IsUGJ+AVhp5ncK0fxWUBd0/1gPhrQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.22.9
-      '@babel/helper-module-transforms': 7.22.9(@babel/core@7.22.9)
-      '@babel/helper-plugin-utils': 7.22.5
-      '@babel/helper-simple-access': 7.22.5
-    dev: true
-
   /@babel/plugin-transform-modules-commonjs@7.22.5(@babel/core@7.22.9):
     resolution: {integrity: sha512-B4pzOXj+ONRmuaQTg05b3y/4DuFz3WcCNAXPLb2Q0GT0TrGKGxNKV4jwsXts+StaM0LQczZbOpj8o1DLPDJIiA==}
     engines: {node: '>=6.9.0'}
@@ -3052,7 +4179,7 @@ packages:
       '@babel/helper-hoist-variables': 7.22.5
       '@babel/helper-module-transforms': 7.22.9(@babel/core@7.22.9)
       '@babel/helper-plugin-utils': 7.22.5
-      '@babel/helper-validator-identifier': 7.22.5
+      '@babel/helper-validator-identifier': 7.22.20
     dev: true
 
   /@babel/plugin-transform-modules-umd@7.22.5(@babel/core@7.22.9):
@@ -3480,13 +4607,15 @@ packages:
     dependencies:
       regenerator-runtime: 0.13.11
 
-  /@babel/template@7.20.7:
-    resolution: {integrity: sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==}
+  /@babel/runtime@7.23.6:
+    resolution: {integrity: sha512-zHd0eUrf5GZoOWVCXp6koAKQTfZV07eit6bGPmJgnZdnSAvvZee6zniW2XMF7Cmc4ISOOnPy3QaSiIJGJkVEDQ==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/code-frame': 7.22.5
-      '@babel/parser': 7.22.7
-      '@babel/types': 7.22.5
+      regenerator-runtime: 0.14.1
+
+  /@babel/standalone@7.23.6:
+    resolution: {integrity: sha512-+AzS6BZwZdSosrgS/TiGDYLxtlefARKClWgJ4ql//XfmV9KbPWbkEekvbvDRJ8a6qog8E9j3CziHLz5dbIEMyw==}
+    engines: {node: '>=6.9.0'}
     dev: true
 
   /@babel/template@7.22.5:
@@ -3516,70 +4645,70 @@ packages:
       - supports-color
     dev: true
 
-  /@babel/types@7.21.5:
-    resolution: {integrity: sha512-m4AfNvVF2mVC/F7fDEdH2El3HzUg9It/XsCxZiOTTA3m3qYfcSVSbTfM6Q9xG+hYDniZssYhlXKKUMD5m8tF4Q==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/helper-string-parser': 7.21.5
-      '@babel/helper-validator-identifier': 7.22.5
-      to-fast-properties: 2.0.0
-    dev: true
-
   /@babel/types@7.22.5:
     resolution: {integrity: sha512-zo3MIHGOkPOfoRXitsgHLjEXmlDaD/5KU1Uzuc9GNiZPhSqVxVRtxuPaSBZDsYZ9qV88AjtMtWW7ww98loJ9KA==}
     engines: {node: '>=6.9.0'}
     dependencies:
       '@babel/helper-string-parser': 7.22.5
-      '@babel/helper-validator-identifier': 7.22.5
+      '@babel/helper-validator-identifier': 7.22.20
       to-fast-properties: 2.0.0
 
+  /@babel/types@7.23.6:
+    resolution: {integrity: sha512-+uarb83brBzPKN38NX1MkB6vb6+mwvR6amUulqAE7ccQw1pEl+bCia9TbdG1lsnFP7lZySvUn37CHyXQdfTwzg==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@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==}
     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.1.0):
-    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
+      '@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
+      '@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.1.0):
+  /@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.1.0)
-      '@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.1.0)
-      '@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/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
@@ -3587,15 +4716,15 @@ packages:
   /@codemirror/lang-json@6.0.1:
     resolution: {integrity: sha512-+T1flHdgpqDDlJZ2Lkil/rLiRy684WMLc74xUnjJH48GQdfJo/pudlTRreZmKwzP8/tGdKf83wlbAdOCzlJOGQ==}
     dependencies:
-      '@codemirror/language': 6.2.1
+      '@codemirror/language': 6.9.3
       '@lezer/json': 1.0.0
     dev: false
 
-  /@codemirror/lang-python@6.1.2(@codemirror/state@6.1.4)(@codemirror/view@6.5.1)(@lezer/common@1.1.0):
-    resolution: {integrity: sha512-nbQfifLBZstpt6Oo4XxA2LOzlSp4b/7Bc5cmodG1R+Cs5PLLCTUvsMNWDnziiCfTOG/SW1rVzXq/GbIr6WXlcw==}
+  /@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.4.0(@codemirror/language@6.2.1)(@codemirror/state@6.1.4)(@codemirror/view@6.5.1)(@lezer/common@1.1.0)
-      '@codemirror/language': 6.2.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
       '@lezer/python': 1.1.5
     transitivePeerDependencies:
       - '@codemirror/state'
@@ -3603,34 +4732,34 @@ packages:
       - '@lezer/common'
     dev: false
 
-  /@codemirror/language@6.2.1:
-    resolution: {integrity: sha512-MC3svxuvIj0MRpFlGHxLS6vPyIdbTr2KKPEW46kCoCXw2ktb4NTkpkPBI/lSP/FoNXLCBJ0mrnUi1OoZxtpW1Q==}
+  /@codemirror/language@6.9.3:
+    resolution: {integrity: sha512-qq48pYzoi6ldYWV/52+Z9Ou6QouVI+8YwvxFbUypI33NbjG2UeRHKENRyhwljTTiOqjQ33FjyZj6EREQ9apAOQ==}
     dependencies:
-      '@codemirror/state': 6.1.4
-      '@codemirror/view': 6.5.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
 
@@ -3661,8 +4790,8 @@ packages:
       y18n: 5.0.8
     dev: false
 
-  /@cypress/request@2.88.11:
-    resolution: {integrity: sha512-M83/wfQ1EkspjkE2lNWNV5ui2Cv7UCv1swW1DqljahbzLVWltcsexQh8jYtuS/vzFXP+HySntGM83ZXA9fn17w==}
+  /@cypress/request@3.0.1:
+    resolution: {integrity: sha512-TWivJlJi8ZDx2wGOw1dbLuHJKUYX7bWySw377nlnGOW3hP9/MUKIsEdXT/YngWxVdgNCHRBmFlBipE+5/2ZZlQ==}
     engines: {node: '>= 6'}
     dependencies:
       aws-sign2: 0.7.0
@@ -3678,7 +4807,7 @@ packages:
       json-stringify-safe: 5.0.1
       mime-types: 2.1.35
       performance-now: 2.1.0
-      qs: 6.10.5
+      qs: 6.10.4
       safe-buffer: 5.2.1
       tough-cookie: 4.1.3
       tunnel-agent: 0.6.0
@@ -3707,6 +4836,18 @@ packages:
     engines: {node: '>=10.0.0'}
     dev: true
 
+  /@edge-runtime/primitives@4.0.5:
+    resolution: {integrity: sha512-t7QiN5d/KpXgCvIfSt6Nm9Hj3WVdNgc5CpOD73jasY+9EvTI7Ngdj5cXvjcHrPcmYWJZMySPgeEeoL/1N/Llag==}
+    engines: {node: '>=16'}
+    dev: false
+
+  /@edge-runtime/types@2.2.7:
+    resolution: {integrity: sha512-9MTwGooICP7+ZsX9BTy6YCRzOr4tP6RFRymsc8CaKORfvuAHgLZUQaLwILfQ94tddufVXcBwq637VfEd3ZXbWA==}
+    engines: {node: '>=16'}
+    dependencies:
+      '@edge-runtime/primitives': 4.0.5
+    dev: false
+
   /@element-plus/icons-vue@2.1.0(vue@3.3.4):
     resolution: {integrity: sha512-PSBn3elNoanENc1vnCfh+3WA9fimRC7n+fWkf3rE5jvv+aBohNHABC/KAR5KWPecxWxDTVT1ERpRbOMRcOV/vA==}
     peerDependencies:
@@ -3715,12 +4856,12 @@ packages:
       vue: 3.3.4
     dev: false
 
-  /@emotion/use-insertion-effect-with-fallbacks@1.0.0(react@17.0.2):
+  /@emotion/use-insertion-effect-with-fallbacks@1.0.0(react@18.2.0):
     resolution: {integrity: sha512-1eEgUGmkaljiBnRMTdksDV1W4kUnmwgp7X9G8B++9GYwl1lUdqSndSriIrTJ0N7LQaoauY9JJ2yhiOYK5+NI4A==}
     peerDependencies:
       react: '>=16.8.0'
     dependencies:
-      react: 17.0.2
+      react: 18.2.0
     dev: true
 
   /@esbuild/android-arm64@0.18.17:
@@ -3731,6 +4872,14 @@ packages:
     dev: true
     optional: 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.18.17:
     resolution: {integrity: sha512-wHsmJG/dnL3OkpAcwbgoBTTMHVi4Uyou3F5mf58ZtmUyIKfcdA7TROav/6tCzET4A3QW2Q2FC+eFneMU+iyOxg==}
     engines: {node: '>=12'}
@@ -3739,6 +4888,14 @@ packages:
     dev: true
     optional: true
 
+  /@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.18.17:
     resolution: {integrity: sha512-O+FeWB/+xya0aLg23hHEM2E3hbfwZzjqumKMSIqcHbNvDa+dza2D0yLuymRBQQnC34CWrsJUXyH2MG5VnLd6uw==}
     engines: {node: '>=12'}
@@ -3747,6 +4904,14 @@ packages:
     dev: true
     optional: true
 
+  /@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.18.17:
     resolution: {integrity: sha512-M9uJ9VSB1oli2BE/dJs3zVr9kcCBBsE883prage1NWz6pBS++1oNn/7soPNS3+1DGj0FrkSvnED4Bmlu1VAE9g==}
     engines: {node: '>=12'}
@@ -3755,6 +4920,14 @@ packages:
     dev: true
     optional: true
 
+  /@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.18.17:
     resolution: {integrity: sha512-XDre+J5YeIJDMfp3n0279DFNrGCXlxOuGsWIkRb1NThMZ0BsrWXoTg23Jer7fEXQ9Ye5QjrvXpxnhzl3bHtk0g==}
     engines: {node: '>=12'}
@@ -3763,6 +4936,14 @@ packages:
     dev: true
     optional: true
 
+  /@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.18.17:
     resolution: {integrity: sha512-cjTzGa3QlNfERa0+ptykyxs5A6FEUQQF0MuilYXYBGdBxD3vxJcKnzDlhDCa1VAJCmAxed6mYhA2KaJIbtiNuQ==}
     engines: {node: '>=12'}
@@ -3771,6 +4952,14 @@ packages:
     dev: true
     optional: true
 
+  /@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.18.17:
     resolution: {integrity: sha512-sOxEvR8d7V7Kw8QqzxWc7bFfnWnGdaFBut1dRUYtu+EIRXefBc/eIsiUiShnW0hM3FmQ5Zf27suDuHsKgZ5QrA==}
     engines: {node: '>=12'}
@@ -3779,6 +4968,14 @@ packages:
     dev: true
     optional: true
 
+  /@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.18.17:
     resolution: {integrity: sha512-c9w3tE7qA3CYWjT+M3BMbwMt+0JYOp3vCMKgVBrCl1nwjAlOMYzEo+gG7QaZ9AtqZFj5MbUc885wuBBmu6aADQ==}
     engines: {node: '>=12'}
@@ -3787,6 +4984,14 @@ packages:
     dev: true
     optional: true
 
+  /@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.18.17:
     resolution: {integrity: sha512-2d3Lw6wkwgSLC2fIvXKoMNGVaeY8qdN0IC3rfuVxJp89CRfA3e3VqWifGDfuakPmp90+ZirmTfye1n4ncjv2lg==}
     engines: {node: '>=12'}
@@ -3795,6 +5000,14 @@ packages:
     dev: true
     optional: true
 
+  /@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.18.17:
     resolution: {integrity: sha512-1DS9F966pn5pPnqXYz16dQqWIB0dmDfAQZd6jSSpiT9eX1NzKh07J6VKR3AoXXXEk6CqZMojiVDSZi1SlmKVdg==}
     engines: {node: '>=12'}
@@ -3803,6 +5016,14 @@ packages:
     dev: true
     optional: true
 
+  /@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.18.17:
     resolution: {integrity: sha512-EvLsxCk6ZF0fpCB6w6eOI2Fc8KW5N6sHlIovNe8uOFObL2O+Mr0bflPHyHwLT6rwMg9r77WOAWb2FqCQrVnwFg==}
     engines: {node: '>=12'}
@@ -3811,6 +5032,14 @@ packages:
     dev: true
     optional: true
 
+  /@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.18.17:
     resolution: {integrity: sha512-e0bIdHA5p6l+lwqTE36NAW5hHtw2tNRmHlGBygZC14QObsA3bD4C6sXLJjvnDIjSKhW1/0S3eDy+QmX/uZWEYQ==}
     engines: {node: '>=12'}
@@ -3819,6 +5048,14 @@ packages:
     dev: true
     optional: true
 
+  /@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.18.17:
     resolution: {integrity: sha512-BAAilJ0M5O2uMxHYGjFKn4nJKF6fNCdP1E0o5t5fvMYYzeIqy2JdAP88Az5LHt9qBoUa4tDaRpfWt21ep5/WqQ==}
     engines: {node: '>=12'}
@@ -3827,6 +5064,14 @@ packages:
     dev: true
     optional: true
 
+  /@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.18.17:
     resolution: {integrity: sha512-Wh/HW2MPnC3b8BqRSIme/9Zhab36PPH+3zam5pqGRH4pE+4xTrVLx2+XdGp6fVS3L2x+DrsIcsbMleex8fbE6g==}
     engines: {node: '>=12'}
@@ -3835,6 +5080,14 @@ packages:
     dev: true
     optional: true
 
+  /@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.18.17:
     resolution: {integrity: sha512-j/34jAl3ul3PNcK3pfI0NSlBANduT2UO5kZ7FCaK33XFv3chDhICLY8wJJWIhiQ+YNdQ9dxqQctRg2bvrMlYgg==}
     engines: {node: '>=12'}
@@ -3843,6 +5096,14 @@ packages:
     dev: true
     optional: true
 
+  /@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.18.17:
     resolution: {integrity: sha512-QM50vJ/y+8I60qEmFxMoxIx4de03pGo2HwxdBeFd4nMh364X6TIBZ6VQ5UQmPbQWUVWHWws5MmJXlHAXvJEmpQ==}
     engines: {node: '>=12'}
@@ -3851,6 +5112,14 @@ packages:
     dev: true
     optional: true
 
+  /@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.18.17:
     resolution: {integrity: sha512-/jGlhWR7Sj9JPZHzXyyMZ1RFMkNPjC6QIAan0sDOtIo2TYk3tZn5UDrkE0XgsTQCxWTTOcMPf9p6Rh2hXtl5TQ==}
     engines: {node: '>=12'}
@@ -3859,6 +5128,14 @@ packages:
     dev: true
     optional: true
 
+  /@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.18.17:
     resolution: {integrity: sha512-rSEeYaGgyGGf4qZM2NonMhMOP/5EHp4u9ehFiBrg7stH6BYEEjlkVREuDEcQ0LfIl53OXLxNbfuIj7mr5m29TA==}
     engines: {node: '>=12'}
@@ -3867,6 +5144,14 @@ packages:
     dev: true
     optional: true
 
+  /@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.18.17:
     resolution: {integrity: sha512-Y7ZBbkLqlSgn4+zot4KUNYst0bFoO68tRgI6mY2FIM+b7ZbyNVtNbDP5y8qlu4/knZZ73fgJDlXID+ohY5zt5g==}
     engines: {node: '>=12'}
@@ -3875,6 +5160,14 @@ packages:
     dev: true
     optional: true
 
+  /@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.18.17:
     resolution: {integrity: sha512-bwPmTJsEQcbZk26oYpc4c/8PvTY3J5/QK8jM19DVlEsAB41M39aWovWoHtNm78sd6ip6prilxeHosPADXtEJFw==}
     engines: {node: '>=12'}
@@ -3883,6 +5176,14 @@ packages:
     dev: true
     optional: true
 
+  /@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.18.17:
     resolution: {integrity: sha512-H/XaPtPKli2MhW+3CQueo6Ni3Avggi6hP/YvgkEe1aSaxw+AeO8MFjq8DlgfTd9Iz4Yih3QCZI6YLMoyccnPRg==}
     engines: {node: '>=12'}
@@ -3891,6 +5192,14 @@ packages:
     dev: true
     optional: true
 
+  /@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.18.17:
     resolution: {integrity: sha512-fGEb8f2BSA3CW7riJVurug65ACLuQAzKq0SSqkY2b2yHHH0MzDfbLyKIGzHwOI/gkHcxM/leuSW6D5w/LMNitA==}
     engines: {node: '>=12'}
@@ -3899,19 +5208,22 @@ packages:
     dev: true
     optional: true
 
-  /@eslint-community/eslint-utils@4.4.0(eslint@8.45.0):
+  /@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.54.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.45.0
-      eslint-visitor-keys: 3.4.1
-    dev: true
-
-  /@eslint-community/regexpp@4.5.0:
-    resolution: {integrity: sha512-vITaYzIcNmjn5tF5uxcZ/ft7/RXGrMUIS9HalWckEOF6ESiwXKoMzAQf2UW0aVd6rnOeExTJVd5hmWXucBKGXQ==}
-    engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0}
+      eslint: 8.54.0
+      eslint-visitor-keys: 3.4.3
     dev: true
 
   /@eslint-community/regexpp@4.6.2:
@@ -3919,8 +5231,8 @@ packages:
     engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0}
     dev: true
 
-  /@eslint/eslintrc@2.1.0:
-    resolution: {integrity: sha512-Lj7DECXqIVCqnqjjHMPna4vn6GJcMgul/wuS0je9OZ9gsL0zzDpKPVtcG1HaDVc+9y+qgXneTeUMbCqXJNpH1A==}
+  /@eslint/eslintrc@2.1.3:
+    resolution: {integrity: sha512-yZzuIG+jnVu6hNSzFEN07e8BxF3uAzYtQb6uDkaYZLo6oYZDCq454c5kB8zxnzfCYyP4MIuyBn10L0DqwujTmA==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
       ajv: 6.12.6
@@ -3936,8 +5248,8 @@ packages:
       - supports-color
     dev: true
 
-  /@eslint/js@8.44.0:
-    resolution: {integrity: sha512-Ag+9YM4ocKQx9AarydN0KY2j0ErMHNIocPDrVo8zAE44xLTjEtz81OdR68/cydGtk6m6jDb5Za3r2useMzYmSw==}
+  /@eslint/js@8.54.0:
+    resolution: {integrity: sha512-ut5V+D+fOoWPgGGNj83GGjnntO39xDy6DWxO0wb7Jp3DcMX0TfIqdzHF85VTQkerdyGmuuMD9AKAo5KiNlf/AQ==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dev: true
 
@@ -3965,12 +5277,40 @@ packages:
     resolution: {integrity: sha512-Bu+AMaXNjrpjh41znzHqaz3r2Nr8hHuHZT6V2LBKMhyMl0FgKA62PNYbqnfgmzOhoWZj70Zecisbo4H1rotP5g==}
     dev: false
 
+  /@floating-ui/core@1.5.0:
+    resolution: {integrity: sha512-kK1h4m36DQ0UHGj5Ah4db7R0rHemTqqO0QLvUqi1/mUUp3LuAWbWxdxSIf/XsnH9VS6rRVPLJCncjRzUvyCLXg==}
+    dependencies:
+      '@floating-ui/utils': 0.1.6
+    dev: true
+
   /@floating-ui/dom@1.4.5:
     resolution: {integrity: sha512-96KnRWkRnuBSSFbj0sFGwwOUd8EkiecINVl0O9wiZlZ64EkpyAOG3Xc2vKKNJmru0Z7RqWNymA+6b8OZqjgyyw==}
     dependencies:
       '@floating-ui/core': 1.3.1
     dev: false
 
+  /@floating-ui/dom@1.5.3:
+    resolution: {integrity: sha512-ClAbQnEqJAKCJOEbbLo5IUlZHkNszqhuxS4fHAVxRPXPya6Ysf2G8KypnYcOTpx6I8xcgF9bbHb6g/2KpbV8qA==}
+    dependencies:
+      '@floating-ui/core': 1.5.0
+      '@floating-ui/utils': 0.1.6
+    dev: true
+
+  /@floating-ui/react-dom@2.0.2(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-5qhlDvjaLmAst/rKb3VdlCinwTF4EYMiVxuuc/HVUjs46W0zgtbMmAZ1UTsDrRTxRmUEzl92mOtWbeeXL26lSQ==}
+    peerDependencies:
+      react: '>=16.8.0'
+      react-dom: '>=16.8.0'
+    dependencies:
+      '@floating-ui/dom': 1.5.3
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
+    dev: true
+
+  /@floating-ui/utils@0.1.6:
+    resolution: {integrity: sha512-OfX7E2oUDYxtBvsuS4e/jSn4Q9Qb6DzgeYtsAdkPZ47znpoNsMgZw0+tVijiv3uGNR6dgNlty6r9rzIzHjtd/A==}
+    dev: true
+
   /@fontsource/open-sans@4.5.12:
     resolution: {integrity: sha512-WKCexsVbOECJUSOgG7GnrUxe+3ds4Sa1yhsTjSnszI+0TaJvMZnDnn5YDKwA/KwLbkZqCaV3nvMTH97jJuxWNA==}
     dev: false
@@ -3978,6 +5318,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==}
@@ -3989,6 +5330,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==}
@@ -4002,6 +5344,7 @@ packages:
     engines: {node: '>=6'}
     dependencies:
       '@fortawesome/fontawesome-common-types': 0.2.36
+    dev: false
 
   /@fortawesome/vue-fontawesome@3.0.3(@fortawesome/fontawesome-svg-core@1.2.36)(vue@3.3.4):
     resolution: {integrity: sha512-KCPHi9QemVXGMrfuwf3nNnNo129resAIQWut9QTAMXmXqL2ErABC6ohd2yY5Ipq0CLWNbKHk8TMdTXL/Zf3ZhA==}
@@ -4011,12 +5354,32 @@ packages:
     dependencies:
       '@fortawesome/fontawesome-svg-core': 1.2.36
       vue: 3.3.4
+    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.5.4
+      typescript: 5.3.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'}
@@ -4061,6 +5424,25 @@ packages:
       - supports-color
     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.4
+      yargs: 17.7.2
+    dev: false
+
   /@hapi/hoek@9.3.0:
     resolution: {integrity: sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ==}
     dev: true
@@ -4071,11 +5453,16 @@ packages:
       '@hapi/hoek': 9.3.0
     dev: true
 
-  /@humanwhocodes/config-array@0.11.10:
-    resolution: {integrity: sha512-KVVjQmNUepDVGXNuoRRdmmEjruj0KfiGSbS8LVc12LMsWDQzRXJ0qdhN8L8uUigKpfEHRhlaQFY0ib1tnUbNeQ==}
+  /@huggingface/inference@2.6.4:
+    resolution: {integrity: sha512-Xna7arltBSBoKaH3diGi3sYvkExgJMd/pF4T6vl2YbmDccbr1G/X5EPZ2048p+YgrJYG1jTYFCtY6Dr3HvJaow==}
+    engines: {node: '>=18'}
+    dev: false
+
+  /@humanwhocodes/config-array@0.11.13:
+    resolution: {integrity: sha512-JSBDMiDKSzQVngfRjOdFXgFfklaXI4K9nLF49Auh21lmBWRLIK3+xTErTWD4KU54pb6coM6ESE7Awz/FNU3zgQ==}
     engines: {node: '>=10.10.0'}
     dependencies:
-      '@humanwhocodes/object-schema': 1.2.1
+      '@humanwhocodes/object-schema': 2.0.1
       debug: 4.3.4(supports-color@8.1.1)
       minimatch: 3.1.2
     transitivePeerDependencies:
@@ -4087,8 +5474,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.1:
+    resolution: {integrity: sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw==}
     dev: true
 
   /@icetee/ftp@0.3.15:
@@ -4099,6 +5486,29 @@ 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'}
@@ -4329,6 +5739,13 @@ packages:
       '@sinclair/typebox': 0.27.8
     dev: true
 
+  /@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:
+      '@sinclair/typebox': 0.27.8
+    dev: true
+
   /@jest/source-map@29.6.0:
     resolution: {integrity: sha512-oA+I2SHHQGxDCZpbrsCQSoMLb3Bz547JnM+jUr9qEbuw0vQlWZfpPS7CO9J7XiwKicEz9OFn/IYoLkkiUD7bzA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
@@ -4358,29 +5775,6 @@ packages:
       slash: 3.0.0
     dev: true
 
-  /@jest/transform@29.5.0:
-    resolution: {integrity: sha512-8vbeZWqLJOvHaDfeMuoHITGKSz5qWc9u04lnWrQE3VyuSw604PzQM824ZeX9XSjUCeDiE3GuxZe5UKa8J61NQw==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    dependencies:
-      '@babel/core': 7.22.9
-      '@jest/types': 29.6.1
-      '@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.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/transform@29.6.2:
     resolution: {integrity: sha512-ZqCqEISr58Ce3U+buNFJYUktLJZOggfyvR+bZMaiV1e8B1SIvJbwZMrYz3gx/KAPn9EXmOmN+uB08yLCjWkQQg==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
@@ -4404,6 +5798,17 @@ packages:
       - supports-color
     dev: true
 
+  /@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': 18.16.16
+      '@types/yargs': 16.0.9
+      chalk: 4.1.2
+    dev: true
+
   /@jest/types@29.6.1:
     resolution: {integrity: sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
@@ -4449,13 +5854,6 @@ packages:
   /@jridgewell/sourcemap-codec@1.4.15:
     resolution: {integrity: sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==}
 
-  /@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/trace-mapping@0.3.18:
     resolution: {integrity: sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==}
     dependencies:
@@ -4470,6 +5868,13 @@ packages:
   /@jsdevtools/ono@7.1.3:
     resolution: {integrity: sha512-4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg==}
 
+  /@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==}
     dependencies:
@@ -4509,6 +5914,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:
@@ -4521,6 +5930,32 @@ packages:
     resolution: {integrity: sha512-GaHYm+c0O9MjZRu0ongGBRbinu8gVAMd2UZjji6jVmqKtZluZnptXGWhz1E8j8D2HJ3f/yMxKAUC0b+57wncIw==}
     dev: false
 
+  /@langchain/core@0.1.8:
+    resolution: {integrity: sha512-ZTQ/NFjBbOKktVL+BlT/Fal5Ys0GAhygWeWdGNoFZg0qJfSt54fQzFhljNSpnQQ4Wavj8NkkCLiSFMnxDAuHjg==}
+    engines: {node: '>=18'}
+    dependencies:
+      ansi-styles: 5.2.0
+      camelcase: 6.3.0
+      decamelize: 1.2.0
+      js-tiktoken: 1.0.8
+      langsmith: 0.0.48
+      ml-distance: 4.0.1
+      p-queue: 6.6.2
+      p-retry: 4.6.2
+      uuid: 9.0.0
+      zod: 3.22.4
+    dev: false
+
+  /@langchain/mistralai@0.0.6:
+    resolution: {integrity: sha512-zA/xxKNF+rDM9IF1uvVx+LI/eWPZSO85tJBX60ENeQrcM35np92Sm3ca0D4ixcdBAkG0vnn+9ELcYHGdknCbHQ==}
+    engines: {node: '>=18'}
+    dependencies:
+      '@langchain/core': 0.1.8
+      '@mistralai/mistralai': 0.0.7
+    transitivePeerDependencies:
+      - debug
+    dev: false
+
   /@lezer/common@1.1.0:
     resolution: {integrity: sha512-XPIN3cYDXsoJI/oDWoR2tD++juVrhgIago9xyKhZ7IhGlzdDM9QgC8D8saKNCz5pindGcznFr2HBSsEQSWnSjw==}
     dev: false
@@ -4580,7 +6015,7 @@ packages:
       detect-libc: 2.0.1
       https-proxy-agent: 5.0.1
       make-dir: 3.1.0
-      node-fetch: 2.6.8
+      node-fetch: 2.7.0(encoding@0.1.13)
       nopt: 5.0.0
       npmlog: 5.0.1
       rimraf: 3.0.2
@@ -4591,20 +6026,72 @@ packages:
       - supports-color
     dev: false
 
-  /@mdx-js/react@2.3.0(react@17.0.2):
+  /@mdx-js/react@2.3.0(react@18.2.0):
     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
+      react: 18.2.0
+    dev: true
+
+  /@microsoft/api-extractor-model@7.28.2:
+    resolution: {integrity: sha512-vkojrM2fo3q4n4oPh4uUZdjJ2DxQ2+RnDQL/xhTWSRUNPF6P4QyrvY357HBxbnltKcYu+nNNolVqc6TIGQ73Ig==}
+    dependencies:
+      '@microsoft/tsdoc': 0.14.2
+      '@microsoft/tsdoc-config': 0.16.2
+      '@rushstack/node-core-library': 3.61.0
+    transitivePeerDependencies:
+      - '@types/node'
+    dev: true
+
+  /@microsoft/api-extractor@7.38.3:
+    resolution: {integrity: sha512-xt9iYyC5f39281j77JTA9C3ISJpW1XWkCcnw+2vM78CPnro6KhPfwQdPDfwS5JCPNuq0grm8cMdPUOPvrchDWw==}
+    hasBin: true
+    dependencies:
+      '@microsoft/api-extractor-model': 7.28.2
+      '@microsoft/tsdoc': 0.14.2
+      '@microsoft/tsdoc-config': 0.16.2
+      '@rushstack/node-core-library': 3.61.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.5.4
+      source-map: 0.6.1
+      typescript: 5.3.2
+    transitivePeerDependencies:
+      - '@types/node'
+    dev: true
+
+  /@microsoft/tsdoc-config@0.16.2:
+    resolution: {integrity: sha512-OGiIzzoBLgWWR0UdRJX98oYO+XKGf7tiK4Zk6tQ/E4IJqGCe7dvkTvgDZV5cFJUzLGDOjeAXrnZoA6QkVySuxw==}
+    dependencies:
+      '@microsoft/tsdoc': 0.14.2
+      ajv: 6.12.6
+      jju: 1.4.0
+      resolve: 1.19.0
+    dev: true
+
+  /@microsoft/tsdoc@0.14.2:
+    resolution: {integrity: sha512-9b8mPpKrfeGRuhFH5iO1iwCLeIIsV6+H1sRfxbkoGXIyQE2BTsPd9zqSqQJ+pv5sJ/hT5M1zvOFL02MnEezFug==}
     dev: true
 
   /@miragejs/pretender-node-polyfill@0.1.2:
     resolution: {integrity: sha512-M/BexG/p05C5lFfMunxo/QcgIJnMT2vDVCd00wNqK2ImZONIlEETZwWJu1QtLxtmYlSHlCFl3JNzp0tLe7OJ5g==}
     dev: true
 
+  /@mistralai/mistralai@0.0.7:
+    resolution: {integrity: sha512-47FiV/GBnt6gug99ZfDBcBofYuYvqT5AyhUDdtktUbCN+gq52tmiAbtwc88k7hlyUWHzJ28VpHRDfNTRfaWKxA==}
+    dependencies:
+      axios: 1.6.2(debug@3.2.7)
+      axios-retry: 4.0.0(axios@1.6.2)
+    transitivePeerDependencies:
+      - debug
+    dev: false
+
   /@mongodb-js/saslprep@1.1.0:
     resolution: {integrity: sha512-Xfijy7HvfzzqiOAhAepF4SGN5e9leLkMvg/OPOF97XemjfVCYN/oWa75wnkc6mltMSTwY+XlbhWgUOJmkFspSw==}
     dependencies:
@@ -4654,12 +6141,12 @@ packages:
     dev: false
     optional: true
 
-  /@n8n/codemirror-lang-sql@1.0.2(@codemirror/view@6.5.1)(@lezer/common@1.1.0):
+  /@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:
-      '@codemirror/autocomplete': 6.4.0(@codemirror/language@6.2.1)(@codemirror/state@6.1.4)(@codemirror/view@6.5.1)(@lezer/common@1.1.0)
-      '@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/highlight': 1.1.1
       '@lezer/lr': 1.2.3
     transitivePeerDependencies:
@@ -4667,6 +6154,19 @@ packages:
       - '@lezer/common'
     dev: false
 
+  /@n8n/localtunnel@2.1.0:
+    resolution: {integrity: sha512-k5mb+Aeb3+4cRfWaEsMSiTsF1oARFvAuI3EOvxitrgVmiWk592h4nCI7vtjq1nsVT+PWKmB6dBoTQ0+6HHIpug==}
+    engines: {node: '>=18.0.0'}
+    hasBin: true
+    dependencies:
+      axios: 1.6.2(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
+
   /@n8n/tournament@1.0.2:
     resolution: {integrity: sha512-fTpi7F8ra5flGSVfRzohPyG7czAAKCZPlLjdKdwbLJivLoI/Ekhgodov1jfVSCVFVbwQ06gRQRxLEDzl2jl8ig==}
     engines: {node: '>=18.10', pnpm: '>=8.6'}
@@ -4682,15 +6182,15 @@ packages:
     engines: {node: '>=18.10', pnpm: '>=8.6.12'}
     hasBin: true
     dependencies:
-      acorn: 8.10.0
+      acorn: 8.11.2
       acorn-walk: 8.2.0
     dev: false
 
-  /@n8n_io/license-sdk@2.7.1:
-    resolution: {integrity: sha512-SiPKI/wN2coLPB8Tyb28UlLgAszU2SkSR8PWNioTWAd8PnUhTYg8KN9jfUOZipVF+YMOAHc/hQUq6kJA1PF0xg==}
+  /@n8n_io/license-sdk@2.7.2:
+    resolution: {integrity: sha512-GalBo+2YxbFUR1I7cx3JDEiippqKw8ml3FdFK9hRRB9NfpP+H0QYnWf/sGOmKcb4nZ2lqU38nU7ZdIF96jBkXg==}
     engines: {node: '>=18.12.1', npm: '>=8.19.2'}
     dependencies:
-      crypto-js: 4.1.1
+      crypto-js: 4.2.0
       node-machine-id: 1.1.12
       node-rsa: 1.1.1
       undici: 5.26.4
@@ -4762,13 +6262,14 @@ packages:
   /@oclif/command@1.8.18(@oclif/config@1.18.17):
     resolution: {integrity: sha512-qTad+jtiriMMbkw6ArtcUY89cwLwmwDnD4KSGT+OQiZKYtegp3NUCM9JN8lfj/aKC+0kvSitJM4ULzbgiVTKQQ==}
     engines: {node: '>=12.0.0'}
+    deprecated: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.
     peerDependencies:
       '@oclif/config': ^1
     dependencies:
       '@oclif/config': 1.18.17
       '@oclif/errors': 1.3.6
       '@oclif/help': 1.0.3(supports-color@8.1.1)
-      '@oclif/parser': 3.8.8
+      '@oclif/parser': 3.8.17
       debug: 4.3.4(supports-color@8.1.1)
       semver: 7.5.4
     transitivePeerDependencies:
@@ -4778,13 +6279,14 @@ packages:
   /@oclif/command@1.8.18(@oclif/config@1.18.17)(supports-color@8.1.1):
     resolution: {integrity: sha512-qTad+jtiriMMbkw6ArtcUY89cwLwmwDnD4KSGT+OQiZKYtegp3NUCM9JN8lfj/aKC+0kvSitJM4ULzbgiVTKQQ==}
     engines: {node: '>=12.0.0'}
+    deprecated: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.
     peerDependencies:
       '@oclif/config': ^1
     dependencies:
       '@oclif/config': 1.18.17
       '@oclif/errors': 1.3.6
       '@oclif/help': 1.0.3(supports-color@8.1.1)
-      '@oclif/parser': 3.8.8
+      '@oclif/parser': 3.8.17
       debug: 4.3.4(supports-color@8.1.1)
       semver: 7.5.4
     transitivePeerDependencies:
@@ -4793,13 +6295,14 @@ packages:
   /@oclif/command@1.8.18(@oclif/config@1.18.2):
     resolution: {integrity: sha512-qTad+jtiriMMbkw6ArtcUY89cwLwmwDnD4KSGT+OQiZKYtegp3NUCM9JN8lfj/aKC+0kvSitJM4ULzbgiVTKQQ==}
     engines: {node: '>=12.0.0'}
+    deprecated: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.
     peerDependencies:
       '@oclif/config': ^1
     dependencies:
       '@oclif/config': 1.18.2
       '@oclif/errors': 1.3.6
       '@oclif/help': 1.0.3(supports-color@8.1.1)
-      '@oclif/parser': 3.8.8
+      '@oclif/parser': 3.8.17
       debug: 4.3.4(supports-color@8.1.1)
       semver: 7.5.4
     transitivePeerDependencies:
@@ -4826,7 +6329,7 @@ packages:
     deprecated: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.
     dependencies:
       '@oclif/errors': 1.3.6
-      '@oclif/parser': 3.8.8
+      '@oclif/parser': 3.8.17
       debug: 4.3.4(supports-color@8.1.1)
       globby: 11.1.0
       is-wsl: 2.2.0
@@ -4841,7 +6344,7 @@ packages:
     deprecated: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.
     dependencies:
       '@oclif/errors': 1.3.6
-      '@oclif/parser': 3.8.8
+      '@oclif/parser': 3.8.17
       debug: 4.3.4(supports-color@8.1.1)
       globby: 11.1.0
       is-wsl: 2.2.0
@@ -4908,6 +6411,7 @@ packages:
   /@oclif/errors@1.3.5:
     resolution: {integrity: sha512-OivucXPH/eLLlOT7FkCMoZXiaVYf8I/w1eTAM1+gKzfhALwWTusxEx7wBmW0uzvkSg/9ovWLycPaBgJbM3LOCQ==}
     engines: {node: '>=8.0.0'}
+    deprecated: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.
     dependencies:
       clean-stack: 3.0.1
       fs-extra: 8.1.0
@@ -4919,6 +6423,7 @@ packages:
   /@oclif/errors@1.3.6:
     resolution: {integrity: sha512-fYaU4aDceETd89KXP+3cLyg9EHZsLD3RxF2IU9yxahhBpspWjkWi3Dy3bTgcwZ3V47BgxQaGapzJWDM33XIVDQ==}
     engines: {node: '>=8.0.0'}
+    deprecated: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.
     dependencies:
       clean-stack: 3.0.1
       fs-extra: 8.1.0
@@ -4929,6 +6434,7 @@ packages:
   /@oclif/help@1.0.3(supports-color@8.1.1):
     resolution: {integrity: sha512-AjjhSWFQkRb9rChEH+IRUmp0CxEacYpUbh+kQqtdCR9CDSsj2a3ibWjtMtJb4lFGAle6kVKfaal/juYe+6P5TQ==}
     engines: {node: '>=8.0.0'}
+    deprecated: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.
     dependencies:
       '@oclif/config': 1.18.5(supports-color@8.1.1)
       '@oclif/errors': 1.3.6
@@ -4955,15 +6461,6 @@ packages:
       chalk: 4.1.2
       tslib: 2.6.1
 
-  /@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.6.1
-
   /@oclif/plugin-help@3.2.18:
     resolution: {integrity: sha512-5n5Pkz4L0duknIvFwx2Ko9Xda3miT6RZP8bgaaK3Q/9fzVBrhi4bOM0u05/OThI6V+3NsSdxYS2o1NLcXToWDg==}
     engines: {node: '>=8.0.0'}
@@ -4991,6 +6488,7 @@ packages:
   /@oclif/screen@3.0.2:
     resolution: {integrity: sha512-S/SF/XYJeevwIgHFmVDAFRUvM3m+OjhvCAYMk78ZJQCYCQ5wS7j+LTt1ZEv2jpEEGg2tx/F6TYYWxddNAYHrFQ==}
     engines: {node: '>=12.0.0'}
+    deprecated: Deprecated in favor of @oclif/core
     dev: false
 
   /@one-ini/wasm@0.1.1:
@@ -5035,12 +6533,25 @@ packages:
       '@otplib/plugin-thirty-two': 12.0.1
     dev: true
 
+  /@pinecone-database/pinecone@1.1.2:
+    resolution: {integrity: sha512-xrvaMWWloTjT70pSxvw+Es2f7qX5lzhtTZBfduagtwGQqK0nFMqS6Jq+1yqzobDaUhqfRfVwRZ95Gm10odqD3Q==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@edge-runtime/types': 2.2.7
+      '@sinclair/typebox': 0.29.6
+      '@types/node': 18.16.16
+      ajv: 8.12.0
+      cross-fetch: 3.1.8(encoding@0.1.13)
+      encoding: 0.1.13
+      typescript: 5.3.2
+    dev: false
+
   /@pinia/testing@0.1.3(pinia@2.1.6)(vue@3.3.4):
     resolution: {integrity: sha512-D2Ds2s69kKFaRf2KCcP1NhNZEg5+we59aRyQalwRm7ygWfLM25nDH66267U3hNvRUOTx8ofL24GzodZkOmB5xw==}
     peerDependencies:
       pinia: '>=2.1.5'
     dependencies:
-      pinia: 2.1.6(typescript@5.2.2)(vue@3.3.4)
+      pinia: 2.1.6(typescript@5.3.2)(vue@3.3.4)
       vue-demi: 0.14.5(vue@3.3.4)
     transitivePeerDependencies:
       - '@vue/composition-api'
@@ -5065,6 +6576,824 @@ packages:
       tslib: 2.6.1
     dev: true
 
+  /@protobufjs/aspromise@1.1.2:
+    resolution: {integrity: sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ==}
+    dev: false
+
+  /@protobufjs/base64@1.1.2:
+    resolution: {integrity: sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg==}
+    dev: false
+
+  /@protobufjs/codegen@2.0.4:
+    resolution: {integrity: sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg==}
+    dev: false
+
+  /@protobufjs/eventemitter@1.1.0:
+    resolution: {integrity: sha512-j9ednRT81vYJ9OfVuXG6ERSTdEL1xVsNgqpkxMsbIabzSo3goCjDIveeGv5d03om39ML71RdmrGNjG5SReBP/Q==}
+    dev: false
+
+  /@protobufjs/fetch@1.1.0:
+    resolution: {integrity: sha512-lljVXpqXebpsijW71PZaCYeIcE5on1w5DlQy5WH6GLbFryLUrBD4932W/E2BSpfRJWseIL4v/KPgBFxDOIdKpQ==}
+    dependencies:
+      '@protobufjs/aspromise': 1.1.2
+      '@protobufjs/inquire': 1.1.0
+    dev: false
+
+  /@protobufjs/float@1.0.2:
+    resolution: {integrity: sha512-Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ==}
+    dev: false
+
+  /@protobufjs/inquire@1.1.0:
+    resolution: {integrity: sha512-kdSefcPdruJiFMVSbn801t4vFK7KB/5gd2fYvrxhuJYg8ILrmn9SKSX2tZdV6V+ksulWqS7aXjBcRXl3wHoD9Q==}
+    dev: false
+
+  /@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.3.2):
+    resolution: {integrity: sha512-16O0EQfrrybcPVipodxykr6dMUlBzKW7a63cSDUFVgc5a1AWESwERykwjuvW5KqvKdkPcxZ2NssrvgUO1W3MgA==}
+    engines: {node: '>=18.0.0', pnpm: '>=8'}
+    peerDependencies:
+      typescript: ^5.3.0
+    dependencies:
+      '@qdrant/openapi-typescript-fetch': 1.2.1
+      '@sevinf/maybe': 0.5.0
+      typescript: 5.3.2
+      undici: 5.26.4
+    dev: false
+
+  /@qdrant/openapi-typescript-fetch@1.2.1:
+    resolution: {integrity: sha512-oiBJRN1ME7orFZocgE25jrM3knIF/OKJfMsZPBbtMMKfgNVYfps0MokGvSJkBmecj6bf8QoLXWIGlIoaTM4Zmw==}
+    engines: {node: '>=12.0.0', pnpm: '>=8'}
+    dev: false
+
+  /@radix-ui/number@1.0.1:
+    resolution: {integrity: sha512-T5gIdVO2mmPW3NNhjNgEP3cqMXjXL9UbO0BzWcXfvdBs+BohbQxvd/K5hSVKmn9/lbTdsQVKbUcP5WLCwvUbBg==}
+    dependencies:
+      '@babel/runtime': 7.22.6
+    dev: true
+
+  /@radix-ui/primitive@1.0.1:
+    resolution: {integrity: sha512-yQ8oGX2GVsEYMWGxcovu1uGWPCxV5BFfeeYxqPmuAzUyLT9qmaMXSAhXpb0WrspIeqYzdJpkh2vHModJPgRIaw==}
+    dependencies:
+      '@babel/runtime': 7.22.6
+    dev: true
+
+  /@radix-ui/react-arrow@1.0.3(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-wSP+pHsB/jQRaL6voubsQ/ZlrGBHHrOjmBnr19hxYgtS0WvAFwZhK2WP/YY5yF9uKECCEEDGxuLxq1NBK51wFA==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0
+      react-dom: ^16.8 || ^17.0 || ^18.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+    dependencies:
+      '@babel/runtime': 7.22.6
+      '@radix-ui/react-primitive': 1.0.3(react-dom@18.2.0)(react@18.2.0)
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
+    dev: true
+
+  /@radix-ui/react-collection@1.0.3(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-3SzW+0PW7yBBoQlT8wNcGtaxaD0XSu0uLUFgrtHY08Acx05TaHaOmVLR73c0j/cqpDy53KBMO7s0dx2wmOIDIA==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0
+      react-dom: ^16.8 || ^17.0 || ^18.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+    dependencies:
+      '@babel/runtime': 7.22.6
+      '@radix-ui/react-compose-refs': 1.0.1(react@18.2.0)
+      '@radix-ui/react-context': 1.0.1(react@18.2.0)
+      '@radix-ui/react-primitive': 1.0.3(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-slot': 1.0.2(react@18.2.0)
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
+    dev: true
+
+  /@radix-ui/react-compose-refs@1.0.1(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:
+      '@babel/runtime': 7.22.6
+      react: 18.2.0
+    dev: true
+
+  /@radix-ui/react-context@1.0.1(react@18.2.0):
+    resolution: {integrity: sha512-ebbrdFoYTcuZ0v4wG5tedGnp9tzcV8awzsxYph7gXUyvnNLuTIcCk1q17JEbnVhXAKG9oX3KtchwiMIAYp9NLg==}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^16.8 || ^17.0 || ^18.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+    dependencies:
+      '@babel/runtime': 7.22.6
+      react: 18.2.0
+    dev: true
+
+  /@radix-ui/react-direction@1.0.1(react@18.2.0):
+    resolution: {integrity: sha512-RXcvnXgyvYvBEOhCBuddKecVkoMiI10Jcm5cTI7abJRAHYfFxeu+FBQs/DvdxSYucxR5mna0dNsL6QFlds5TMA==}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^16.8 || ^17.0 || ^18.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+    dependencies:
+      '@babel/runtime': 7.22.6
+      react: 18.2.0
+    dev: true
+
+  /@radix-ui/react-dismissable-layer@1.0.4(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-7UpBa/RKMoHJYjie1gkF1DlK8l1fdU/VKDpoS3rCCo8YBJR294GwcEHyxHw72yvphJ7ld0AXEcSLAzY2F/WyCg==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0
+      react-dom: ^16.8 || ^17.0 || ^18.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+    dependencies:
+      '@babel/runtime': 7.22.6
+      '@radix-ui/primitive': 1.0.1
+      '@radix-ui/react-compose-refs': 1.0.1(react@18.2.0)
+      '@radix-ui/react-primitive': 1.0.3(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-use-callback-ref': 1.0.1(react@18.2.0)
+      '@radix-ui/react-use-escape-keydown': 1.0.3(react@18.2.0)
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
+    dev: true
+
+  /@radix-ui/react-focus-guards@1.0.1(react@18.2.0):
+    resolution: {integrity: sha512-Rect2dWbQ8waGzhMavsIbmSVCgYxkXLxxR3ZvCX79JOglzdEy4JXMb98lq4hPxUbLr77nP0UOGf4rcMU+s1pUA==}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^16.8 || ^17.0 || ^18.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+    dependencies:
+      '@babel/runtime': 7.22.6
+      react: 18.2.0
+    dev: true
+
+  /@radix-ui/react-focus-scope@1.0.3(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-upXdPfqI4islj2CslyfUBNlaJCPybbqRHAi1KER7Isel9Q2AtSJ0zRBZv8mWQiFXD2nyAJ4BhC3yXgZ6kMBSrQ==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0
+      react-dom: ^16.8 || ^17.0 || ^18.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+    dependencies:
+      '@babel/runtime': 7.22.6
+      '@radix-ui/react-compose-refs': 1.0.1(react@18.2.0)
+      '@radix-ui/react-primitive': 1.0.3(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-use-callback-ref': 1.0.1(react@18.2.0)
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
+    dev: true
+
+  /@radix-ui/react-id@1.0.1(react@18.2.0):
+    resolution: {integrity: sha512-tI7sT/kqYp8p96yGWY1OAnLHrqDgzHefRBKQ2YAkBS5ja7QLcZ9Z/uY7bEjPUatf8RomoXM8/1sMj1IJaE5UzQ==}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^16.8 || ^17.0 || ^18.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+    dependencies:
+      '@babel/runtime': 7.22.6
+      '@radix-ui/react-use-layout-effect': 1.0.1(react@18.2.0)
+      react: 18.2.0
+    dev: true
+
+  /@radix-ui/react-popper@1.1.2(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-1CnGGfFi/bbqtJZZ0P/NQY20xdG3E0LALJaLUEoKwPLwl6PPPfbeiCqMVQnhoFRAxjJj4RpBRJzDmUgsex2tSg==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0
+      react-dom: ^16.8 || ^17.0 || ^18.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+    dependencies:
+      '@babel/runtime': 7.22.6
+      '@floating-ui/react-dom': 2.0.2(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-arrow': 1.0.3(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-compose-refs': 1.0.1(react@18.2.0)
+      '@radix-ui/react-context': 1.0.1(react@18.2.0)
+      '@radix-ui/react-primitive': 1.0.3(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-use-callback-ref': 1.0.1(react@18.2.0)
+      '@radix-ui/react-use-layout-effect': 1.0.1(react@18.2.0)
+      '@radix-ui/react-use-rect': 1.0.1(react@18.2.0)
+      '@radix-ui/react-use-size': 1.0.1(react@18.2.0)
+      '@radix-ui/rect': 1.0.1
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
+    dev: true
+
+  /@radix-ui/react-portal@1.0.3(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-xLYZeHrWoPmA5mEKEfZZevoVRK/Q43GfzRXkWV6qawIWWK8t6ifIiLQdd7rmQ4Vk1bmI21XhqF9BN3jWf+phpA==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0
+      react-dom: ^16.8 || ^17.0 || ^18.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+    dependencies:
+      '@babel/runtime': 7.22.6
+      '@radix-ui/react-primitive': 1.0.3(react-dom@18.2.0)(react@18.2.0)
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
+    dev: true
+
+  /@radix-ui/react-primitive@1.0.3(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-yi58uVyoAcK/Nq1inRY56ZSjKypBNKTa/1mcL8qdl6oJeEaDbOldlzrGn7P6Q3Id5d+SYNGc5AJgc4vGhjs5+g==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0
+      react-dom: ^16.8 || ^17.0 || ^18.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+    dependencies:
+      '@babel/runtime': 7.22.6
+      '@radix-ui/react-slot': 1.0.2(react@18.2.0)
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
+    dev: true
+
+  /@radix-ui/react-roving-focus@1.0.4(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-2mUg5Mgcu001VkGy+FfzZyzbmuUWzgWkj3rvv4yu+mLw03+mTzbxZHvfcGyFp2b8EkQeMkpRQ5FiA2Vr2O6TeQ==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0
+      react-dom: ^16.8 || ^17.0 || ^18.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+    dependencies:
+      '@babel/runtime': 7.22.6
+      '@radix-ui/primitive': 1.0.1
+      '@radix-ui/react-collection': 1.0.3(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-compose-refs': 1.0.1(react@18.2.0)
+      '@radix-ui/react-context': 1.0.1(react@18.2.0)
+      '@radix-ui/react-direction': 1.0.1(react@18.2.0)
+      '@radix-ui/react-id': 1.0.1(react@18.2.0)
+      '@radix-ui/react-primitive': 1.0.3(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-use-callback-ref': 1.0.1(react@18.2.0)
+      '@radix-ui/react-use-controllable-state': 1.0.1(react@18.2.0)
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
+    dev: true
+
+  /@radix-ui/react-select@1.2.2(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-zI7McXr8fNaSrUY9mZe4x/HC0jTLY9fWNhO1oLWYMQGDXuV4UCivIGTxwioSzO0ZCYX9iSLyWmAh/1TOmX3Cnw==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0
+      react-dom: ^16.8 || ^17.0 || ^18.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+    dependencies:
+      '@babel/runtime': 7.22.6
+      '@radix-ui/number': 1.0.1
+      '@radix-ui/primitive': 1.0.1
+      '@radix-ui/react-collection': 1.0.3(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-compose-refs': 1.0.1(react@18.2.0)
+      '@radix-ui/react-context': 1.0.1(react@18.2.0)
+      '@radix-ui/react-direction': 1.0.1(react@18.2.0)
+      '@radix-ui/react-dismissable-layer': 1.0.4(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-focus-guards': 1.0.1(react@18.2.0)
+      '@radix-ui/react-focus-scope': 1.0.3(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-id': 1.0.1(react@18.2.0)
+      '@radix-ui/react-popper': 1.1.2(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-portal': 1.0.3(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-primitive': 1.0.3(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-slot': 1.0.2(react@18.2.0)
+      '@radix-ui/react-use-callback-ref': 1.0.1(react@18.2.0)
+      '@radix-ui/react-use-controllable-state': 1.0.1(react@18.2.0)
+      '@radix-ui/react-use-layout-effect': 1.0.1(react@18.2.0)
+      '@radix-ui/react-use-previous': 1.0.1(react@18.2.0)
+      '@radix-ui/react-visually-hidden': 1.0.3(react-dom@18.2.0)(react@18.2.0)
+      aria-hidden: 1.2.3
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
+      react-remove-scroll: 2.5.5(react@18.2.0)
+    dev: true
+
+  /@radix-ui/react-separator@1.0.3(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-itYmTy/kokS21aiV5+Z56MZB54KrhPgn6eHDKkFeOLR34HMN2s8PaN47qZZAGnvupcjxHaFZnW4pQEh0BvvVuw==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0
+      react-dom: ^16.8 || ^17.0 || ^18.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+    dependencies:
+      '@babel/runtime': 7.22.6
+      '@radix-ui/react-primitive': 1.0.3(react-dom@18.2.0)(react@18.2.0)
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
+    dev: true
+
+  /@radix-ui/react-slot@1.0.2(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.22.6
+      '@radix-ui/react-compose-refs': 1.0.1(react@18.2.0)
+      react: 18.2.0
+    dev: true
+
+  /@radix-ui/react-toggle-group@1.0.4(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-Uaj/M/cMyiyT9Bx6fOZO0SAG4Cls0GptBWiBmBxofmDbNVnYYoyRWj/2M/6VCi/7qcXFWnHhRUfdfZFvvkuu8A==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0
+      react-dom: ^16.8 || ^17.0 || ^18.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+    dependencies:
+      '@babel/runtime': 7.22.6
+      '@radix-ui/primitive': 1.0.1
+      '@radix-ui/react-context': 1.0.1(react@18.2.0)
+      '@radix-ui/react-direction': 1.0.1(react@18.2.0)
+      '@radix-ui/react-primitive': 1.0.3(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-roving-focus': 1.0.4(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-toggle': 1.0.3(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-use-controllable-state': 1.0.1(react@18.2.0)
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
+    dev: true
+
+  /@radix-ui/react-toggle@1.0.3(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-Pkqg3+Bc98ftZGsl60CLANXQBBQ4W3mTFS9EJvNxKMZ7magklKV69/id1mlAlOFDDfHvlCms0fx8fA4CMKDJHg==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0
+      react-dom: ^16.8 || ^17.0 || ^18.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+    dependencies:
+      '@babel/runtime': 7.22.6
+      '@radix-ui/primitive': 1.0.1
+      '@radix-ui/react-primitive': 1.0.3(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-use-controllable-state': 1.0.1(react@18.2.0)
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
+    dev: true
+
+  /@radix-ui/react-toolbar@1.0.4(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-tBgmM/O7a07xbaEkYJWYTXkIdU/1pW4/KZORR43toC/4XWyBCURK0ei9kMUdp+gTPPKBgYLxXmRSH1EVcIDp8Q==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0
+      react-dom: ^16.8 || ^17.0 || ^18.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+    dependencies:
+      '@babel/runtime': 7.22.6
+      '@radix-ui/primitive': 1.0.1
+      '@radix-ui/react-context': 1.0.1(react@18.2.0)
+      '@radix-ui/react-direction': 1.0.1(react@18.2.0)
+      '@radix-ui/react-primitive': 1.0.3(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-roving-focus': 1.0.4(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-separator': 1.0.3(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-toggle-group': 1.0.4(react-dom@18.2.0)(react@18.2.0)
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
+    dev: true
+
+  /@radix-ui/react-use-callback-ref@1.0.1(react@18.2.0):
+    resolution: {integrity: sha512-D94LjX4Sp0xJFVaoQOd3OO9k7tpBYNOXdVhkltUbGv2Qb9OXdrg/CpsjlZv7ia14Sylv398LswWBVVu5nqKzAQ==}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^16.8 || ^17.0 || ^18.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+    dependencies:
+      '@babel/runtime': 7.22.6
+      react: 18.2.0
+    dev: true
+
+  /@radix-ui/react-use-controllable-state@1.0.1(react@18.2.0):
+    resolution: {integrity: sha512-Svl5GY5FQeN758fWKrjM6Qb7asvXeiZltlT4U2gVfl8Gx5UAv2sMR0LWo8yhsIZh2oQ0eFdZ59aoOOMV7b47VA==}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^16.8 || ^17.0 || ^18.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+    dependencies:
+      '@babel/runtime': 7.22.6
+      '@radix-ui/react-use-callback-ref': 1.0.1(react@18.2.0)
+      react: 18.2.0
+    dev: true
+
+  /@radix-ui/react-use-escape-keydown@1.0.3(react@18.2.0):
+    resolution: {integrity: sha512-vyL82j40hcFicA+M4Ex7hVkB9vHgSse1ZWomAqV2Je3RleKGO5iM8KMOEtfoSB0PnIelMd2lATjTGMYqN5ylTg==}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^16.8 || ^17.0 || ^18.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+    dependencies:
+      '@babel/runtime': 7.22.6
+      '@radix-ui/react-use-callback-ref': 1.0.1(react@18.2.0)
+      react: 18.2.0
+    dev: true
+
+  /@radix-ui/react-use-layout-effect@1.0.1(react@18.2.0):
+    resolution: {integrity: sha512-v/5RegiJWYdoCvMnITBkNNx6bCj20fiaJnWtRkU18yITptraXjffz5Qbn05uOiQnOvi+dbkznkoaMltz1GnszQ==}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^16.8 || ^17.0 || ^18.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+    dependencies:
+      '@babel/runtime': 7.22.6
+      react: 18.2.0
+    dev: true
+
+  /@radix-ui/react-use-previous@1.0.1(react@18.2.0):
+    resolution: {integrity: sha512-cV5La9DPwiQ7S0gf/0qiD6YgNqM5Fk97Kdrlc5yBcrF3jyEZQwm7vYFqMo4IfeHgJXsRaMvLABFtd0OVEmZhDw==}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^16.8 || ^17.0 || ^18.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+    dependencies:
+      '@babel/runtime': 7.22.6
+      react: 18.2.0
+    dev: true
+
+  /@radix-ui/react-use-rect@1.0.1(react@18.2.0):
+    resolution: {integrity: sha512-Cq5DLuSiuYVKNU8orzJMbl15TXilTnJKUCltMVQg53BQOF1/C5toAaGrowkgksdBQ9H+SRL23g0HDmg9tvmxXw==}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^16.8 || ^17.0 || ^18.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+    dependencies:
+      '@babel/runtime': 7.22.6
+      '@radix-ui/rect': 1.0.1
+      react: 18.2.0
+    dev: true
+
+  /@radix-ui/react-use-size@1.0.1(react@18.2.0):
+    resolution: {integrity: sha512-ibay+VqrgcaI6veAojjofPATwledXiSmX+C0KrBk/xgpX9rBzPV3OsfwlhQdUOFbh+LKQorLYT+xTXW9V8yd0g==}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^16.8 || ^17.0 || ^18.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+    dependencies:
+      '@babel/runtime': 7.22.6
+      '@radix-ui/react-use-layout-effect': 1.0.1(react@18.2.0)
+      react: 18.2.0
+    dev: true
+
+  /@radix-ui/react-visually-hidden@1.0.3(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-D4w41yN5YRKtu464TLnByKzMDG/JlMPHtfZgQAu9v6mNakUqGUI9vUrfQKz8NK41VMm/xbZbh76NUTVtIYqOMA==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0
+      react-dom: ^16.8 || ^17.0 || ^18.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+    dependencies:
+      '@babel/runtime': 7.22.6
+      '@radix-ui/react-primitive': 1.0.3(react-dom@18.2.0)(react@18.2.0)
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
+    dev: true
+
+  /@radix-ui/rect@1.0.1:
+    resolution: {integrity: sha512-fyrgCaedtvMg9NK3en0pnOYJdtfwxUcNolezkNPUsoX57X8oQk+NkqcvzHXD2uKNij6GXmWU9NDru2IWjrO4BQ==}
+    dependencies:
+      '@babel/runtime': 7.22.6
+    dev: true
+
+  /@redis/bloom@1.2.0(@redis/client@1.5.12):
+    resolution: {integrity: sha512-HG2DFjYKbpNmVXsa0keLHp/3leGJz1mjh09f2RLGGLQZzSHpkmZWuwJbAvo3QcRY8p80m5+ZdXZdYOSBLlp7Cg==}
+    peerDependencies:
+      '@redis/client': ^1.0.0
+    dependencies:
+      '@redis/client': 1.5.12
+    dev: false
+
+  /@redis/client@1.5.12:
+    resolution: {integrity: sha512-/ZjE18HRzMd80eXIIUIPcH81UoZpwulbo8FmbElrjPqH0QC0SeIKu1BOU49bO5trM5g895kAjhvalt5h77q+4A==}
+    engines: {node: '>=14'}
+    dependencies:
+      cluster-key-slot: 1.1.2
+      generic-pool: 3.9.0
+      yallist: 4.0.0
+    dev: false
+
+  /@redis/graph@1.1.1(@redis/client@1.5.12):
+    resolution: {integrity: sha512-FEMTcTHZozZciLRl6GiiIB4zGm5z5F3F6a6FZCyrfxdKOhFlGkiAqlexWMBzCi4DcRoyiOsuLfW+cjlGWyExOw==}
+    peerDependencies:
+      '@redis/client': ^1.0.0
+    dependencies:
+      '@redis/client': 1.5.12
+    dev: false
+
+  /@redis/json@1.0.6(@redis/client@1.5.12):
+    resolution: {integrity: sha512-rcZO3bfQbm2zPRpqo82XbW8zg4G/w4W3tI7X8Mqleq9goQjAGLL7q/1n1ZX4dXEAmORVZ4s1+uKLaUOg7LrUhw==}
+    peerDependencies:
+      '@redis/client': ^1.0.0
+    dependencies:
+      '@redis/client': 1.5.12
+    dev: false
+
+  /@redis/search@1.1.6(@redis/client@1.5.12):
+    resolution: {integrity: sha512-mZXCxbTYKBQ3M2lZnEddwEAks0Kc7nauire8q20oA0oA/LoA+E/b5Y5KZn232ztPb1FkIGqo12vh3Lf+Vw5iTw==}
+    peerDependencies:
+      '@redis/client': ^1.0.0
+    dependencies:
+      '@redis/client': 1.5.12
+    dev: false
+
+  /@redis/time-series@1.0.5(@redis/client@1.5.12):
+    resolution: {integrity: sha512-IFjIgTusQym2B5IZJG3XKr5llka7ey84fw/NOYqESP5WUfQs9zz1ww/9+qoz4ka/S6KcGBodzlCeZ5UImKbscg==}
+    peerDependencies:
+      '@redis/client': ^1.0.0
+    dependencies:
+      '@redis/client': 1.5.12
+    dev: false
+
+  /@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:
+      rollup: 3.29.4
+      slash: 4.0.0
+    dev: true
+
+  /@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:
+      '@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
+
+  /@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:
+      '@rollup/pluginutils': 5.1.0(rollup@3.29.4)
+      rollup: 3.29.4
+    dev: true
+
+  /@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
+
+  /@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:
+      '@rollup/pluginutils': 5.0.5(rollup@3.29.4)
+      magic-string: 0.30.5
+      rollup: 3.29.4
+    dev: true
+
+  /@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/estree': 1.0.0
+      estree-walker: 2.0.2
+      picomatch: 2.3.1
+      rollup: 3.29.4
+    dev: true
+
+  /@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:
+      '@types/estree': 1.0.0
+      estree-walker: 2.0.2
+      picomatch: 2.3.1
+      rollup: 3.29.4
+    dev: true
+
+  /@rollup/rollup-android-arm-eabi@4.6.0:
+    resolution: {integrity: sha512-keHkkWAe7OtdALGoutLY3utvthkGF+Y17ws9LYT8pxMBYXaCoH/8dXS2uzo6e8+sEhY7y/zi5RFo22Dy2lFpDw==}
+    cpu: [arm]
+    os: [android]
+    dev: true
+    optional: true
+
+  /@rollup/rollup-android-arm64@4.6.0:
+    resolution: {integrity: sha512-y3Kt+34smKQNWilicPbBz/MXEY7QwDzMFNgwEWeYiOhUt9MTWKjHqe3EVkXwT2fR7izOvHpDWZ0o2IyD9SWX7A==}
+    cpu: [arm64]
+    os: [android]
+    dev: true
+    optional: true
+
+  /@rollup/rollup-darwin-arm64@4.6.0:
+    resolution: {integrity: sha512-oLzzxcUIHltHxOCmaXl+pkIlU+uhSxef5HfntW7RsLh1eHm+vJzjD9Oo4oUKso4YuP4PpbFJNlZjJuOrxo8dPg==}
+    cpu: [arm64]
+    os: [darwin]
+    dev: true
+    optional: true
+
+  /@rollup/rollup-darwin-x64@4.6.0:
+    resolution: {integrity: sha512-+ANnmjkcOBaV25n0+M0Bere3roeVAnwlKW65qagtuAfIxXF9YxUneRyAn/RDcIdRa7QrjRNJL3jR7T43ObGe8Q==}
+    cpu: [x64]
+    os: [darwin]
+    dev: true
+    optional: true
+
+  /@rollup/rollup-linux-arm-gnueabihf@4.6.0:
+    resolution: {integrity: sha512-tBTSIkjSVUyrekddpkAqKOosnj1Fc0ZY0rJL2bIEWPKqlEQk0paORL9pUIlt7lcGJi3LzMIlUGXvtNi1Z6MOCQ==}
+    cpu: [arm]
+    os: [linux]
+    dev: true
+    optional: true
+
+  /@rollup/rollup-linux-arm64-gnu@4.6.0:
+    resolution: {integrity: sha512-Ed8uJI3kM11de9S0j67wAV07JUNhbAqIrDYhQBrQW42jGopgheyk/cdcshgGO4fW5Wjq97COCY/BHogdGvKVNQ==}
+    cpu: [arm64]
+    os: [linux]
+    dev: true
+    optional: true
+
+  /@rollup/rollup-linux-arm64-musl@4.6.0:
+    resolution: {integrity: sha512-mZoNQ/qK4D7SSY8v6kEsAAyDgznzLLuSFCA3aBHZTmf3HP/dW4tNLTtWh9+LfyO0Z1aUn+ecpT7IQ3WtIg3ViQ==}
+    cpu: [arm64]
+    os: [linux]
+    dev: true
+    optional: true
+
+  /@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
+
+  /@rollup/rollup-win32-ia32-msvc@4.6.0:
+    resolution: {integrity: sha512-rxfeE6K6s/Xl2HGeK6cO8SiQq3k/3BYpw7cfhW5Bk2euXNEpuzi2cc7llxx1si1QgwfjNtdRNTGqdBzGlFZGFw==}
+    cpu: [ia32]
+    os: [win32]
+    dev: true
+    optional: true
+
+  /@rollup/rollup-win32-x64-msvc@4.6.0:
+    resolution: {integrity: sha512-QqmCsydHS172Y0Kc13bkMXvipbJSvzeglBncJG3LsYJSiPlxYACz7MmJBs4A8l1oU+jfhYEIC/+AUSlvjmiX/g==}
+    cpu: [x64]
+    os: [win32]
+    dev: true
+    optional: true
+
   /@rudderstack/rudder-sdk-node@1.0.6:
     resolution: {integrity: sha512-kJYCXv6fRFbQrAp3hMsgRCnAa7RUBdbiGLBT9PcpQURi0VwHmD7mk3Ja7U4HDnL0EHXYJpPyx3oSonkklmPJ9Q==}
     engines: {node: '>=4'}
@@ -5072,7 +7401,7 @@ packages:
       '@segment/loosely-validate-event': 2.0.0
       auto-changelog: 1.16.4
       axios: 0.21.4
-      axios-retry: 3.3.1
+      axios-retry: 3.7.0
       bull: 3.29.3
       lodash.clonedeep: 4.5.0
       lodash.isstring: 4.0.1
@@ -5088,6 +7417,39 @@ packages:
       - supports-color
     dev: false
 
+  /@rushstack/node-core-library@3.61.0:
+    resolution: {integrity: sha512-tdOjdErme+/YOu4gPed3sFS72GhtWCgNV9oDsHDnoLY5oDfwjKUc9Z+JOZZ37uAxcm/OCahDHfuu2ugqrfWAVQ==}
+    peerDependencies:
+      '@types/node': ^18.16.16
+    peerDependenciesMeta:
+      '@types/node':
+        optional: true
+    dependencies:
+      colors: 1.2.5
+      fs-extra: 7.0.1
+      import-lazy: 4.0.0
+      jju: 1.4.0
+      resolve: 1.22.8
+      semver: 7.5.4
+      z-schema: 5.0.5
+    dev: true
+
+  /@rushstack/rig-package@0.5.1:
+    resolution: {integrity: sha512-pXRYSe29TjRw7rqxD4WS3HN/sRSbfr+tJs4a9uuaSIBAITbUggygdhuG0VrO0EO+QqH91GhYMN4S6KRtOEmGVA==}
+    dependencies:
+      resolve: 1.22.8
+      strip-json-comments: 3.1.1
+    dev: true
+
+  /@rushstack/ts-command-line@4.17.1:
+    resolution: {integrity: sha512-2jweO1O57BYP5qdBGl6apJLB+aRIn5ccIRTPDyULh0KMwVzFqWtw6IZWt1qtUoZD/pD2RNkIOosH6Cq45rIYeg==}
+    dependencies:
+      '@types/argparse': 1.0.38
+      argparse: 1.0.10
+      colors: 1.2.5
+      string-argv: 0.3.1
+    dev: true
+
   /@segment/loosely-validate-event@2.0.0:
     resolution: {integrity: sha512-ZMCSfztDBqwotkl848ODgVcAmN4OItEWDCkshcKz0/W6gGSQayuuCtWV/MlodFivAZD793d6UgANd6wCXUfrIw==}
     dependencies:
@@ -5095,6 +7457,13 @@ packages:
       join-component: 1.1.0
     dev: false
 
+  /@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
+
   /@selderee/plugin-htmlparser2@0.6.0:
     resolution: {integrity: sha512-J3jpy002TyBjd4N/p6s+s90eX42H2eRhK3SbsZuvTDv977/E8p2U3zikdiehyJja66do7FlxLomZLPlvl2/xaA==}
     dependencies:
@@ -5102,22 +7471,20 @@ packages:
       selderee: 0.6.0
     dev: false
 
-  /@sentry-internal/tracing@7.60.1:
-    resolution: {integrity: sha512-2vM+3/ddzmoBfi92OOD9FFTHXf0HdQhKtNM26+/RsmkKnTid+/inbvA7nKi+Qa7ExcnlC6eclEHQEg+0X3yDkQ==}
+  /@sentry-internal/tracing@7.87.0:
+    resolution: {integrity: sha512-HYa0+rfFmYQ/DadXoiuarTSxrcnYDCd/fm0pFuOHjICtfja8IcLegVYP2/r3CgwB+IjquCtJ5kDcqS/NTgUcpA==}
     engines: {node: '>=8'}
     dependencies:
-      '@sentry/core': 7.60.1
-      '@sentry/types': 7.60.1
-      '@sentry/utils': 7.60.1
-      tslib: 2.6.1
-    dev: true
+      '@sentry/core': 7.87.0
+      '@sentry/types': 7.87.0
+      '@sentry/utils': 7.87.0
 
   /@sentry/bundler-plugin-core@2.5.0:
     resolution: {integrity: sha512-UNjeTSf0Irt/RsC1Xsfxa+RC92mBvjzuWQnvHJ5c+mXwUt+jLcFgGMCSVK/FCDZO+gAeKzmU1+G2UexbsNAP8w==}
     engines: {node: '>= 14'}
     dependencies:
       '@sentry/cli': 2.17.0(patch_hash=nchnoezkq6p37qaiku3vrpwraq)
-      '@sentry/node': 7.60.1
+      '@sentry/node': 7.87.0
       '@sentry/utils': 7.60.1
       dotenv: 16.3.1
       find-up: 5.0.0
@@ -5135,7 +7502,7 @@ packages:
     hasBin: true
     dependencies:
       https-proxy-agent: 5.0.1
-      node-fetch: 2.6.8
+      node-fetch: 2.7.0(encoding@0.1.13)
       progress: 2.0.3
       proxy-from-env: 1.1.0
       which: 2.0.2
@@ -5145,82 +7512,43 @@ packages:
     dev: true
     patched: true
 
-  /@sentry/core@7.28.1:
-    resolution: {integrity: sha512-7wvnuvn/mrAfcugWoCG/3pqDIrUgH5t+HisMJMGw0h9Tc33KqrmqMDCQVvjlrr2pWrw/vuUCFdm8CbUHJ832oQ==}
+  /@sentry/core@7.87.0:
+    resolution: {integrity: sha512-jkoXqK/nuYh8DYS+n7uaSuSIdw4HJemyRkXsWjAEPtEgD7taGMafZGbP5pl+XE38SE59jTBxmKnkUEZOFMgZGA==}
     engines: {node: '>=8'}
     dependencies:
-      '@sentry/types': 7.28.1
-      '@sentry/utils': 7.28.1
-      tslib: 2.6.1
-    dev: false
+      '@sentry/types': 7.87.0
+      '@sentry/utils': 7.87.0
 
-  /@sentry/core@7.60.1:
-    resolution: {integrity: sha512-yr/0VFYWOJyXj+F2nifkRYxXskotsNnDggUnFOZZN2ZgTG94IzRFsOZQ6RslHJ8nrYPTBNO74reU0C0GB++xRw==}
+  /@sentry/integrations@7.87.0:
+    resolution: {integrity: sha512-xbyOQeyfG1sF2PBMIOz3c3i0Y3+8q4UlxoeOhpFe6Vpjek+I/g7onZT6YevT6cWG083cg+rS0VCgPQSUV2lxIw==}
     engines: {node: '>=8'}
     dependencies:
-      '@sentry/types': 7.60.1
-      '@sentry/utils': 7.60.1
-      tslib: 2.6.1
-    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
+      '@sentry/core': 7.87.0
+      '@sentry/types': 7.87.0
+      '@sentry/utils': 7.87.0
       localforage: 1.10.0
-      tslib: 2.6.1
     dev: false
 
-  /@sentry/node@7.28.1:
-    resolution: {integrity: sha512-n7AbpJqZJjWPpKNGc55mP7AdQ+XSomS9MZJuZ+Xt2AU52aVwGPI4z9aHUJFSDGaMHHiu/toyPnoUES+XZf6/hw==}
+  /@sentry/node@7.87.0:
+    resolution: {integrity: sha512-mGcZMCL3/IMTLIRcWLF+H9z2Bb2d34gKmg2rhXqI8BqhhUA551jMRlZv/y4za2Osjy550KwVoNsA1qtEe5mYyQ==}
     engines: {node: '>=8'}
     dependencies:
-      '@sentry/core': 7.28.1
-      '@sentry/types': 7.28.1
-      '@sentry/utils': 7.28.1
-      cookie: 0.4.2
+      '@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
-      lru_map: 0.3.3
-      tslib: 2.6.1
     transitivePeerDependencies:
       - supports-color
-    dev: false
-
-  /@sentry/node@7.60.1:
-    resolution: {integrity: sha512-lBt3RqncY4XbzM+PlTbH/tUWeOsm24anwEzvA2DSDP1NL3WZ5MdvT77q7NqpvpVNd2LeGAQ6x7AXDzE53YBfnQ==}
-    engines: {node: '>=8'}
-    dependencies:
-      '@sentry-internal/tracing': 7.60.1
-      '@sentry/core': 7.60.1
-      '@sentry/types': 7.60.1
-      '@sentry/utils': 7.60.1
-      cookie: 0.4.2
-      https-proxy-agent: 5.0.1
-      lru_map: 0.3.3
-      tslib: 2.6.1
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@sentry/types@7.28.1:
-    resolution: {integrity: sha512-DvSplMVrVEmOzR2M161V5+B8Up3vR71xMqJOpWTzE9TqtFJRGPtqT/5OBsNJJw1+/j2ssMcnKwbEo9Q2EGeS6g==}
-    engines: {node: '>=8'}
-    dev: false
 
   /@sentry/types@7.60.1:
     resolution: {integrity: sha512-8lKKSCOhZ953cWxwnfZwoR3ZFFlZG4P3PQFTaFt/u4LxLh/0zYbdtgvtUqXRURjMCi5P6ddeE9Uw9FGnTJCsTw==}
     engines: {node: '>=8'}
     dev: true
 
-  /@sentry/utils@7.28.1:
-    resolution: {integrity: sha512-75/jzLUO9HH09iC9TslNimGbxOP3jgn89P+q7uR+rp2fJfRExHVeKJZQdK0Ij4/SmE7TJ3Uh2r154N0INZEx1g==}
+  /@sentry/types@7.87.0:
+    resolution: {integrity: sha512-w8jKFHq/Llupmr2FezmFgQsnm3y/CnqLjb7s6PstI78E409wrhH7p7oqX/OEuzccH1qNCNwes/3QKvPTRQDB4Q==}
     engines: {node: '>=8'}
-    dependencies:
-      '@sentry/types': 7.28.1
-      tslib: 2.6.1
-    dev: false
 
   /@sentry/utils@7.60.1:
     resolution: {integrity: sha512-ik+5sKGBx4DWuvf6UUKPSafaDiASxP+Xvjg3C9ppop2I/JWxP1FfZ5g22n5ZmPmNahD6clTSoTWly8qyDUlUOw==}
@@ -5230,6 +7558,12 @@ packages:
       tslib: 2.6.1
     dev: true
 
+  /@sentry/utils@7.87.0:
+    resolution: {integrity: sha512-7xgtPTnTNP/4IznFMFXxltuaXfLvzznrYCDMv9ny8EeUjJqlLX3CVA8Qq3YALsLCQCKcrGRARbAcd/EGG//w2w==}
+    engines: {node: '>=8'}
+    dependencies:
+      '@sentry/types': 7.87.0
+
   /@sentry/vite-plugin@2.5.0:
     resolution: {integrity: sha512-u5lfIysy6UVzUGn/adyDcRXfzFyip4mLGThTnKeOeA9rCgmJUVnErH8TD8xhTKdpq/MBiQ+KqrC6xG9pKCa96g==}
     engines: {node: '>= 14'}
@@ -5241,14 +7575,18 @@ packages:
       - supports-color
     dev: true
 
+  /@sevinf/maybe@0.5.0:
+    resolution: {integrity: sha512-ARhyoYDnY1LES3vYI0fiG6e9esWfTNcXcO6+MPJJXcnyMV3bim4lnFt45VXouV7y82F4x3YH8nOQ6VztuvUiWg==}
+    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==}
+  /@sideway/formula@3.0.1:
+    resolution: {integrity: sha512-/poHZJJVjx3L+zVD6g9KgHfYnb443oi7wLu/XKojDviHy6HOEOA6z1Trk5aR1dGcmPenJEgb2sK2I80LeS3MIg==}
     dev: true
 
   /@sideway/pinpoint@2.0.0:
@@ -5263,6 +7601,10 @@ packages:
     resolution: {integrity: sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==}
     dev: true
 
+  /@sinclair/typebox@0.29.6:
+    resolution: {integrity: sha512-aX5IFYWlMa7tQ8xZr3b2gtVReCvg7f3LEhjir/JAjX2bJCMVJA5tIPv30wTD4KDfcwMd7DDYY3hFDeGmOgtrZQ==}
+    dev: false
+
   /@sinonjs/commons@2.0.0:
     resolution: {integrity: sha512-uLa0j859mMrg2slwQYdO/AkrOfmH+X6LTVmNTS9CqexuE2IvVORIkSpJLqePAbEnKJ77aMmCwr1NUZ57120Xcg==}
     dependencies:
@@ -5275,77 +7617,252 @@ packages:
       '@sinonjs/commons': 2.0.0
     dev: true
 
-  /@smithy/abort-controller@2.0.5:
-    resolution: {integrity: sha512-byVZ2KWLMPYAZGKjRpniAzLcygJO4ruClZKdJTuB0eCB76ONFTdptBHlviHpAZXknRz7skYWPfcgO9v30A1SyA==}
+  /@smithy/abort-controller@2.0.14:
+    resolution: {integrity: sha512-zXtteuYLWbSXnzI3O6xq3FYvigYZFW8mdytGibfarLL2lxHto9L3ILtGVnVGmFZa7SDh62l39EnU5hesLN87Fw==}
     engines: {node: '>=14.0.0'}
     dependencies:
-      '@smithy/types': 2.2.2
+      '@smithy/types': 2.7.0
       tslib: 2.6.1
     dev: false
-    optional: true
 
-  /@smithy/config-resolver@2.0.5:
-    resolution: {integrity: sha512-n0c2AXz+kjALY2FQr7Zy9zhYigXzboIh1AuUUVCqFBKFtdEvTwnwPXrTDoEehLiRTUHNL+4yzZ3s+D0kKYSLSg==}
+  /@smithy/abort-controller@2.0.15:
+    resolution: {integrity: sha512-JkS36PIS3/UCbq/MaozzV7jECeL+BTt4R75bwY8i+4RASys4xOyUS1HsRyUNSqUXFP4QyCz5aNnh3ltuaxv+pw==}
     engines: {node: '>=14.0.0'}
     dependencies:
-      '@smithy/types': 2.2.2
+      '@smithy/types': 2.7.0
+      tslib: 2.6.1
+    dev: false
+
+  /@smithy/chunked-blob-reader-native@2.0.1:
+    resolution: {integrity: sha512-N2oCZRglhWKm7iMBu7S6wDzXirjAofi7tAd26cxmgibRYOBS4D3hGfmkwCpHdASZzwZDD8rluh0Rcqw1JeZDRw==}
+    dependencies:
+      '@smithy/util-base64': 2.0.1
+      tslib: 2.6.1
+    dev: false
+
+  /@smithy/chunked-blob-reader@2.0.0:
+    resolution: {integrity: sha512-k+J4GHJsMSAIQPChGBrjEmGS+WbPonCXesoqP9fynIqjn7rdOThdH8FAeCmokP9mxTYKQAKoHCLPzNlm6gh7Wg==}
+    dependencies:
+      tslib: 2.6.1
+    dev: false
+
+  /@smithy/config-resolver@2.0.19:
+    resolution: {integrity: sha512-JsghnQ5zjWmjEVY8TFOulLdEOCj09SjRLugrHlkPZTIBBm7PQitCFVLThbsKPZQOP7N3ME1DU1nKUc1UaVnBog==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@smithy/node-config-provider': 2.1.6
+      '@smithy/types': 2.6.0
       '@smithy/util-config-provider': 2.0.0
-      '@smithy/util-middleware': 2.0.0
+      '@smithy/util-middleware': 2.0.7
       tslib: 2.6.1
     dev: false
-    optional: true
 
-  /@smithy/credential-provider-imds@2.0.5:
-    resolution: {integrity: sha512-KFcf/e0meFkQNyteJ65f1G19sgUEY1e5zL7hyAEUPz2SEfBmC9B37WyRq87G3MEEsvmAWwCRu7nFFYUKtR3svQ==}
+  /@smithy/config-resolver@2.0.21:
+    resolution: {integrity: sha512-rlLIGT+BeqjnA6C2FWumPRJS1UW07iU5ZxDHtFuyam4W65gIaOFMjkB90ofKCIh+0mLVQrQFrl/VLtQT/6FWTA==}
     engines: {node: '>=14.0.0'}
     dependencies:
-      '@smithy/node-config-provider': 2.0.5
-      '@smithy/property-provider': 2.0.5
-      '@smithy/types': 2.2.2
-      '@smithy/url-parser': 2.0.5
+      '@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.1
     dev: false
-    optional: true
 
-  /@smithy/eventstream-codec@2.0.5:
-    resolution: {integrity: sha512-iqR6OuOV3zbQK8uVs9o+9AxhVk8kW9NAxA71nugwUB+kTY9C35pUd0A5/m4PRT0Y0oIW7W4kgnSR3fdYXQjECw==}
+  /@smithy/core@1.2.0:
+    resolution: {integrity: sha512-l8R89X7+hlt2FEFg+OrNq29LP3h9DfGPmO6ObwT9IXWHD6V7ycpj5u2rVQyIis26ovrgOYakl6nfgmPMm8m1IQ==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@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.1
+    dev: false
+
+  /@smithy/credential-provider-imds@2.1.2:
+    resolution: {integrity: sha512-Y62jBWdoLPSYjr9fFvJf+KwTa1EunjVr6NryTEWCnwIY93OJxwV4t0qxjwdPl/XMsUkq79ppNJSEQN6Ohnhxjw==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@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.1
+    dev: false
+
+  /@smithy/credential-provider-imds@2.1.4:
+    resolution: {integrity: sha512-cwPJN1fa1YOQzhBlTXRavABEYRRchci1X79QRwzaNLySnIMJfztyv1Zkst0iZPLMnpn8+CnHu3wOHS11J5Dr3A==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@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.1
+    dev: false
+
+  /@smithy/eventstream-codec@2.0.14:
+    resolution: {integrity: sha512-g/OU/MeWGfHDygoXgMWfG/Xb0QqDnAGcM9t2FRrVAhleXYRddGOEnfanR5cmHgB9ue52MJsyorqFjckzXsylaA==}
     dependencies:
       '@aws-crypto/crc32': 3.0.0
-      '@smithy/types': 2.2.2
+      '@smithy/types': 2.7.0
       '@smithy/util-hex-encoding': 2.0.0
       tslib: 2.6.1
     dev: false
-    optional: true
 
-  /@smithy/fetch-http-handler@2.0.5:
-    resolution: {integrity: sha512-EzFoMowdBNy1VqtvkiXgPFEdosIAt4/4bgZ8uiDiUyfhmNXq/3bV+CagPFFBsgFOR/X2XK4zFZHRsoa7PNHVVg==}
+  /@smithy/eventstream-codec@2.0.15:
+    resolution: {integrity: sha512-crjvz3j1gGPwA0us6cwS7+5gAn35CTmqu/oIxVbYJo2Qm/sGAye6zGJnMDk3BKhWZw5kcU1G4MxciTkuBpOZPg==}
     dependencies:
-      '@smithy/protocol-http': 2.0.5
-      '@smithy/querystring-builder': 2.0.5
-      '@smithy/types': 2.2.2
-      '@smithy/util-base64': 2.0.0
+      '@aws-crypto/crc32': 3.0.0
+      '@smithy/types': 2.7.0
+      '@smithy/util-hex-encoding': 2.0.0
       tslib: 2.6.1
     dev: false
-    optional: true
 
-  /@smithy/hash-node@2.0.5:
-    resolution: {integrity: sha512-mk551hIywBITT+kXruRNXk7f8Fy7DTzBjZJSr/V6nolYKmUHIG3w5QU6nO9qPYEQGKc/yEPtkpdS28ndeG93lA==}
+  /@smithy/eventstream-serde-browser@2.0.14:
+    resolution: {integrity: sha512-41wmYE9smDGJi1ZXp+LogH6BR7MkSsQD91wneIFISF/mupKULvoOJUkv/Nf0NMRxWlM3Bf1Vvi9FlR2oV4KU8Q==}
     engines: {node: '>=14.0.0'}
     dependencies:
-      '@smithy/types': 2.2.2
-      '@smithy/util-buffer-from': 2.0.0
-      '@smithy/util-utf8': 2.0.0
+      '@smithy/eventstream-serde-universal': 2.0.14
+      '@smithy/types': 2.6.0
       tslib: 2.6.1
     dev: false
-    optional: true
 
-  /@smithy/invalid-dependency@2.0.5:
-    resolution: {integrity: sha512-0wEi+JT0hM+UUwrJVYbqjuGFhy5agY/zXyiN7BNAJ1XoCDjU5uaNSj8ekPWsXd/d4yM6NSe8UbPd8cOc1+3oBQ==}
+  /@smithy/eventstream-serde-browser@2.0.15:
+    resolution: {integrity: sha512-WiFG5N9j3jmS5P0z5Xev6dO0c3lf7EJYC2Ncb0xDnWFvShwXNn741AF71ABr5EcZw8F4rQma0362MMjAwJeZog==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      '@smithy/types': 2.2.2
+      '@smithy/eventstream-serde-universal': 2.0.15
+      '@smithy/types': 2.7.0
+      tslib: 2.6.1
+    dev: false
+
+  /@smithy/eventstream-serde-config-resolver@2.0.14:
+    resolution: {integrity: sha512-43IyRIzQ82s+5X+t/3Ood00CcWtAXQdmUIUKMed2Qg9REPk8SVIHhpm3rwewLwg+3G2Nh8NOxXlEQu6DsPUcMw==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@smithy/types': 2.6.0
+      tslib: 2.6.1
+    dev: false
+
+  /@smithy/eventstream-serde-config-resolver@2.0.15:
+    resolution: {integrity: sha512-o65d2LRjgCbWYH+VVNlWXtmsI231SO99ZTOL4UuIPa6WTjbSHWtlXvUcJG9libhEKWmEV9DIUiH2IqyPWi7ubA==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@smithy/types': 2.7.0
+      tslib: 2.6.1
+    dev: false
+
+  /@smithy/eventstream-serde-node@2.0.14:
+    resolution: {integrity: sha512-jVh9E2qAr6DxH5tWfCAl9HV6tI0pEQ3JVmu85JknDvYTC66djcjDdhctPV2EHuKWf2kjRiFJcMIn0eercW4THA==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@smithy/eventstream-serde-universal': 2.0.14
+      '@smithy/types': 2.6.0
+      tslib: 2.6.1
+    dev: false
+
+  /@smithy/eventstream-serde-node@2.0.15:
+    resolution: {integrity: sha512-9OOXiIhHq1VeOG6xdHkn2ZayfMYM3vzdUTV3zhcCnt+tMqA3BJK3XXTJFRR2BV28rtRM778DzqbBTf+hqwQPTg==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@smithy/eventstream-serde-universal': 2.0.15
+      '@smithy/types': 2.7.0
+      tslib: 2.6.1
+    dev: false
+
+  /@smithy/eventstream-serde-universal@2.0.14:
+    resolution: {integrity: sha512-Ie35+AISNn1NmEjn5b2SchIE49pvKp4Q74bE9ME5RULWI1MgXyGkQUajWd5E6OBSr/sqGcs+rD3IjPErXnCm9g==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@smithy/eventstream-codec': 2.0.14
+      '@smithy/types': 2.7.0
+      tslib: 2.6.1
+    dev: false
+
+  /@smithy/eventstream-serde-universal@2.0.15:
+    resolution: {integrity: sha512-dP8AQp/pXlWBjvL0TaPBJC3rM0GoYv7O0Uim8d/7UKZ2Wo13bFI3/BhQfY/1DeiP1m23iCHFNFtOQxfQNBB8rQ==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@smithy/eventstream-codec': 2.0.15
+      '@smithy/types': 2.7.0
+      tslib: 2.6.1
+    dev: false
+
+  /@smithy/fetch-http-handler@2.2.7:
+    resolution: {integrity: sha512-iSDBjxuH9TgrtMYAr7j5evjvkvgwLY3y+9D547uep+JNkZ1ZT+BaeU20j6I/bO/i26ilCWFImrlXTPsfQtZdIQ==}
+    dependencies:
+      '@smithy/protocol-http': 3.0.10
+      '@smithy/querystring-builder': 2.0.14
+      '@smithy/types': 2.6.0
+      '@smithy/util-base64': 2.0.1
+      tslib: 2.6.1
+    dev: false
+
+  /@smithy/fetch-http-handler@2.3.1:
+    resolution: {integrity: sha512-6MNk16fqb8EwcYY8O8WxB3ArFkLZ2XppsSNo1h7SQcFdDDwIumiJeO6wRzm7iB68xvsOQzsdQKbdtTieS3hfSQ==}
+    dependencies:
+      '@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.1
+    dev: false
+
+  /@smithy/hash-blob-browser@2.0.16:
+    resolution: {integrity: sha512-cSYRi05LA7DZDwjB1HL0BP8B56eUNNeLglVH147QTXFyuXJq/7erAIiLRfsyXB8+GfFHkSS5BHbc76a7k/AYPA==}
+    dependencies:
+      '@smithy/chunked-blob-reader': 2.0.0
+      '@smithy/chunked-blob-reader-native': 2.0.1
+      '@smithy/types': 2.7.0
+      tslib: 2.6.1
+    dev: false
+
+  /@smithy/hash-node@2.0.16:
+    resolution: {integrity: sha512-Wbi9A0PacMYUOwjAulQP90Wl3mQ6NDwnyrZQzFjDz+UzjXOSyQMgBrTkUBz+pVoYVlX3DUu24gWMZBcit+wOGg==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@smithy/types': 2.6.0
+      '@smithy/util-buffer-from': 2.0.0
+      '@smithy/util-utf8': 2.0.2
+      tslib: 2.6.1
+    dev: false
+
+  /@smithy/hash-node@2.0.17:
+    resolution: {integrity: sha512-Il6WuBcI1nD+e2DM7tTADMf01wEPGK8PAhz4D+YmDUVaoBqlA+CaH2uDJhiySifmuKBZj748IfygXty81znKhw==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@smithy/types': 2.7.0
+      '@smithy/util-buffer-from': 2.0.0
+      '@smithy/util-utf8': 2.0.2
+      tslib: 2.6.1
+    dev: false
+
+  /@smithy/hash-stream-node@2.0.17:
+    resolution: {integrity: sha512-ey8DtnATzp1mOXgS7rqMwSmAki6iJA+jgNucKcxRkhMB1rrICfHg+rhmIF50iLPDHUhTcS5pBMOrLzzpZftvNQ==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@smithy/types': 2.7.0
+      '@smithy/util-utf8': 2.0.2
+      tslib: 2.6.1
+    dev: false
+
+  /@smithy/invalid-dependency@2.0.14:
+    resolution: {integrity: sha512-d8ohpwZo9RzTpGlAfsWtfm1SHBSU7+N4iuZ6MzR10xDTujJJWtmXYHK1uzcr7rggbpUTaWyHpPFgnf91q0EFqQ==}
+    dependencies:
+      '@smithy/types': 2.6.0
+      tslib: 2.6.1
+    dev: false
+
+  /@smithy/invalid-dependency@2.0.15:
+    resolution: {integrity: sha512-dlEKBFFwVfzA5QroHlBS94NpgYjXhwN/bFfun+7w3rgxNvVy79SK0w05iGc7UAeC5t+D7gBxrzdnD6hreZnDVQ==}
+    dependencies:
+      '@smithy/types': 2.7.0
       tslib: 2.6.1
     dev: false
-    optional: true
 
   /@smithy/is-array-buffer@2.0.0:
     resolution: {integrity: sha512-z3PjFjMyZNI98JFRJi/U0nGoLWMSJlDjAW4QUX2WNZLas5C0CmVV6LJ01JI0k90l7FvpmixjWxPFmENSClQ7ug==}
@@ -5353,194 +7870,350 @@ packages:
     dependencies:
       tslib: 2.6.1
     dev: false
-    optional: true
 
-  /@smithy/middleware-content-length@2.0.5:
-    resolution: {integrity: sha512-E7VwV5H02fgZIUGRli4GevBCAPvkyEI/fgl9SU47nPPi3DAAX3nEtUb8xfGbXjOcJ5BdSUoWWZn42tEd/blOqA==}
-    engines: {node: '>=14.0.0'}
+  /@smithy/md5-js@2.0.17:
+    resolution: {integrity: sha512-jmISTCnEkOnm2oCNx/rMkvBT/eQh3aA6nktevkzbmn/VYqYEuc5Z2n5sTTqsciMSO01Lvf56wG1A4twDqovYeQ==}
     dependencies:
-      '@smithy/protocol-http': 2.0.5
-      '@smithy/types': 2.2.2
+      '@smithy/types': 2.7.0
+      '@smithy/util-utf8': 2.0.2
       tslib: 2.6.1
     dev: false
-    optional: true
 
-  /@smithy/middleware-endpoint@2.0.5:
-    resolution: {integrity: sha512-tyzDuoNTbsMQCq5Xkc4QOt6e2GACUllQIV8SQ5fc59FtOIV9/vbf58/GxVjZm2o8+MMbdDBANjTDZe/ijZKfyA==}
+  /@smithy/middleware-content-length@2.0.16:
+    resolution: {integrity: sha512-9ddDia3pp1d3XzLXKcm7QebGxLq9iwKf+J1LapvlSOhpF8EM9SjMeSrMOOFgG+2TfW5K3+qz4IAJYYm7INYCng==}
     engines: {node: '>=14.0.0'}
     dependencies:
-      '@smithy/middleware-serde': 2.0.5
-      '@smithy/types': 2.2.2
-      '@smithy/url-parser': 2.0.5
-      '@smithy/util-middleware': 2.0.0
+      '@smithy/protocol-http': 3.0.10
+      '@smithy/types': 2.6.0
       tslib: 2.6.1
     dev: false
-    optional: true
 
-  /@smithy/middleware-retry@2.0.5:
-    resolution: {integrity: sha512-ulIfbFyzQTVnJbLjUl1CTSi0etg6tej/ekwaLp0Gn8ybUkDkKYa+uB6CF/m2J5B6meRwyJlsryR+DjaOVyiicg==}
+  /@smithy/middleware-content-length@2.0.17:
+    resolution: {integrity: sha512-OyadvMcKC7lFXTNBa8/foEv7jOaqshQZkjWS9coEXPRZnNnihU/Ls+8ZuJwGNCOrN2WxXZFmDWhegbnM4vak8w==}
     engines: {node: '>=14.0.0'}
     dependencies:
-      '@smithy/protocol-http': 2.0.5
-      '@smithy/service-error-classification': 2.0.0
-      '@smithy/types': 2.2.2
-      '@smithy/util-middleware': 2.0.0
-      '@smithy/util-retry': 2.0.0
+      '@smithy/protocol-http': 3.0.11
+      '@smithy/types': 2.7.0
+      tslib: 2.6.1
+    dev: false
+
+  /@smithy/middleware-endpoint@2.2.1:
+    resolution: {integrity: sha512-dVDS7HNJl/wb0lpByXor6whqDbb1YlLoaoWYoelyYzLHioXOE7y/0iDwJWtDcN36/tVCw9EPBFZ3aans84jLpg==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@smithy/middleware-serde': 2.0.14
+      '@smithy/node-config-provider': 2.1.6
+      '@smithy/shared-ini-file-loader': 2.2.5
+      '@smithy/types': 2.6.0
+      '@smithy/url-parser': 2.0.14
+      '@smithy/util-middleware': 2.0.7
+      tslib: 2.6.1
+    dev: false
+
+  /@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.1
+    dev: false
+
+  /@smithy/middleware-retry@2.0.21:
+    resolution: {integrity: sha512-EZS1EXv1k6IJX6hyu/0yNQuPcPaXwG8SWljQHYueyRbOxmqYgoWMWPtfZj0xRRQ4YtLawQSpBgAeiJltq8/MPw==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@smithy/node-config-provider': 2.1.6
+      '@smithy/protocol-http': 3.0.10
+      '@smithy/service-error-classification': 2.0.7
+      '@smithy/types': 2.6.0
+      '@smithy/util-middleware': 2.0.7
+      '@smithy/util-retry': 2.0.7
       tslib: 2.6.1
       uuid: 8.3.2
     dev: false
-    optional: true
 
-  /@smithy/middleware-serde@2.0.5:
-    resolution: {integrity: sha512-in0AA5sous74dOfTGU9rMJBXJ0bDVNxwdXtEt5lh3FVd2sEyjhI+rqpLLRF1E4ixbw3RSEf80hfRpcPdjg4vvQ==}
+  /@smithy/middleware-retry@2.0.24:
+    resolution: {integrity: sha512-q2SvHTYu96N7lYrn3VSuX3vRpxXHR/Cig6MJpGWxd0BWodUQUWlKvXpWQZA+lTaFJU7tUvpKhRd4p4MU3PbeJg==}
     engines: {node: '>=14.0.0'}
     dependencies:
-      '@smithy/types': 2.2.2
+      '@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.1
+      uuid: 8.3.2
     dev: false
-    optional: true
 
-  /@smithy/middleware-stack@2.0.0:
-    resolution: {integrity: sha512-31XC1xNF65nlbc16yuh3wwTudmqs6qy4EseQUGF8A/p2m/5wdd/cnXJqpniy/XvXVwkHPz/GwV36HqzHtIKATQ==}
+  /@smithy/middleware-serde@2.0.14:
+    resolution: {integrity: sha512-hFi3FqoYWDntCYA2IGY6gJ6FKjq2gye+1tfxF2HnIJB5uW8y2DhpRNBSUMoqP+qvYzRqZ6ntv4kgbG+o3pX57g==}
     engines: {node: '>=14.0.0'}
     dependencies:
+      '@smithy/types': 2.6.0
       tslib: 2.6.1
     dev: false
-    optional: true
 
-  /@smithy/node-config-provider@2.0.5:
-    resolution: {integrity: sha512-LRtjV9WkhONe2lVy+ipB/l1GX60ybzBmFyeRUoLUXWKdnZ3o81jsnbKzMK8hKq8eFSWPk+Lmyx6ZzCQabGeLxg==}
+  /@smithy/middleware-serde@2.0.15:
+    resolution: {integrity: sha512-FOZRFk/zN4AT4wzGuBY+39XWe+ZnCFd0gZtyw3f9Okn2CJPixl9GyWe98TIaljeZdqWkgrzGyPre20AcW2UMHQ==}
     engines: {node: '>=14.0.0'}
     dependencies:
-      '@smithy/property-provider': 2.0.5
-      '@smithy/shared-ini-file-loader': 2.0.5
-      '@smithy/types': 2.2.2
+      '@smithy/types': 2.7.0
       tslib: 2.6.1
     dev: false
-    optional: true
 
-  /@smithy/node-http-handler@2.0.5:
-    resolution: {integrity: sha512-lZm5DZf4b3V0saUw9WTC4/du887P6cy2fUyQgQQKRRV6OseButyD5yTzeMmXE53CaXJBMBsUvvIQ0hRVxIq56w==}
+  /@smithy/middleware-stack@2.0.8:
+    resolution: {integrity: sha512-7/N59j0zWqVEKExJcA14MrLDZ/IeN+d6nbkN8ucs+eURyaDUXWYlZrQmMOd/TyptcQv0+RDlgag/zSTTV62y/Q==}
     engines: {node: '>=14.0.0'}
     dependencies:
-      '@smithy/abort-controller': 2.0.5
-      '@smithy/protocol-http': 2.0.5
-      '@smithy/querystring-builder': 2.0.5
-      '@smithy/types': 2.2.2
+      '@smithy/types': 2.6.0
       tslib: 2.6.1
     dev: false
-    optional: true
 
-  /@smithy/property-provider@2.0.5:
-    resolution: {integrity: sha512-cAFSUhX6aiHcmpWfrCLKvwBtgN1F6A0N8qY/8yeSi0LRLmhGqsY1/YTxFE185MCVzYbqBGXVr9TBv4RUcIV4rA==}
+  /@smithy/middleware-stack@2.0.9:
+    resolution: {integrity: sha512-bCB5dUtGQ5wh7QNL2ELxmDc6g7ih7jWU3Kx6MYH1h4mZbv9xL3WyhKHojRltThCB1arLPyTUFDi+x6fB/oabtA==}
     engines: {node: '>=14.0.0'}
     dependencies:
-      '@smithy/types': 2.2.2
+      '@smithy/types': 2.7.0
+      tslib: 2.6.1
+    dev: false
+
+  /@smithy/node-config-provider@2.1.6:
+    resolution: {integrity: sha512-HLqTs6O78m3M3z1cPLFxddxhEPv5MkVatfPuxoVO3A+cHZanNd/H5I6btcdHy6N2CB1MJ/lihJC92h30SESsBA==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@smithy/property-provider': 2.0.15
+      '@smithy/shared-ini-file-loader': 2.2.5
+      '@smithy/types': 2.6.0
+      tslib: 2.6.1
+    dev: false
+
+  /@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.1
+    dev: false
+
+  /@smithy/node-http-handler@2.1.10:
+    resolution: {integrity: sha512-lkALAwtN6odygIM4nB8aHDahINM6WXXjNrZmWQAh0RSossySRT2qa31cFv0ZBuAYVWeprskRk13AFvvLmf1WLw==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@smithy/abort-controller': 2.0.14
+      '@smithy/protocol-http': 3.0.10
+      '@smithy/querystring-builder': 2.0.14
+      '@smithy/types': 2.6.0
+      tslib: 2.6.1
+    dev: false
+
+  /@smithy/node-http-handler@2.2.1:
+    resolution: {integrity: sha512-8iAKQrC8+VFHPAT8pg4/j6hlsTQh+NKOWlctJBrYtQa4ExcxX7aSg3vdQ2XLoYwJotFUurg/NLqFCmZaPRrogw==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@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.1
+    dev: false
+
+  /@smithy/property-provider@2.0.15:
+    resolution: {integrity: sha512-YbRFBn8oiiC3o1Kn3a4KjGa6k47rCM9++5W9cWqYn9WnkyH+hBWgfJAckuxpyA2Hq6Ys4eFrWzXq6fqHEw7iew==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@smithy/types': 2.7.0
+      tslib: 2.6.1
+    dev: false
+
+  /@smithy/property-provider@2.0.16:
+    resolution: {integrity: sha512-28Ky0LlOqtEjwg5CdHmwwaDRHcTWfPRzkT6HrhwOSRS2RryAvuDfJrZpM+BMcrdeCyEg1mbcgIMoqTla+rdL8Q==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@smithy/types': 2.7.0
       tslib: 2.6.1
     dev: false
-    optional: true
 
   /@smithy/protocol-http@2.0.5:
     resolution: {integrity: sha512-d2hhHj34mA2V86doiDfrsy2fNTnUOowGaf9hKb0hIPHqvcnShU4/OSc4Uf1FwHkAdYF3cFXTrj5VGUYbEuvMdw==}
     engines: {node: '>=14.0.0'}
     dependencies:
-      '@smithy/types': 2.2.2
+      '@smithy/types': 2.7.0
       tslib: 2.6.1
     dev: false
     optional: true
 
-  /@smithy/querystring-builder@2.0.5:
-    resolution: {integrity: sha512-4DCX9krxLzATj+HdFPC3i8pb7XTAWzzKqSw8aTZMjXjtQY+vhe4azMAqIvbb6g7JKwIkmkRAjK6EXO3YWSnJVQ==}
+  /@smithy/protocol-http@3.0.10:
+    resolution: {integrity: sha512-6+tjNk7rXW7YTeGo9qwxXj/2BFpJTe37kTj3EnZCoX/nH+NP/WLA7O83fz8XhkGqsaAhLUPo/bB12vvd47nsmg==}
     engines: {node: '>=14.0.0'}
     dependencies:
-      '@smithy/types': 2.2.2
+      '@smithy/types': 2.6.0
+      tslib: 2.6.1
+    dev: false
+
+  /@smithy/protocol-http@3.0.11:
+    resolution: {integrity: sha512-3ziB8fHuXIRamV/akp/sqiWmNPR6X+9SB8Xxnozzj+Nq7hSpyKdFHd1FLpBkgfGFUTzzcBJQlDZPSyxzmdcx5A==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@smithy/types': 2.7.0
+      tslib: 2.6.1
+    dev: false
+
+  /@smithy/querystring-builder@2.0.14:
+    resolution: {integrity: sha512-lQ4pm9vTv9nIhl5jt6uVMPludr6syE2FyJmHsIJJuOD7QPIJnrf9HhUGf1iHh9KJ4CUv21tpOU3X6s0rB6uJ0g==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@smithy/types': 2.7.0
       '@smithy/util-uri-escape': 2.0.0
       tslib: 2.6.1
     dev: false
-    optional: true
 
-  /@smithy/querystring-parser@2.0.5:
-    resolution: {integrity: sha512-C2stCULH0r54KBksv3AWcN8CLS3u9+WsEW8nBrvctrJ5rQTNa1waHkffpVaiKvcW2nP0aIMBPCobD/kYf/q9mA==}
+  /@smithy/querystring-builder@2.0.15:
+    resolution: {integrity: sha512-e1q85aT6HutvouOdN+dMsN0jcdshp50PSCvxDvo6aIM57LqeXimjfONUEgfqQ4IFpYWAtVixptyIRE5frMp/2A==}
     engines: {node: '>=14.0.0'}
     dependencies:
-      '@smithy/types': 2.2.2
+      '@smithy/types': 2.7.0
+      '@smithy/util-uri-escape': 2.0.0
       tslib: 2.6.1
     dev: false
-    optional: true
 
-  /@smithy/service-error-classification@2.0.0:
-    resolution: {integrity: sha512-2z5Nafy1O0cTf69wKyNjGW/sNVMiqDnb4jgwfMG8ye8KnFJ5qmJpDccwIbJNhXIfbsxTg9SEec2oe1cexhMJvw==}
-    engines: {node: '>=14.0.0'}
-    dev: false
-    optional: true
-
-  /@smithy/shared-ini-file-loader@2.0.5:
-    resolution: {integrity: sha512-Mvtk6FwMtfbKRC4YuSsIqRYp9WTxsSUJVVo2djgyhcacKGMqicHDWSAmgy3sDrKv+G/G6xTZCPwm6pJARtdxVg==}
+  /@smithy/querystring-parser@2.0.14:
+    resolution: {integrity: sha512-+cbtXWI9tNtQjlgQg3CA+pvL3zKTAxPnG3Pj6MP89CR3vi3QMmD0SOWoq84tqZDnJCxlsusbgIXk1ngMReXo+A==}
     engines: {node: '>=14.0.0'}
     dependencies:
-      '@smithy/types': 2.2.2
+      '@smithy/types': 2.7.0
+      tslib: 2.6.1
+    dev: false
+
+  /@smithy/querystring-parser@2.0.15:
+    resolution: {integrity: sha512-jbBvoK3cc81Cj1c1TH1qMYxNQKHrYQ2DoTntN9FBbtUWcGhc+T4FP6kCKYwRLXyU4AajwGIZstvNAmIEgUUNTQ==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@smithy/types': 2.7.0
+      tslib: 2.6.1
+    dev: false
+
+  /@smithy/service-error-classification@2.0.7:
+    resolution: {integrity: sha512-LLxgW12qGz8doYto15kZ4x1rHjtXl0BnCG6T6Wb8z2DI4PT9cJfOSvzbuLzy7+5I24PAepKgFeWHRd9GYy3Z9w==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@smithy/types': 2.7.0
+    dev: false
+
+  /@smithy/service-error-classification@2.0.8:
+    resolution: {integrity: sha512-jCw9+005im8tsfYvwwSc4TTvd29kXRFkH9peQBg5R/4DD03ieGm6v6Hpv9nIAh98GwgYg1KrztcINC1s4o7/hg==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@smithy/types': 2.7.0
+    dev: false
+
+  /@smithy/shared-ini-file-loader@2.2.5:
+    resolution: {integrity: sha512-LHA68Iu7SmNwfAVe8egmjDCy648/7iJR/fK1UnVw+iAOUJoEYhX2DLgVd5pWllqdDiRbQQzgaHLcRokM+UFR1w==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@smithy/types': 2.7.0
+      tslib: 2.6.1
+    dev: false
+
+  /@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.1
     dev: false
-    optional: true
 
   /@smithy/signature-v4@2.0.5:
     resolution: {integrity: sha512-ABIzXmUDXK4n2c9cXjQLELgH2RdtABpYKT+U131e2I6RbCypFZmxIHmIBufJzU2kdMCQ3+thBGDWorAITFW04A==}
     engines: {node: '>=14.0.0'}
     dependencies:
-      '@smithy/eventstream-codec': 2.0.5
+      '@smithy/eventstream-codec': 2.0.14
       '@smithy/is-array-buffer': 2.0.0
-      '@smithy/types': 2.2.2
+      '@smithy/types': 2.7.0
       '@smithy/util-hex-encoding': 2.0.0
-      '@smithy/util-middleware': 2.0.0
+      '@smithy/util-middleware': 2.0.7
       '@smithy/util-uri-escape': 2.0.0
-      '@smithy/util-utf8': 2.0.0
+      '@smithy/util-utf8': 2.0.2
       tslib: 2.6.1
     dev: false
-    optional: true
 
-  /@smithy/smithy-client@2.0.5:
-    resolution: {integrity: sha512-kCTFr8wfOAWKDzGvfBElc6shHigWtHNhMQ1IbosjC4jOlayFyZMSs2PysKB+Ox/dhQ41KqOzgVjgiQ+PyWqHMQ==}
+  /@smithy/smithy-client@2.1.16:
+    resolution: {integrity: sha512-Lw67+yQSpLl4YkDLUzI2KgS8TXclXmbzSeOJUmRFS4ueT56B4pw3RZRF/SRzvgyxM/HxgkUan8oSHXCujPDafQ==}
     engines: {node: '>=14.0.0'}
     dependencies:
-      '@smithy/middleware-stack': 2.0.0
-      '@smithy/types': 2.2.2
-      '@smithy/util-stream': 2.0.5
+      '@smithy/middleware-stack': 2.0.8
+      '@smithy/types': 2.6.0
+      '@smithy/util-stream': 2.0.21
       tslib: 2.6.1
     dev: false
-    optional: true
 
-  /@smithy/types@2.2.2:
-    resolution: {integrity: sha512-4PS0y1VxDnELGHGgBWlDksB2LJK8TG8lcvlWxIsgR+8vROI7Ms8h1P4FQUx+ftAX2QZv5g1CJCdhdRmQKyonyw==}
+  /@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.1
+    dev: false
+
+  /@smithy/types@2.6.0:
+    resolution: {integrity: sha512-PgqxJq2IcdMF9iAasxcqZqqoOXBHufEfmbEUdN1pmJrJltT42b0Sc8UiYSWWzKkciIp9/mZDpzYi4qYG1qqg6g==}
     engines: {node: '>=14.0.0'}
     dependencies:
       tslib: 2.6.1
     dev: false
-    optional: true
 
-  /@smithy/url-parser@2.0.5:
-    resolution: {integrity: sha512-OdMBvZhpckQSkugCXNJQCvqJ71wE7Ftxce92UOQLQ9pwF6hoS5PLL7wEfpnuEXtStzBqJYkzu1C1ZfjuFGOXAA==}
+  /@smithy/types@2.7.0:
+    resolution: {integrity: sha512-1OIFyhK+vOkMbu4aN2HZz/MomREkrAC/HqY5mlJMUJfGrPRwijJDTeiN8Rnj9zUaB8ogXAfIOtZrrgqZ4w7Wnw==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      '@smithy/querystring-parser': 2.0.5
-      '@smithy/types': 2.2.2
       tslib: 2.6.1
     dev: false
-    optional: true
 
-  /@smithy/util-base64@2.0.0:
-    resolution: {integrity: sha512-Zb1E4xx+m5Lud8bbeYi5FkcMJMnn+1WUnJF3qD7rAdXpaL7UjkFQLdmW5fHadoKbdHpwH9vSR8EyTJFHJs++tA==}
+  /@smithy/url-parser@2.0.14:
+    resolution: {integrity: sha512-kbu17Y1AFXi5lNlySdDj7ZzmvupyWKCX/0jNZ8ffquRyGdbDZb+eBh0QnWqsSmnZa/ctyWaTf7n4l/pXLExrnw==}
+    dependencies:
+      '@smithy/querystring-parser': 2.0.14
+      '@smithy/types': 2.6.0
+      tslib: 2.6.1
+    dev: false
+
+  /@smithy/url-parser@2.0.15:
+    resolution: {integrity: sha512-sADUncUj9rNbOTrdDGm4EXlUs0eQ9dyEo+V74PJoULY4jSQxS+9gwEgsPYyiu8PUOv16JC/MpHonOgqP/IEDZA==}
+    dependencies:
+      '@smithy/querystring-parser': 2.0.15
+      '@smithy/types': 2.7.0
+      tslib: 2.6.1
+    dev: false
+
+  /@smithy/util-base64@2.0.1:
+    resolution: {integrity: sha512-DlI6XFYDMsIVN+GH9JtcRp3j02JEVuWIn/QOZisVzpIAprdsxGveFed0bjbMRCqmIFe8uetn5rxzNrBtIGrPIQ==}
     engines: {node: '>=14.0.0'}
     dependencies:
       '@smithy/util-buffer-from': 2.0.0
       tslib: 2.6.1
     dev: false
-    optional: true
 
   /@smithy/util-body-length-browser@2.0.0:
     resolution: {integrity: sha512-JdDuS4ircJt+FDnaQj88TzZY3+njZ6O+D3uakS32f2VNnDo3vyEuNdBOh/oFd8Df1zSZOuH1HEChk2AOYDezZg==}
     dependencies:
       tslib: 2.6.1
     dev: false
-    optional: true
+
+  /@smithy/util-body-length-browser@2.0.1:
+    resolution: {integrity: sha512-NXYp3ttgUlwkaug4bjBzJ5+yIbUbUx8VsSLuHZROQpoik+gRkIBeEG9MPVYfvPNpuXb/puqodeeUXcKFe7BLOQ==}
+    dependencies:
+      tslib: 2.6.1
+    dev: false
 
   /@smithy/util-body-length-node@2.1.0:
     resolution: {integrity: sha512-/li0/kj/y3fQ3vyzn36NTLGmUwAICb7Jbe/CsWCktW363gh1MOcpEcSO3mJ344Gv2dqz8YJCLQpb6hju/0qOWw==}
@@ -5548,7 +8221,6 @@ packages:
     dependencies:
       tslib: 2.6.1
     dev: false
-    optional: true
 
   /@smithy/util-buffer-from@2.0.0:
     resolution: {integrity: sha512-/YNnLoHsR+4W4Vf2wL5lGv0ksg8Bmk3GEGxn2vEQt52AQaPSCuaO5PM5VM7lP1K9qHRKHwrPGktqVoAHKWHxzw==}
@@ -5557,7 +8229,6 @@ packages:
       '@smithy/is-array-buffer': 2.0.0
       tslib: 2.6.1
     dev: false
-    optional: true
 
   /@smithy/util-config-provider@2.0.0:
     resolution: {integrity: sha512-xCQ6UapcIWKxXHEU4Mcs2s7LcFQRiU3XEluM2WcCjjBtQkUN71Tb+ydGmJFPxMUrW/GWMgQEEGipLym4XG0jZg==}
@@ -5565,31 +8236,72 @@ packages:
     dependencies:
       tslib: 2.6.1
     dev: false
-    optional: true
 
-  /@smithy/util-defaults-mode-browser@2.0.5:
-    resolution: {integrity: sha512-yciP6TPttLsj731aHTvekgyuCGXQrEAJibEwEWAh3kzaDsfGAVCuZSBlyvC2Dl3TZmHKCOQwHV8mIE7KQCTPuQ==}
+  /@smithy/util-defaults-mode-browser@2.0.20:
+    resolution: {integrity: sha512-QJtnbTIl0/BbEASkx1MUFf6EaoWqWW1/IM90N++8NNscePvPf77GheYfpoPis6CBQawUWq8QepTP2QUSAdrVkw==}
     engines: {node: '>= 10.0.0'}
     dependencies:
-      '@smithy/property-provider': 2.0.5
-      '@smithy/types': 2.2.2
+      '@smithy/property-provider': 2.0.15
+      '@smithy/smithy-client': 2.1.16
+      '@smithy/types': 2.6.0
       bowser: 2.11.0
       tslib: 2.6.1
     dev: false
-    optional: true
 
-  /@smithy/util-defaults-mode-node@2.0.5:
-    resolution: {integrity: sha512-M07t99rWasXt+IaDZDyP3BkcoEm/mgIE1RIMASrE49LKSNxaVN7PVcgGc77+4uu2kzBAyqJKy79pgtezuknyjQ==}
+  /@smithy/util-defaults-mode-browser@2.0.22:
+    resolution: {integrity: sha512-qcF20IHHH96FlktvBRICDXDhLPtpVmtksHmqNGtotb9B0DYWXsC6jWXrkhrrwF7tH26nj+npVTqh9isiFV1gdA==}
     engines: {node: '>= 10.0.0'}
     dependencies:
-      '@smithy/config-resolver': 2.0.5
-      '@smithy/credential-provider-imds': 2.0.5
-      '@smithy/node-config-provider': 2.0.5
-      '@smithy/property-provider': 2.0.5
-      '@smithy/types': 2.2.2
+      '@smithy/property-provider': 2.0.16
+      '@smithy/smithy-client': 2.1.18
+      '@smithy/types': 2.7.0
+      bowser: 2.11.0
+      tslib: 2.6.1
+    dev: false
+
+  /@smithy/util-defaults-mode-node@2.0.26:
+    resolution: {integrity: sha512-lGFPOFCHv1ql019oegYqa54BZH7HREw6EBqjDLbAr0wquMX0BDi2sg8TJ6Eq+JGLijkZbJB73m4+aK8OFAapMg==}
+    engines: {node: '>= 10.0.0'}
+    dependencies:
+      '@smithy/config-resolver': 2.0.19
+      '@smithy/credential-provider-imds': 2.1.2
+      '@smithy/node-config-provider': 2.1.6
+      '@smithy/property-provider': 2.0.15
+      '@smithy/smithy-client': 2.1.16
+      '@smithy/types': 2.6.0
+      tslib: 2.6.1
+    dev: false
+
+  /@smithy/util-defaults-mode-node@2.0.29:
+    resolution: {integrity: sha512-+uG/15VoUh6JV2fdY9CM++vnSuMQ1VKZ6BdnkUM7R++C/vLjnlg+ToiSR1FqKZbMmKBXmsr8c/TsDWMAYvxbxQ==}
+    engines: {node: '>= 10.0.0'}
+    dependencies:
+      '@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.1
+    dev: false
+
+  /@smithy/util-endpoints@1.0.5:
+    resolution: {integrity: sha512-K7qNuCOD5K/90MjHvHm9kJldrfm40UxWYQxNEShMFxV/lCCCRIg8R4uu1PFAxRvPxNpIdcrh1uK6I1ISjDXZJw==}
+    engines: {node: '>= 14.0.0'}
+    dependencies:
+      '@smithy/node-config-provider': 2.1.6
+      '@smithy/types': 2.6.0
+      tslib: 2.6.1
+    dev: false
+
+  /@smithy/util-endpoints@1.0.7:
+    resolution: {integrity: sha512-Q2gEind3jxoLk6hdKWyESMU7LnXz8aamVwM+VeVjOYzYT1PalGlY/ETa48hv2YpV4+YV604y93YngyzzzQ4IIA==}
+    engines: {node: '>= 14.0.0'}
+    dependencies:
+      '@smithy/node-config-provider': 2.1.8
+      '@smithy/types': 2.7.0
       tslib: 2.6.1
     dev: false
-    optional: true
 
   /@smithy/util-hex-encoding@2.0.0:
     resolution: {integrity: sha512-c5xY+NUnFqG6d7HFh1IFfrm3mGl29lC+vF+geHv4ToiuJCBmIfzx6IeHLg+OgRdPFKDXIw6pvi+p3CsscaMcMA==}
@@ -5597,39 +8309,68 @@ packages:
     dependencies:
       tslib: 2.6.1
     dev: false
-    optional: true
 
-  /@smithy/util-middleware@2.0.0:
-    resolution: {integrity: sha512-eCWX4ECuDHn1wuyyDdGdUWnT4OGyIzV0LN1xRttBFMPI9Ff/4heSHVxneyiMtOB//zpXWCha1/SWHJOZstG7kA==}
+  /@smithy/util-middleware@2.0.7:
+    resolution: {integrity: sha512-tRINOTlf1G9B0ECarFQAtTgMhpnrMPSa+5j4ZEwEawCLfTFTavk6757sxhE4RY5RMlD/I3x+DCS8ZUiR8ho9Pw==}
     engines: {node: '>=14.0.0'}
     dependencies:
+      '@smithy/types': 2.7.0
       tslib: 2.6.1
     dev: false
-    optional: true
 
-  /@smithy/util-retry@2.0.0:
-    resolution: {integrity: sha512-/dvJ8afrElasuiiIttRJeoS2sy8YXpksQwiM/TcepqdRVp7u4ejd9C4IQURHNjlfPUT7Y6lCDSa2zQJbdHhVTg==}
+  /@smithy/util-middleware@2.0.8:
+    resolution: {integrity: sha512-qkvqQjM8fRGGA8P2ydWylMhenCDP8VlkPn8kiNuFEaFz9xnUKC2irfqsBSJrfrOB9Qt6pQsI58r3zvvumhFMkw==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@smithy/types': 2.7.0
+      tslib: 2.6.1
+    dev: false
+
+  /@smithy/util-retry@2.0.7:
+    resolution: {integrity: sha512-fIe5yARaF0+xVT1XKcrdnHKTJ1Vc4+3e3tLDjCuIcE9b6fkBzzGFY7AFiX4M+vj6yM98DrwkuZeHf7/hmtVp0Q==}
     engines: {node: '>= 14.0.0'}
     dependencies:
-      '@smithy/service-error-classification': 2.0.0
+      '@smithy/service-error-classification': 2.0.7
+      '@smithy/types': 2.6.0
       tslib: 2.6.1
     dev: false
-    optional: true
 
-  /@smithy/util-stream@2.0.5:
-    resolution: {integrity: sha512-ylx27GwI05xLpYQ4hDIfS15vm+wYjNN0Sc2P0FxuzgRe8v0BOLHppGIQ+Bezcynk8C9nUzsUue3TmtRhjut43g==}
+  /@smithy/util-retry@2.0.8:
+    resolution: {integrity: sha512-cQTPnVaVFMjjS6cb44WV2yXtHVyXDC5icKyIbejMarJEApYeJWpBU3LINTxHqp/tyLI+MZOUdosr2mZ3sdziNg==}
+    engines: {node: '>= 14.0.0'}
+    dependencies:
+      '@smithy/service-error-classification': 2.0.8
+      '@smithy/types': 2.7.0
+      tslib: 2.6.1
+    dev: false
+
+  /@smithy/util-stream@2.0.21:
+    resolution: {integrity: sha512-0BUE16d7n1x7pi1YluXJdB33jOTyBChT0j/BlOkFa9uxfg6YqXieHxjHNuCdJRARa7AZEj32LLLEPJ1fSa4inA==}
     engines: {node: '>=14.0.0'}
     dependencies:
-      '@smithy/fetch-http-handler': 2.0.5
-      '@smithy/node-http-handler': 2.0.5
-      '@smithy/types': 2.2.2
-      '@smithy/util-base64': 2.0.0
+      '@smithy/fetch-http-handler': 2.2.7
+      '@smithy/node-http-handler': 2.1.10
+      '@smithy/types': 2.6.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.0
+      '@smithy/util-utf8': 2.0.2
+      tslib: 2.6.1
+    dev: false
+
+  /@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.1
     dev: false
-    optional: true
 
   /@smithy/util-uri-escape@2.0.0:
     resolution: {integrity: sha512-ebkxsqinSdEooQduuk9CbKcI+wheijxEb3utGXkCoYQkJnwTnLbH1JXGimJtUkQwNQbsbuYwG2+aFVyZf5TLaw==}
@@ -5637,23 +8378,30 @@ packages:
     dependencies:
       tslib: 2.6.1
     dev: false
-    optional: true
 
-  /@smithy/util-utf8@2.0.0:
-    resolution: {integrity: sha512-rctU1VkziY84n5OXe3bPNpKR001ZCME2JCaBBFgtiM2hfKbHFudc/BkMuPab8hRbLd0j3vbnBTTZ1igBf0wgiQ==}
+  /@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.1
     dev: false
-    optional: 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.1
+    dev: false
 
   /@sqltools/formatter@1.2.5:
     resolution: {integrity: sha512-Uy0+khmZqUrUGm5dmMqVlnvufZRSK0FbYzVgp0UMstm+F5+W2/jnEEQyc9vo1ZR/E5ZI/B1WjjoTqBqwJL6Krw==}
     dev: false
 
-  /@storybook/addon-a11y@7.1.1(react-dom@18.2.0)(react@17.0.2):
-    resolution: {integrity: sha512-wUf0ogOhoUIvZ3w8FbaRuJ4eIjmatw/JOc0PSuBbgMxlc3s6EjYALcYbVmrJx6zkvbQRXP7cFex3d3uGgimpkg==}
+  /@storybook/addon-a11y@7.5.2(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-HTYESaRr208b/AVguudRIy7rwRMk2bOkBr2P46ozK+8Y9mWXnKxw5O8qYS2kLuEuHfu1S+ktWp7SWjRvz8vHXA==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -5663,25 +8411,28 @@ packages:
       react-dom:
         optional: true
     dependencies:
-      '@storybook/addon-highlight': 7.1.1
-      '@storybook/channels': 7.1.1
-      '@storybook/client-logger': 7.1.1
-      '@storybook/components': 7.1.1(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/core-events': 7.1.1
+      '@storybook/addon-highlight': 7.5.2
+      '@storybook/channels': 7.5.2
+      '@storybook/client-logger': 7.5.2
+      '@storybook/components': 7.5.2(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/core-events': 7.5.2
       '@storybook/global': 5.0.0
-      '@storybook/manager-api': 7.1.1(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/preview-api': 7.1.1
-      '@storybook/theming': 7.1.1(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/types': 7.1.1
+      '@storybook/manager-api': 7.5.2(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/preview-api': 7.5.2
+      '@storybook/theming': 7.5.2(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/types': 7.5.2
       axe-core: 4.7.2
       lodash: 4.17.21
-      react: 17.0.2
-      react-dom: 18.2.0(react@17.0.2)
-      react-resize-detector: 7.1.2(react-dom@18.2.0)(react@17.0.2)
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
+      react-resize-detector: 7.1.2(react-dom@18.2.0)(react@18.2.0)
+    transitivePeerDependencies:
+      - '@types/react'
+      - '@types/react-dom'
     dev: true
 
-  /@storybook/addon-actions@7.1.1(react-dom@18.2.0)(react@17.0.2):
-    resolution: {integrity: sha512-IDxBmNnVgLFfQ407MxOUJmqjz0hgiZB9syi4sfp7BKp5MIPUDT1m+z603kGrvx0bk0W0DPqkp/H8ySEGEx0x6g==}
+  /@storybook/addon-actions@7.5.2(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-jKF3rrMEu42TgZ5AEszADpVdASDu1S4Ozp1Ymf4akHLkaMOv+yzzD7LV6YGjJz8S2IryndZqE47e6stF0T99uA==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -5691,28 +8442,31 @@ packages:
       react-dom:
         optional: true
     dependencies:
-      '@storybook/client-logger': 7.1.1
-      '@storybook/components': 7.1.1(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/core-events': 7.1.1
+      '@storybook/client-logger': 7.5.2
+      '@storybook/components': 7.5.2(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/core-events': 7.5.2
       '@storybook/global': 5.0.0
-      '@storybook/manager-api': 7.1.1(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/preview-api': 7.1.1
-      '@storybook/theming': 7.1.1(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/types': 7.1.1
+      '@storybook/manager-api': 7.5.2(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/preview-api': 7.5.2
+      '@storybook/theming': 7.5.2(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/types': 7.5.2
       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
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
+      react-inspector: 6.0.1(react@18.2.0)
+      telejson: 7.2.0
       ts-dedent: 2.2.0
       uuid: 9.0.0
+    transitivePeerDependencies:
+      - '@types/react'
+      - '@types/react-dom'
     dev: true
 
-  /@storybook/addon-backgrounds@7.1.1(react-dom@18.2.0)(react@17.0.2):
-    resolution: {integrity: sha512-6YAjF01R/qFxeZc1B5cSxseaGXJzikMPPExSZaKkD0eW3max5Kpk+qb7rOX95m3jP2WD/0zfX6lEQUCbmDcxlg==}
+  /@storybook/addon-backgrounds@7.5.2(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-CII8c+db8sVciWjFY0ProZi5E2d+cOc+XlVHCAVaUYp2Bp/1MV7en8etfLK7DEoH6kBVz1+t3TaPU+xjUTR8Ig==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -5722,118 +8476,128 @@ packages:
       react-dom:
         optional: true
     dependencies:
-      '@storybook/client-logger': 7.1.1
-      '@storybook/components': 7.1.1(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/core-events': 7.1.1
+      '@storybook/client-logger': 7.5.2
+      '@storybook/components': 7.5.2(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/core-events': 7.5.2
       '@storybook/global': 5.0.0
-      '@storybook/manager-api': 7.1.1(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/preview-api': 7.1.1
-      '@storybook/theming': 7.1.1(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/types': 7.1.1
+      '@storybook/manager-api': 7.5.2(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/preview-api': 7.5.2
+      '@storybook/theming': 7.5.2(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/types': 7.5.2
       memoizerific: 1.11.3
-      react: 17.0.2
-      react-dom: 18.2.0(react@17.0.2)
-      ts-dedent: 2.2.0
-    dev: true
-
-  /@storybook/addon-controls@7.1.1(react-dom@18.2.0)(react@17.0.2):
-    resolution: {integrity: sha512-qi7fxUSovTLFWeejZLagMV+4SedL0DIhZrufuQCnEeO1gbTJJPaL/KLZnilFlI3SgspkzGehhGDR6SVkDuwnZg==}
-    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:
-      '@storybook/blocks': 7.1.1(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/client-logger': 7.1.1
-      '@storybook/components': 7.1.1(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/core-common': 7.1.1
-      '@storybook/manager-api': 7.1.1(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/node-logger': 7.1.1
-      '@storybook/preview-api': 7.1.1
-      '@storybook/theming': 7.1.1(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/types': 7.1.1
-      lodash: 4.17.21
-      react: 17.0.2
-      react-dom: 18.2.0(react@17.0.2)
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
       ts-dedent: 2.2.0
     transitivePeerDependencies:
+      - '@types/react'
+      - '@types/react-dom'
+    dev: true
+
+  /@storybook/addon-controls@7.5.2(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-f04VcBSfm3yMT1hvaFEwCRbdwiXQbddfEwhwjEVsqd+CA0s600W4L7B8tT4daXMsU6NsZyibev910IKTnDw6xQ==}
+    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:
+      '@storybook/blocks': 7.5.2(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/client-logger': 7.5.2
+      '@storybook/components': 7.5.2(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/core-common': 7.5.2
+      '@storybook/core-events': 7.5.2
+      '@storybook/manager-api': 7.5.2(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/node-logger': 7.5.2
+      '@storybook/preview-api': 7.5.2
+      '@storybook/theming': 7.5.2(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/types': 7.5.2
+      lodash: 4.17.21
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
+      ts-dedent: 2.2.0
+    transitivePeerDependencies:
+      - '@types/react'
+      - '@types/react-dom'
       - encoding
       - supports-color
     dev: true
 
-  /@storybook/addon-docs@7.1.1(react-dom@18.2.0)(react@17.0.2):
-    resolution: {integrity: sha512-KfsrqvR6RA0qyCwBpJjeivu/+F+n3jcMMKkBtI56E/pyQCx4+pMTJXJ2l5gJibNWYoR1CVlS9f5n5ZNGz8BzeQ==}
+  /@storybook/addon-docs@7.5.2(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-KxX4XuxK6YcI2mUosFkAlueMon/nby6mp3GRHenuK+nobY0ecfILqSTbsOeO1wqPxALBoq7fLnrgYhdDlandgQ==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
     dependencies:
-      '@jest/transform': 29.5.0
-      '@mdx-js/react': 2.3.0(react@17.0.2)
-      '@storybook/blocks': 7.1.1(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/client-logger': 7.1.1
-      '@storybook/components': 7.1.1(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/csf-plugin': 7.1.1
-      '@storybook/csf-tools': 7.1.1
+      '@jest/transform': 29.6.2
+      '@mdx-js/react': 2.3.0(react@18.2.0)
+      '@storybook/blocks': 7.5.2(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/client-logger': 7.5.2
+      '@storybook/components': 7.5.2(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/csf-plugin': 7.5.2
+      '@storybook/csf-tools': 7.5.2
       '@storybook/global': 5.0.0
       '@storybook/mdx2-csf': 1.0.0
-      '@storybook/node-logger': 7.1.1
-      '@storybook/postinstall': 7.1.1
-      '@storybook/preview-api': 7.1.1
-      '@storybook/react-dom-shim': 7.1.1(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/theming': 7.1.1(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/types': 7.1.1
+      '@storybook/node-logger': 7.5.2
+      '@storybook/postinstall': 7.5.2
+      '@storybook/preview-api': 7.5.2
+      '@storybook/react-dom-shim': 7.5.2(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/theming': 7.5.2(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/types': 7.5.2
       fs-extra: 11.1.1
-      react: 17.0.2
-      react-dom: 18.2.0(react@17.0.2)
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
       remark-external-links: 8.0.0
       remark-slug: 6.1.0
       ts-dedent: 2.2.0
     transitivePeerDependencies:
+      - '@types/react'
+      - '@types/react-dom'
       - encoding
       - supports-color
     dev: true
 
-  /@storybook/addon-essentials@7.1.1(react-dom@18.2.0)(react@17.0.2):
-    resolution: {integrity: sha512-eCty+Q7zBjkBbaJ0HaM/UaXxJ+77uKBtEc9g+hLZFqga50auPCfCcqjnqNnxkTmewkJomx3N91BJUJJzVPUlJA==}
+  /@storybook/addon-essentials@7.5.2(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-bN7Q+8J3xVgNoBKCwtyX1O5jXuuJavYdAPiPQGrt6YegUi3gVfr5n/+/mNlu6Fd5AThFcVFei6gS9aiYmU/h8g==}
     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.1.1(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/addon-backgrounds': 7.1.1(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/addon-controls': 7.1.1(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/addon-docs': 7.1.1(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/addon-highlight': 7.1.1
-      '@storybook/addon-measure': 7.1.1(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/addon-outline': 7.1.1(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/addon-toolbars': 7.1.1(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/addon-viewport': 7.1.1(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/core-common': 7.1.1
-      '@storybook/manager-api': 7.1.1(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/node-logger': 7.1.1
-      '@storybook/preview-api': 7.1.1
-      react: 17.0.2
-      react-dom: 18.2.0(react@17.0.2)
+      '@storybook/addon-actions': 7.5.2(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/addon-backgrounds': 7.5.2(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/addon-controls': 7.5.2(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/addon-docs': 7.5.2(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/addon-highlight': 7.5.2
+      '@storybook/addon-measure': 7.5.2(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/addon-outline': 7.5.2(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/addon-toolbars': 7.5.2(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/addon-viewport': 7.5.2(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/core-common': 7.5.2
+      '@storybook/manager-api': 7.5.2(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/node-logger': 7.5.2
+      '@storybook/preview-api': 7.5.2
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
       ts-dedent: 2.2.0
     transitivePeerDependencies:
+      - '@types/react'
+      - '@types/react-dom'
       - encoding
       - supports-color
     dev: true
 
-  /@storybook/addon-highlight@7.1.1:
-    resolution: {integrity: sha512-iOLzcv4JK2R2EBcbeDLB5uuYaW96M9Vh+ZrkpKEJvHwrQzzvBo3kJ7bP/AArAEXtR5MN1al3x7mnvRofu3OIdQ==}
+  /@storybook/addon-highlight@7.5.2:
+    resolution: {integrity: sha512-0vek42fHh7Aeinvkwge0ZTq5VfNsuMSejUv0wHa3zQWgUmlaRlGY8zDw7nG6LiIz6rnTBDTznsfyWenAySSHXg==}
     dependencies:
-      '@storybook/core-events': 7.1.1
+      '@storybook/core-events': 7.5.2
       '@storybook/global': 5.0.0
-      '@storybook/preview-api': 7.1.1
+      '@storybook/preview-api': 7.5.2
     dev: true
 
-  /@storybook/addon-links@7.1.1(react-dom@18.2.0)(react@17.0.2):
-    resolution: {integrity: sha512-cdc2OQj1LZkEd2dlaAc3Fp4TAHwLmnHKko/Aet3Dhm6TqH/C6UsSflZJbLXmV06x2f/Tm5UK0QQxPHBmOE7aXw==}
+  /@storybook/addon-interactions@7.5.3(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-gD3cU8sYSM/mdbA9ooYIb4c689JkDsJbZ17vfYJ5RjNkSmqKehybdpZOfkj27sVIyFtmscSi75t+pzK4Pv4rZw==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -5843,22 +8607,55 @@ packages:
       react-dom:
         optional: true
     dependencies:
-      '@storybook/client-logger': 7.1.1
-      '@storybook/core-events': 7.1.1
+      '@storybook/client-logger': 7.5.3
+      '@storybook/components': 7.5.3(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/core-common': 7.5.3
+      '@storybook/core-events': 7.5.3
+      '@storybook/global': 5.0.0
+      '@storybook/instrumenter': 7.5.3
+      '@storybook/manager-api': 7.5.3(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/preview-api': 7.5.3
+      '@storybook/theming': 7.5.3(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/types': 7.5.3
+      jest-mock: 27.5.1
+      polished: 4.2.2
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
+      ts-dedent: 2.2.0
+    transitivePeerDependencies:
+      - '@types/react'
+      - '@types/react-dom'
+      - encoding
+      - supports-color
+    dev: true
+
+  /@storybook/addon-links@7.5.2(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-IhUYNOJQYJd8Cnb93l8egnGCGhHV0VHo6HmZT9YjBVuUtetGQbW8Eoh0pQwuklUrJ3jLPwMoKFhN1irQXJjZwQ==}
+    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:
+      '@storybook/client-logger': 7.5.2
+      '@storybook/core-events': 7.5.2
       '@storybook/csf': 0.1.0
       '@storybook/global': 5.0.0
-      '@storybook/manager-api': 7.1.1(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/preview-api': 7.1.1
-      '@storybook/router': 7.1.1(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/types': 7.1.1
+      '@storybook/manager-api': 7.5.2(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/preview-api': 7.5.2
+      '@storybook/router': 7.5.2(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/types': 7.5.2
       prop-types: 15.8.1
-      react: 17.0.2
-      react-dom: 18.2.0(react@17.0.2)
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
       ts-dedent: 2.2.0
     dev: true
 
-  /@storybook/addon-measure@7.1.1(react-dom@18.2.0)(react@17.0.2):
-    resolution: {integrity: sha512-LKJ9vN0qdFVeqjPeF44R2issR0UMAuL2LzbZNxAfeNX9SxdV7qONBOt8OZNKkmm7mJ+jBZsR9Ok68PCOsXA7Xw==}
+  /@storybook/addon-measure@7.5.2(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-fkvORLaYVC/yNMFzHRHmzlvniY7sWtpFxaRW+e4++hGXYV4VQjOBlXzdMxQhAg1DCVWD6QV8xnUQPBGrsEklog==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -5868,20 +8665,23 @@ packages:
       react-dom:
         optional: true
     dependencies:
-      '@storybook/client-logger': 7.1.1
-      '@storybook/components': 7.1.1(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/core-events': 7.1.1
+      '@storybook/client-logger': 7.5.2
+      '@storybook/components': 7.5.2(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/core-events': 7.5.2
       '@storybook/global': 5.0.0
-      '@storybook/manager-api': 7.1.1(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/preview-api': 7.1.1
-      '@storybook/types': 7.1.1
-      react: 17.0.2
-      react-dom: 18.2.0(react@17.0.2)
+      '@storybook/manager-api': 7.5.2(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/preview-api': 7.5.2
+      '@storybook/types': 7.5.2
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
       tiny-invariant: 1.3.1
+    transitivePeerDependencies:
+      - '@types/react'
+      - '@types/react-dom'
     dev: true
 
-  /@storybook/addon-outline@7.1.1(react-dom@18.2.0)(react@17.0.2):
-    resolution: {integrity: sha512-zdgOA46n61o/rqvnAn1OxAczl/C99D64e+6EoK8t+Xf9fvykPQCgfBUAPq19qEAaBG4RoPpTvGSJXH2nFqJZDw==}
+  /@storybook/addon-outline@7.5.2(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-BgDnVzE9xCN1xwuCebK6+apNCtVcw1ToW8N6R3vNgXgNPE1euT3jxkDH7K4RJR24Flu6BotWjX3dqv8k+8xGKw==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -5891,16 +8691,19 @@ packages:
       react-dom:
         optional: true
     dependencies:
-      '@storybook/client-logger': 7.1.1
-      '@storybook/components': 7.1.1(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/core-events': 7.1.1
+      '@storybook/client-logger': 7.5.2
+      '@storybook/components': 7.5.2(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/core-events': 7.5.2
       '@storybook/global': 5.0.0
-      '@storybook/manager-api': 7.1.1(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/preview-api': 7.1.1
-      '@storybook/types': 7.1.1
-      react: 17.0.2
-      react-dom: 18.2.0(react@17.0.2)
+      '@storybook/manager-api': 7.5.2(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/preview-api': 7.5.2
+      '@storybook/types': 7.5.2
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
       ts-dedent: 2.2.0
+    transitivePeerDependencies:
+      - '@types/react'
+      - '@types/react-dom'
     dev: true
 
   /@storybook/addon-postcss@3.0.0-alpha.1(webpack@5.75.0):
@@ -5916,61 +8719,31 @@ packages:
       - webpack
     dev: true
 
-  /@storybook/addon-styling@1.3.4(less@4.1.3)(postcss@8.4.27)(react-dom@18.2.0)(react@17.0.2)(sass@1.64.1)(webpack@5.75.0):
-    resolution: {integrity: sha512-JWZ5X9IEcqB5vr6nAgutIYBLT6SlRGfK/Z7kRaWIdvU7VDA0CQl8G1vA0nuKCERvZl9QPelv3CA+7D0H9G8uTA==}
-    hasBin: true
+  /@storybook/addon-toolbars@7.5.2(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-BXzb5NOpILFOM7EOBxcF2Qj/q6BicWZ1AvAddORWGmqSa/MxMIa4X52oKXFUTHKBkrTO1X0XqHmoF88qm3TUFg==}
     peerDependencies:
-      less: ^3.5.0 || ^4.0.0
-      postcss: ^7.0.0 || ^8.0.1
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-      webpack: ^5.0.0
     peerDependenciesMeta:
-      less:
-        optional: true
-      postcss:
-        optional: true
       react:
         optional: true
       react-dom:
         optional: true
-      webpack:
-        optional: true
     dependencies:
-      '@babel/template': 7.20.7
-      '@babel/types': 7.21.5
-      '@storybook/api': 7.1.1(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/components': 7.1.1(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/core-common': 7.1.1
-      '@storybook/core-events': 7.1.1
-      '@storybook/manager-api': 7.1.1(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/node-logger': 7.1.1
-      '@storybook/preview-api': 7.1.1
-      '@storybook/theming': 7.1.1(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/types': 7.1.1
-      css-loader: 6.7.3(webpack@5.75.0)
-      less: 4.1.3
-      less-loader: 11.1.3(less@4.1.3)(webpack@5.75.0)
-      postcss: 8.4.27
-      postcss-loader: 7.3.3(postcss@8.4.27)(webpack@5.75.0)
-      prettier: 3.0.3
-      react: 17.0.2
-      react-dom: 18.2.0(react@17.0.2)
-      resolve-url-loader: 5.0.0
-      sass-loader: 13.3.2(sass@1.64.1)(webpack@5.75.0)
-      style-loader: 3.3.3(webpack@5.75.0)
-      webpack: 5.75.0(esbuild@0.18.17)
+      '@storybook/client-logger': 7.5.2
+      '@storybook/components': 7.5.2(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/manager-api': 7.5.2(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/preview-api': 7.5.2
+      '@storybook/theming': 7.5.2(react-dom@18.2.0)(react@18.2.0)
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
     transitivePeerDependencies:
-      - encoding
-      - fibers
-      - node-sass
-      - sass
-      - sass-embedded
-      - supports-color
+      - '@types/react'
+      - '@types/react-dom'
     dev: true
 
-  /@storybook/addon-toolbars@7.1.1(react-dom@18.2.0)(react@17.0.2):
-    resolution: {integrity: sha512-tHMv1a8hg0kmxwtKf31BZ2Z1ULnxRF/TEoDLJKVvTthhcWLQm0LmqVIG82/bnuWn4vlDrsdGT7sAN+TU7B8p0A==}
+  /@storybook/addon-viewport@7.5.2(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-qN5X9vgp0v+WGXyFBHQ/CqjdtmnCoHhUjqXmBxEGBziJz/tZwWwtTGWeUUZpuTjCGiZutLrizOFl5MqQAI+ipg==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -5980,74 +8753,57 @@ packages:
       react-dom:
         optional: true
     dependencies:
-      '@storybook/client-logger': 7.1.1
-      '@storybook/components': 7.1.1(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/manager-api': 7.1.1(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/preview-api': 7.1.1
-      '@storybook/theming': 7.1.1(react-dom@18.2.0)(react@17.0.2)
-      react: 17.0.2
-      react-dom: 18.2.0(react@17.0.2)
-    dev: true
-
-  /@storybook/addon-viewport@7.1.1(react-dom@18.2.0)(react@17.0.2):
-    resolution: {integrity: sha512-OAb3+NSQF0zAVdKhZwW0YOC/VMCXDncXp51ufxaz/LkF3qOGuqfmHTOfDDwjx3P6d3kX1aWV+vLVuoRS0JRK5g==}
-    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:
-      '@storybook/client-logger': 7.1.1
-      '@storybook/components': 7.1.1(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/core-events': 7.1.1
+      '@storybook/client-logger': 7.5.2
+      '@storybook/components': 7.5.2(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/core-events': 7.5.2
       '@storybook/global': 5.0.0
-      '@storybook/manager-api': 7.1.1(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/preview-api': 7.1.1
-      '@storybook/theming': 7.1.1(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/manager-api': 7.5.2(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/preview-api': 7.5.2
+      '@storybook/theming': 7.5.2(react-dom@18.2.0)(react@18.2.0)
       memoizerific: 1.11.3
       prop-types: 15.8.1
-      react: 17.0.2
-      react-dom: 18.2.0(react@17.0.2)
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
+    transitivePeerDependencies:
+      - '@types/react'
+      - '@types/react-dom'
     dev: true
 
-  /@storybook/addons@6.5.15(react-dom@18.2.0)(react@17.0.2):
+  /@storybook/addons@6.5.15(react-dom@18.2.0)(react@18.2.0):
     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/api': 6.5.15(react-dom@18.2.0)(react@18.2.0)
       '@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)
+      '@storybook/router': 6.5.15(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/theming': 6.5.15(react-dom@18.2.0)(react@18.2.0)
       '@types/webpack-env': 1.18.0
       core-js: 3.31.0
       global: 4.4.0
-      react: 17.0.2
-      react-dom: 18.2.0(react@17.0.2)
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
       regenerator-runtime: 0.13.11
     dev: true
 
-  /@storybook/addons@7.0.7(react-dom@18.2.0)(react@17.0.2):
+  /@storybook/addons@7.0.7(react-dom@18.2.0)(react@18.2.0):
     resolution: {integrity: sha512-it8NWXsdm3dhjc237d9jj7dGJf6eHDfuDv12nirV64J1dzWrnW+lONeZMPMgxxdLlgYfxH52fLgjcw/dAC/E+Q==}
     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.7(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/manager-api': 7.0.7(react-dom@18.2.0)(react@18.2.0)
       '@storybook/preview-api': 7.0.7
       '@storybook/types': 7.0.7
-      react: 17.0.2
-      react-dom: 18.2.0(react@17.0.2)
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
     dev: true
 
-  /@storybook/api@6.5.15(react-dom@18.2.0)(react@17.0.2):
+  /@storybook/api@6.5.15(react-dom@18.2.0)(react@18.2.0):
     resolution: {integrity: sha512-BBE0KXKvj1/3jTghbIoWfrcDM0t+xO7EYtWWAXD6XlhGsZVD2Dy82Z52ONyLulMDRpMWl0OYy3h6A1YnFUH25w==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -6057,16 +8813,16 @@ packages:
       '@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/router': 6.5.15(react-dom@18.2.0)(react@18.2.0)
       '@storybook/semver': 7.3.2
-      '@storybook/theming': 6.5.15(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/theming': 6.5.15(react-dom@18.2.0)(react@18.2.0)
       core-js: 3.31.0
       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)
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
       regenerator-runtime: 0.13.11
       store2: 2.14.2
       telejson: 6.0.8
@@ -6074,7 +8830,7 @@ packages:
       util-deprecate: 1.0.2
     dev: true
 
-  /@storybook/api@7.1.1(react-dom@18.2.0)(react@17.0.2):
+  /@storybook/api@7.1.1(react-dom@18.2.0)(react@18.2.0):
     resolution: {integrity: sha512-beZ9NbGOkFqPBVnZLE67Q5b7hBKwm+OINbeN9DC5v8jrJmU/seLFs/itKzW2tEUFadyMjhJv+kcpyPjxK77m4g==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -6086,54 +8842,56 @@ packages:
         optional: true
     dependencies:
       '@storybook/client-logger': 7.1.1
-      '@storybook/manager-api': 7.1.1(react-dom@18.2.0)(react@17.0.2)
-      react: 17.0.2
-      react-dom: 18.2.0(react@17.0.2)
+      '@storybook/manager-api': 7.1.1(react-dom@18.2.0)(react@18.2.0)
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
     dev: true
 
-  /@storybook/blocks@7.1.1(react-dom@18.2.0)(react@17.0.2):
-    resolution: {integrity: sha512-YIpIJi/+sByZhKrpKbVmXazUP1hj/QXybVOzwz2PT6tphfhrubGLBgu3RJIp6hwJ/lWf9RfghR7P8n+7aN6U9w==}
+  /@storybook/blocks@7.5.2(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-Tf6XE/YcnWQVBJRcJWJzhkahjSymv6QZuxMAiKFD8v48QRJ8kTxz1tBN9676Ux+l1WwtVWxwvd/0kRKKxE70wQ==}
     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.1.1
-      '@storybook/client-logger': 7.1.1
-      '@storybook/components': 7.1.1(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/core-events': 7.1.1
+      '@storybook/channels': 7.5.2
+      '@storybook/client-logger': 7.5.2
+      '@storybook/components': 7.5.2(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/core-events': 7.5.2
       '@storybook/csf': 0.1.0
-      '@storybook/docs-tools': 7.1.1
+      '@storybook/docs-tools': 7.5.2
       '@storybook/global': 5.0.0
-      '@storybook/manager-api': 7.1.1(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/preview-api': 7.1.1
-      '@storybook/theming': 7.1.1(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/types': 7.1.1
+      '@storybook/manager-api': 7.5.2(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/preview-api': 7.5.2
+      '@storybook/theming': 7.5.2(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/types': 7.5.2
       '@types/lodash': 4.14.195
       color-convert: 2.0.1
       dequal: 2.0.3
       lodash: 4.17.21
-      markdown-to-jsx: 7.1.9(react@17.0.2)
+      markdown-to-jsx: 7.1.9(react@18.2.0)
       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)
-      telejson: 7.0.4
+      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'
+      - '@types/react-dom'
       - encoding
       - supports-color
     dev: true
 
-  /@storybook/builder-manager@7.1.1:
-    resolution: {integrity: sha512-vocO/JjrXPOnkFnwCV2NqKxbTfyYD2qV8PGH8EFNw2+I13GNbZ5CphEZMhI7HmKm0aIYPKdZKbN4KNWkwOxyAQ==}
+  /@storybook/builder-manager@7.5.2:
+    resolution: {integrity: sha512-s4gOudrft/E4lQ19YNrzL2VJwMEpdY6z319fTlc16J1F6XZSytw6CIZPs3x9yX5CKf4/leWnN5etODaOx7NajQ==}
     dependencies:
       '@fal-works/esbuild-plugin-global-externals': 2.1.2
-      '@storybook/core-common': 7.1.1
-      '@storybook/manager': 7.1.1
-      '@storybook/node-logger': 7.1.1
+      '@storybook/core-common': 7.5.2
+      '@storybook/manager': 7.5.2
+      '@storybook/node-logger': 7.5.2
       '@types/ejs': 3.1.1
       '@types/find-cache-dir': 3.2.1
       '@yarnpkg/esbuild-plugin-pnp': 3.0.0-rc.15(esbuild@0.18.17)
@@ -6151,12 +8909,12 @@ packages:
       - supports-color
     dev: true
 
-  /@storybook/builder-vite@7.1.1(typescript@5.2.2)(vite@4.4.7):
-    resolution: {integrity: sha512-OIQv8V7r6fqBqAXQT9mqgu1aqP+wlFGDRACyS2iym5y5B3e6fhCOUS/31pBp3vmgNRK6LAfEI0FXI71aOp82MQ==}
+  /@storybook/builder-vite@7.5.2(typescript@5.3.2)(vite@5.0.10):
+    resolution: {integrity: sha512-j96m5K0ahlAjQY6uUxEbybvmRFc3eMpQ3wiosuunc8NkXtfohXZeRVQowAcVrfPktKMufRNGY86RTYxe7sMABw==}
     peerDependencies:
       '@preact/preset-vite': '*'
-      typescript: ^5.2.2
-      vite: ^3.0.0 || ^4.0.0
+      typescript: ^5.3.0
+      vite: ^3.0.0 || ^4.0.0 || ^5.0.0
       vite-plugin-glimmerx: '*'
     peerDependenciesMeta:
       '@preact/preset-vite':
@@ -6166,15 +8924,14 @@ packages:
       vite-plugin-glimmerx:
         optional: true
     dependencies:
-      '@storybook/channels': 7.1.1
-      '@storybook/client-logger': 7.1.1
-      '@storybook/core-common': 7.1.1
-      '@storybook/csf-plugin': 7.1.1
-      '@storybook/mdx2-csf': 1.0.0
-      '@storybook/node-logger': 7.1.1
-      '@storybook/preview': 7.1.1
-      '@storybook/preview-api': 7.1.1
-      '@storybook/types': 7.1.1
+      '@storybook/channels': 7.5.2
+      '@storybook/client-logger': 7.5.2
+      '@storybook/core-common': 7.5.2
+      '@storybook/csf-plugin': 7.5.2
+      '@storybook/node-logger': 7.5.2
+      '@storybook/preview': 7.5.2
+      '@storybook/preview-api': 7.5.2
+      '@storybook/types': 7.5.2
       '@types/find-cache-dir': 3.2.1
       browser-assert: 1.2.1
       es-module-lexer: 0.9.3
@@ -6182,11 +8939,9 @@ packages:
       find-cache-dir: 3.3.2
       fs-extra: 11.1.1
       magic-string: 0.30.1
-      remark-external-links: 8.0.0
-      remark-slug: 6.1.0
       rollup: 3.26.3
-      typescript: 5.2.2
-      vite: 4.4.7(less@4.1.3)(sass@1.64.1)
+      typescript: 5.3.2
+      vite: 5.0.10(sass@1.64.1)
     transitivePeerDependencies:
       - encoding
       - supports-color
@@ -6200,14 +8955,7 @@ packages:
       '@storybook/core-events': 7.0.7
       '@storybook/global': 5.0.0
       qs: 6.11.0
-      telejson: 7.0.4
-    dev: true
-
-  /@storybook/channel-postmessage@7.1.1:
-    resolution: {integrity: sha512-Gmjh3feilXKLmZkQdjgkT8BRrfHnrBJJ8CY86MwD4wQlohObeFIXfhueRof4vJEGvIfJwooUrk9CkkXb5YbluQ==}
-    dependencies:
-      '@storybook/channels': 7.1.1
-      '@storybook/client-logger': 7.1.1
+      telejson: 7.2.0
     dev: true
 
   /@storybook/channels@6.5.15:
@@ -6229,25 +8977,48 @@ packages:
       '@storybook/core-events': 7.1.1
       '@storybook/global': 5.0.0
       qs: 6.11.0
-      telejson: 7.0.4
+      telejson: 7.2.0
       tiny-invariant: 1.3.1
     dev: true
 
-  /@storybook/cli@7.1.1:
-    resolution: {integrity: sha512-xQU0GBIRQpwlvTnzOvDo05H5aH660DaZ9JlXd8ThPkEicoTvhkH0oQVEMYaWKChp5Ok7Wu8+kB7fzgUSOGzj+Q==}
+  /@storybook/channels@7.5.2:
+    resolution: {integrity: sha512-3SgqWq9NS0XX1QxK3riuaOLrReHWwVhI63u6q1ryDD3SttpmAezZETibOAtzDuk2FKgsyHTmAlmcGQf4ZxhOJA==}
+    dependencies:
+      '@storybook/client-logger': 7.5.2
+      '@storybook/core-events': 7.5.2
+      '@storybook/global': 5.0.0
+      qs: 6.11.0
+      telejson: 7.2.0
+      tiny-invariant: 1.3.1
+    dev: true
+
+  /@storybook/channels@7.5.3:
+    resolution: {integrity: sha512-dhWuV2o2lmxH0RKuzND8jxYzvSQTSmpE13P0IT/k8+I1up/rSNYOBQJT6SalakcNWXFAMXguo/8E7ApmnKKcEw==}
+    dependencies:
+      '@storybook/client-logger': 7.5.3
+      '@storybook/core-events': 7.5.3
+      '@storybook/global': 5.0.0
+      qs: 6.11.0
+      telejson: 7.2.0
+      tiny-invariant: 1.3.1
+    dev: true
+
+  /@storybook/cli@7.5.2:
+    resolution: {integrity: sha512-8JPvA/K66zBmRFpRRwsD0JLqZUODRrGmNuAWx+Bj1K8wqbg68MYnOflbkSIxIVxrfhd39OrffV0h8CwKNL9gAg==}
     hasBin: true
     dependencies:
       '@babel/core': 7.22.9
       '@babel/preset-env': 7.22.9(@babel/core@7.22.9)
       '@babel/types': 7.22.5
       '@ndelangen/get-tarball': 3.0.7
-      '@storybook/codemod': 7.1.1
-      '@storybook/core-common': 7.1.1
-      '@storybook/core-server': 7.1.1
-      '@storybook/csf-tools': 7.1.1
-      '@storybook/node-logger': 7.1.1
-      '@storybook/telemetry': 7.1.1
-      '@storybook/types': 7.1.1
+      '@storybook/codemod': 7.5.2
+      '@storybook/core-common': 7.5.2
+      '@storybook/core-events': 7.5.2
+      '@storybook/core-server': 7.5.2
+      '@storybook/csf-tools': 7.5.2
+      '@storybook/node-logger': 7.5.2
+      '@storybook/telemetry': 7.5.2
+      '@storybook/types': 7.5.2
       '@types/semver': 7.5.0
       '@yarnpkg/fslib': 2.10.3
       '@yarnpkg/libzip': 2.3.0
@@ -6267,12 +9038,12 @@ packages:
       jscodeshift: 0.14.0(@babel/preset-env@7.22.9)
       leven: 3.1.0
       ora: 5.4.1
-      prettier: 3.0.3
+      prettier: 3.1.0
       prompts: 2.4.2
       puppeteer-core: 2.1.1
       read-pkg-up: 7.0.1
       semver: 7.5.4
-      simple-update-notifier: 1.0.7
+      simple-update-notifier: 2.0.0
       strip-json-comments: 3.1.1
       tempy: 1.0.1
       ts-dedent: 2.2.0
@@ -6303,28 +9074,40 @@ packages:
       '@storybook/global': 5.0.0
     dev: true
 
-  /@storybook/codemod@7.1.1:
-    resolution: {integrity: sha512-QB4MoeFXA4QsX0LuwjHoTVqsX7krRXmqfwSWIQMB8/qsAfyBp/jiG2xWmwa2agKwtlYvZzkvGdCjAOmK4SUSHQ==}
+  /@storybook/client-logger@7.5.2:
+    resolution: {integrity: sha512-7YgLItlmiYDzWYexTaRNuHhtFarh9krsI+8l7Yjn9ryoHSTJUcTWx+yPJm1II+PQR8v/x5UgsxzultjgEurfRQ==}
+    dependencies:
+      '@storybook/global': 5.0.0
+    dev: true
+
+  /@storybook/client-logger@7.5.3:
+    resolution: {integrity: sha512-vUFYALypjix5FoJ5M/XUP6KmyTnQJNW1poHdW7WXUVSg+lBM6E5eAtjTm0hdxNNDH8KSrdy24nCLra5h0X0BWg==}
+    dependencies:
+      '@storybook/global': 5.0.0
+    dev: true
+
+  /@storybook/codemod@7.5.2:
+    resolution: {integrity: sha512-PxZg0w4OlmFB4dBzB+sCgwmHNke0n1N8vNooxtcuusrLKlbUfmssYRnQn6yRSJw0WfkUYgI10CWxGaamaOFekA==}
     dependencies:
       '@babel/core': 7.22.9
       '@babel/preset-env': 7.22.9(@babel/core@7.22.9)
       '@babel/types': 7.22.5
       '@storybook/csf': 0.1.0
-      '@storybook/csf-tools': 7.1.1
-      '@storybook/node-logger': 7.1.1
-      '@storybook/types': 7.1.1
+      '@storybook/csf-tools': 7.5.2
+      '@storybook/node-logger': 7.5.2
+      '@storybook/types': 7.5.2
       '@types/cross-spawn': 6.0.2
       cross-spawn: 7.0.3
       globby: 11.1.0
       jscodeshift: 0.14.0(@babel/preset-env@7.22.9)
       lodash: 4.17.21
-      prettier: 3.0.3
+      prettier: 3.1.0
       recast: 0.23.3
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@storybook/components@6.5.15(react-dom@18.2.0)(react@17.0.2):
+  /@storybook/components@6.5.15(react-dom@18.2.0)(react@18.2.0):
     resolution: {integrity: sha512-bHTT0Oa3s4g+MBMaLBbX9ofMtb1AW59AzIUNGrfqW1XqJMGuUHMiJ7TSo+i5dRSFpbFygnwMEG9LfHxpR2Z0Dw==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -6332,17 +9115,17 @@ packages:
     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)
+      '@storybook/theming': 6.5.15(react-dom@18.2.0)(react@18.2.0)
       core-js: 3.31.0
       memoizerific: 1.11.3
       qs: 6.11.0
-      react: 17.0.2
-      react-dom: 18.2.0(react@17.0.2)
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
       regenerator-runtime: 0.13.11
       util-deprecate: 1.0.2
     dev: true
 
-  /@storybook/components@7.1.1(react-dom@18.2.0)(react@17.0.2):
+  /@storybook/components@7.1.1(react-dom@18.2.0)(react@18.2.0):
     resolution: {integrity: sha512-RUSjDj2RDTZsdKfs48oY+3iaL/y3GHU07zuHm/V4kuEHqJscXUt3n5vIX/Z/GtezMrxc0aPDlCSyS/N/EU6bUQ==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -6351,34 +9134,81 @@ packages:
       '@storybook/client-logger': 7.1.1
       '@storybook/csf': 0.1.0
       '@storybook/global': 5.0.0
-      '@storybook/theming': 7.1.1(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/theming': 7.1.1(react-dom@18.2.0)(react@18.2.0)
       '@storybook/types': 7.1.1
       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)
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
+      use-resize-observer: 9.1.0(react-dom@18.2.0)(react@18.2.0)
       util-deprecate: 1.0.2
     dev: true
 
-  /@storybook/core-client@7.1.1:
-    resolution: {integrity: sha512-yFd617XKFS+Q5IFmItXR+DdMfpreHHcdy3f67dt8PLnnjNcGMpi7gEcp8t9yBAT+pIgnqSfE/FNUFTg0OEpRpw==}
+  /@storybook/components@7.5.2(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-OP+o6AoxoQDbqjk/jdQ1arlc1T8601eCL+rS1dJY9EtAFq7Z0LEFtafhEW/Lx8FotfVGjfCNptH9ODhHU6e5Jw==}
+    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.1.1
-      '@storybook/preview-api': 7.1.1
+      '@radix-ui/react-select': 1.2.2(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-toolbar': 1.0.4(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/client-logger': 7.5.2
+      '@storybook/csf': 0.1.0
+      '@storybook/global': 5.0.0
+      '@storybook/theming': 7.5.2(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/types': 7.5.2
+      memoizerific: 1.11.3
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
+      use-resize-observer: 9.1.0(react-dom@18.2.0)(react@18.2.0)
+      util-deprecate: 1.0.2
+    transitivePeerDependencies:
+      - '@types/react'
+      - '@types/react-dom'
     dev: true
 
-  /@storybook/core-common@7.1.1:
-    resolution: {integrity: sha512-DO7ZS6YDITykvqMHeOWSmnsPYk2w7gka9GtO2LPbEm0f6p5kG2nohBO5+nsI3PuXpKiHXOB7vKJjwfQqxvPj5A==}
+  /@storybook/components@7.5.3(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-M3+cjvEsDGLUx8RvK5wyF6/13LNlUnKbMgiDE8Sxk/v/WPpyhOAIh/B8VmrU1psahS61Jd4MTkFmLf1cWau1vw==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0
+      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
     dependencies:
-      '@storybook/node-logger': 7.1.1
-      '@storybook/types': 7.1.1
+      '@radix-ui/react-select': 1.2.2(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-toolbar': 1.0.4(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/client-logger': 7.5.3
+      '@storybook/csf': 0.1.0
+      '@storybook/global': 5.0.0
+      '@storybook/theming': 7.5.3(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/types': 7.5.3
+      memoizerific: 1.11.3
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
+      use-resize-observer: 9.1.0(react-dom@18.2.0)(react@18.2.0)
+      util-deprecate: 1.0.2
+    transitivePeerDependencies:
+      - '@types/react'
+      - '@types/react-dom'
+    dev: true
+
+  /@storybook/core-client@7.5.2:
+    resolution: {integrity: sha512-mMDSBxc7esMCu0FOkama9XYHzIHYGhBj8roX+XaTaLDYXaw/UajcCuzcO7fFBHNn3Vdqh2ufIxlI7359v3IqPw==}
+    dependencies:
+      '@storybook/client-logger': 7.5.2
+      '@storybook/preview-api': 7.5.2
+    dev: true
+
+  /@storybook/core-common@7.5.2:
+    resolution: {integrity: sha512-js7fIH4wHS08dBuIVsr3JnwMtKn5O1Izc/Zor4t6PntLWkGGX4X/GxbOkasGX5SkCT1qUtB9RpdPd1sUkLhIgw==}
+    dependencies:
+      '@storybook/core-events': 7.5.2
+      '@storybook/node-logger': 7.5.2
+      '@storybook/types': 7.5.2
       '@types/find-cache-dir': 3.2.1
       '@types/node': 18.16.16
       '@types/node-fetch': 2.6.4
       '@types/pretty-hrtime': 1.0.1
       chalk: 4.1.2
       esbuild: 0.18.17
-      esbuild-register: 3.4.2(esbuild@0.18.17)
+      esbuild-register: 3.5.0(esbuild@0.18.17)
       file-system-cache: 2.3.0
       find-cache-dir: 3.3.2
       find-up: 5.0.0
@@ -6397,6 +9227,37 @@ packages:
       - supports-color
     dev: true
 
+  /@storybook/core-common@7.5.3:
+    resolution: {integrity: sha512-WGMwjtVUxUzFwQz7Mgs0gLuNebIGNV55dCdZgurx2/y6QOkJ2v8D0b3iL+xKMV4B5Nwoc2DsM418Y+Hy3UQd+w==}
+    dependencies:
+      '@storybook/core-events': 7.5.3
+      '@storybook/node-logger': 7.5.3
+      '@storybook/types': 7.5.3
+      '@types/find-cache-dir': 3.2.1
+      '@types/node': 18.16.16
+      '@types/node-fetch': 2.6.4
+      '@types/pretty-hrtime': 1.0.1
+      chalk: 4.1.2
+      esbuild: 0.18.17
+      esbuild-register: 3.5.0(esbuild@0.18.17)
+      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.3
+      handlebars: 4.7.7
+      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
+      ts-dedent: 2.2.0
+    transitivePeerDependencies:
+      - encoding
+      - supports-color
+    dev: true
+
   /@storybook/core-events@6.5.15:
     resolution: {integrity: sha512-B1Ba6l5W7MeNclclqMMTMHgYgfdpB5SIhNCQFnzIz8blynzRhNFMdxvbAl6Je5G0S4xydYYd7Lno2kXQebs7HA==}
     dependencies:
@@ -6411,24 +9272,36 @@ packages:
     resolution: {integrity: sha512-P5iI4zvCJo85de/sghglEHFK/GGkWAQQKzRFrz9kbVBX5LNaosfD7IYHIz/6ZWNPzxWR+RBOKcrRUfcArL4Njg==}
     dev: true
 
-  /@storybook/core-server@7.1.1:
-    resolution: {integrity: sha512-IfrkdcYwVoP4bltBTx8Yr1e++UAfICV8IYCgW8VFW26Uvl22biCVWwliE35iTYpUmHJgn+U489hCnEdGpr2CWw==}
+  /@storybook/core-events@7.5.2:
+    resolution: {integrity: sha512-DV8bFEFVKDEvaH87KYPXDE0YEV+Y9yjFv2xxmC9pF8l+MWCtVW72RBLhB+gU5NM1bkHrRDNb0lOJfVGKlhxOog==}
+    dependencies:
+      ts-dedent: 2.2.0
+    dev: true
+
+  /@storybook/core-events@7.5.3:
+    resolution: {integrity: sha512-DFOpyQ22JD5C1oeOFzL8wlqSWZzrqgDfDbUGP8xdO4wJu+FVTxnnWN6ZYLdTPB1u27DOhd7TzjQMfLDHLu7kbQ==}
+    dependencies:
+      ts-dedent: 2.2.0
+    dev: true
+
+  /@storybook/core-server@7.5.2:
+    resolution: {integrity: sha512-4oXpy1L/NyHiz/OXNUFnSeMLA/+lTgQAlVx86pRbEBDj6snt1/NSx2+yZyFtZ/XTnJ22BPpM8IIrgm95ZlQKmA==}
     dependencies:
       '@aw-web-design/x-default-browser': 1.4.126
       '@discoveryjs/json-ext': 0.5.7
-      '@storybook/builder-manager': 7.1.1
-      '@storybook/channels': 7.1.1
-      '@storybook/core-common': 7.1.1
-      '@storybook/core-events': 7.1.1
+      '@storybook/builder-manager': 7.5.2
+      '@storybook/channels': 7.5.2
+      '@storybook/core-common': 7.5.2
+      '@storybook/core-events': 7.5.2
       '@storybook/csf': 0.1.0
-      '@storybook/csf-tools': 7.1.1
+      '@storybook/csf-tools': 7.5.2
       '@storybook/docs-mdx': 0.1.0
       '@storybook/global': 5.0.0
-      '@storybook/manager': 7.1.1
-      '@storybook/node-logger': 7.1.1
-      '@storybook/preview-api': 7.1.1
-      '@storybook/telemetry': 7.1.1
-      '@storybook/types': 7.1.1
+      '@storybook/manager': 7.5.2
+      '@storybook/node-logger': 7.5.2
+      '@storybook/preview-api': 7.5.2
+      '@storybook/telemetry': 7.5.2
+      '@storybook/types': 7.5.2
       '@types/detect-port': 1.3.2
       '@types/node': 18.16.16
       '@types/pretty-hrtime': 1.0.1
@@ -6448,14 +9321,13 @@ packages:
       prompts: 2.4.2
       read-pkg-up: 7.0.1
       semver: 7.5.4
-      serve-favicon: 2.5.0
-      telejson: 7.0.4
+      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.13.0
+      ws: 8.12.0
     transitivePeerDependencies:
       - bufferutil
       - encoding
@@ -6463,24 +9335,24 @@ packages:
       - utf-8-validate
     dev: true
 
-  /@storybook/csf-plugin@7.1.1:
-    resolution: {integrity: sha512-bokV+HU6rV/wlWIvgAtn1PUot1W71pto/Wft5hCUATDCsXDz4B5aI9d/ZCJhu7G1R4cYtjsxVdBJSHe9dem7Lg==}
+  /@storybook/csf-plugin@7.5.2:
+    resolution: {integrity: sha512-ndjn1ia2rQLO1r1z6mXv6nipLzJMwWJp31h16lQUXIBQEOiGKjGGvObiuKaad3nNHxWHpGra4zUg7R+54Yw0Hw==}
     dependencies:
-      '@storybook/csf-tools': 7.1.1
+      '@storybook/csf-tools': 7.5.2
       unplugin: 1.4.0
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@storybook/csf-tools@7.1.1:
-    resolution: {integrity: sha512-IdDW+NsTIxqv7BjeFaTonvX0Ac5HzzNiKvGkhydXrpaz7kJX4g0T96xpR+RhbEtPfQ0AcpiHnW0kMPx9YLJRew==}
+  /@storybook/csf-tools@7.5.2:
+    resolution: {integrity: sha512-yXaEDREc2wvkjYkQqDMatJw23f0fEFhMIf/zBNF7YljeYw0j8jAg/7XI5WJJSN2KTxD/feD/yD+6eaLUXvrneQ==}
     dependencies:
       '@babel/generator': 7.22.9
       '@babel/parser': 7.22.7
       '@babel/traverse': 7.22.8
       '@babel/types': 7.22.5
       '@storybook/csf': 0.1.0
-      '@storybook/types': 7.1.1
+      '@storybook/types': 7.5.2
       fs-extra: 11.1.1
       recast: 0.23.3
       ts-dedent: 2.2.0
@@ -6504,12 +9376,12 @@ packages:
     resolution: {integrity: sha512-JDaBR9lwVY4eSH5W8EGHrhODjygPd6QImRbwjAuJNEnY0Vw4ie3bPkeGfnacB3OBW6u/agqPv2aRlR46JcAQLg==}
     dev: true
 
-  /@storybook/docs-tools@7.1.1:
-    resolution: {integrity: sha512-noDgogRHum1FuqgXBdlv2+wOdkIJOJqSUSi0ZGiuP1OEOdA9YdbCfbWn/z734UEmhwraoQSXYb2tvrIEjfzYSw==}
+  /@storybook/docs-tools@7.5.2:
+    resolution: {integrity: sha512-mBiZFhzMA2ub7wX0ho3UqKqKXO+xUi/rqb4KV4PihLKlhThEdzKyYrIZO4W90NOmlp1yUJJcjG8D8SUPuHQoTw==}
     dependencies:
-      '@storybook/core-common': 7.1.1
-      '@storybook/preview-api': 7.1.1
-      '@storybook/types': 7.1.1
+      '@storybook/core-common': 7.5.2
+      '@storybook/preview-api': 7.5.2
+      '@storybook/types': 7.5.2
       '@types/doctrine': 0.0.3
       doctrine: 3.0.0
       lodash: 4.17.21
@@ -6522,7 +9394,17 @@ packages:
     resolution: {integrity: sha512-FcOqPAXACP0I3oJ/ws6/rrPT9WGhu915Cg8D02a9YxLo0DE9zI+a9A5gRGvmQ09fiWPukqI8ZAEoQEdWUKMQdQ==}
     dev: true
 
-  /@storybook/manager-api@7.0.7(react-dom@18.2.0)(react@17.0.2):
+  /@storybook/instrumenter@7.5.3:
+    resolution: {integrity: sha512-p6b+/6ohTCKxWn00bXT8KBqVjXUOxeILnJtLlG83USLQCpI+XVkpmK57HYuydqEwy/1XjG+4S4ntPk9VVz3u7w==}
+    dependencies:
+      '@storybook/channels': 7.5.3
+      '@storybook/client-logger': 7.5.3
+      '@storybook/core-events': 7.5.3
+      '@storybook/global': 5.0.0
+      '@storybook/preview-api': 7.5.3
+    dev: true
+
+  /@storybook/manager-api@7.0.7(react-dom@18.2.0)(react@18.2.0):
     resolution: {integrity: sha512-QTd/P72peAhofKqK+8yzIO9iWAEfPn8WUGGveV2KGaTlSlgbr87RLHEKilcXMZcYhBWC9izFRmjKum9ROdskrQ==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -6533,21 +9415,21 @@ packages:
       '@storybook/core-events': 7.0.7
       '@storybook/csf': 0.1.0
       '@storybook/global': 5.0.0
-      '@storybook/router': 7.0.7(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/theming': 7.0.7(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/router': 7.0.7(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/theming': 7.0.7(react-dom@18.2.0)(react@18.2.0)
       '@storybook/types': 7.0.7
       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)
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
       semver: 7.5.4
       store2: 2.14.2
-      telejson: 7.0.4
+      telejson: 7.2.0
       ts-dedent: 2.2.0
     dev: true
 
-  /@storybook/manager-api@7.1.1(react-dom@18.2.0)(react@17.0.2):
+  /@storybook/manager-api@7.1.1(react-dom@18.2.0)(react@18.2.0):
     resolution: {integrity: sha512-gk429qAGMW33rAZwFXo7fDoeYGrnSbj4ddHXJYc0nzBcC6emlq5IS5GHgJthQ3Oe8CPbq8bwUkWW6I5E7OePWA==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -6558,22 +9440,72 @@ packages:
       '@storybook/core-events': 7.1.1
       '@storybook/csf': 0.1.0
       '@storybook/global': 5.0.0
-      '@storybook/router': 7.1.1(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/theming': 7.1.1(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/router': 7.1.1(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/theming': 7.1.1(react-dom@18.2.0)(react@18.2.0)
       '@storybook/types': 7.1.1
       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)
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
       semver: 7.5.4
       store2: 2.14.2
-      telejson: 7.0.4
+      telejson: 7.2.0
       ts-dedent: 2.2.0
     dev: true
 
-  /@storybook/manager@7.1.1:
-    resolution: {integrity: sha512-kRW9sPuJWsEi8Swcyt9rYwdfvA0rqKEuPBCCbrmmjyIwZR60IYg2KHXcF7q4qdkvts2xee5YTbgHcdfc0iIPSg==}
+  /@storybook/manager-api@7.5.2(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-WX8GjBkITRQzhQ08WEAVjdDW8QqqIQhWOpFzXUYCxCNzt1eSALI31QQ+M1/MYymw+TOkotC/SMcn/puIAm4rdA==}
+    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.5.2
+      '@storybook/client-logger': 7.5.2
+      '@storybook/core-events': 7.5.2
+      '@storybook/csf': 0.1.0
+      '@storybook/global': 5.0.0
+      '@storybook/router': 7.5.2(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/theming': 7.5.2(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/types': 7.5.2
+      dequal: 2.0.3
+      lodash: 4.17.21
+      memoizerific: 1.11.3
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
+      semver: 7.5.4
+      store2: 2.14.2
+      telejson: 7.2.0
+      ts-dedent: 2.2.0
+    dev: true
+
+  /@storybook/manager-api@7.5.3(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-d8mVLr/5BEG4bAS2ZeqYTy/aX4jPEpZHdcLaWoB4mAM+PAL9wcWsirUyApKtDVYLITJf/hd8bb2Dm2ok6E45gA==}
+    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.5.3
+      '@storybook/client-logger': 7.5.3
+      '@storybook/core-events': 7.5.3
+      '@storybook/csf': 0.1.0
+      '@storybook/global': 5.0.0
+      '@storybook/router': 7.5.3(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/theming': 7.5.3(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/types': 7.5.3
+      dequal: 2.0.3
+      lodash: 4.17.21
+      memoizerific: 1.11.3
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
+      semver: 7.5.4
+      store2: 2.14.2
+      telejson: 7.2.0
+      ts-dedent: 2.2.0
+    dev: true
+
+  /@storybook/manager@7.5.2:
+    resolution: {integrity: sha512-5l1z9SpCFQBcHjC5mbfWQ8mPTYFxD8GQ9mNZ6PPrj47yu9TyCRYSQj7A8ZXJiIY1ZEg4a2BCW7fPUYG+lX6Drw==}
     dev: true
 
   /@storybook/mdx2-csf@1.0.0:
@@ -6590,12 +9522,16 @@ packages:
       pretty-hrtime: 1.0.3
     dev: true
 
-  /@storybook/node-logger@7.1.1:
-    resolution: {integrity: sha512-gnAuNM+wNoOcGnUM6hLsYV0lwUgRI39Ep/Pp3VF1oXZAthEyrQRm7ImbeAdt93ObPc9DZgqTx9OI8QnErZuJiA==}
+  /@storybook/node-logger@7.5.2:
+    resolution: {integrity: sha512-VIBuwPJOylu8vJofk1VfmqxlhXgbBgV0pCTo/UzdQAbc3w5y+qNRemf8goWxYEY+L9p6oUXqm/i9+bNGyX7/Mw==}
     dev: true
 
-  /@storybook/postinstall@7.1.1:
-    resolution: {integrity: sha512-qpe6BiFLVs9YYFQVGgRT0dJxPOKBtGLIAsnVEpXKUPrltEWQpTxQEqqOSJlut+FLoWB5MTxrwiJ/7891h4a5pw==}
+  /@storybook/node-logger@7.5.3:
+    resolution: {integrity: sha512-7ZZDw/q3hakBj1FngsBjaHNIBguYAWojp7R1fFTvwkeunCi21EUzZjRBcqp10kB6BP3/NLX32bIQknsCWD76rQ==}
+    dev: true
+
+  /@storybook/postinstall@7.5.2:
+    resolution: {integrity: sha512-fKgyV1fAgckDoxQkUGJl5uzjzGC5esC/nITiCjccZFrqxt9mgmz4VAUkMeseD5tfWQ5oFA0Xdgtrrcl39+chnw==}
     dev: true
 
   /@storybook/preview-api@7.0.7:
@@ -6618,16 +9554,15 @@ packages:
       util-deprecate: 1.0.2
     dev: true
 
-  /@storybook/preview-api@7.1.1:
-    resolution: {integrity: sha512-uI8TVuoFfg3EBdaKdRVUa17JfGdmK78JI3+byLZLkzl6nR+q846BWHgi8eJmU8MHmO5CFaqT2kts/e8T34JDgw==}
+  /@storybook/preview-api@7.5.2:
+    resolution: {integrity: sha512-rpmHR/09UBSnorDBTcE7JgHUQjZLO146NCI+vbI7Pqfb4QX/8lhwkFr4cuHRAR16mv6DAJbDVoPETO0Z/CH9aw==}
     dependencies:
-      '@storybook/channel-postmessage': 7.1.1
-      '@storybook/channels': 7.1.1
-      '@storybook/client-logger': 7.1.1
-      '@storybook/core-events': 7.1.1
+      '@storybook/channels': 7.5.2
+      '@storybook/client-logger': 7.5.2
+      '@storybook/core-events': 7.5.2
       '@storybook/csf': 0.1.0
       '@storybook/global': 5.0.0
-      '@storybook/types': 7.1.1
+      '@storybook/types': 7.5.2
       '@types/qs': 6.9.7
       dequal: 2.0.3
       lodash: 4.17.21
@@ -6638,21 +9573,40 @@ packages:
       util-deprecate: 1.0.2
     dev: true
 
-  /@storybook/preview@7.1.1:
-    resolution: {integrity: sha512-F3ikRKzwmT9MlptYXxYOQmaSwmJckPag0k9lM0LvI0xYplLbyWJ5rfs2gLKl++wX+ag2A+1K4gId5Xaz4SKnxQ==}
+  /@storybook/preview-api@7.5.3:
+    resolution: {integrity: sha512-LNmEf7oBRnZ1wG3bQ+P+TO29+NN5pSDJiAA6FabZBrtIVm+psc2lxBCDQvFYyAFzQSlt60toGKNW8+RfFNdR5Q==}
+    dependencies:
+      '@storybook/channels': 7.5.3
+      '@storybook/client-logger': 7.5.3
+      '@storybook/core-events': 7.5.3
+      '@storybook/csf': 0.1.0
+      '@storybook/global': 5.0.0
+      '@storybook/types': 7.5.3
+      '@types/qs': 6.9.7
+      dequal: 2.0.3
+      lodash: 4.17.21
+      memoizerific: 1.11.3
+      qs: 6.11.0
+      synchronous-promise: 2.0.16
+      ts-dedent: 2.2.0
+      util-deprecate: 1.0.2
     dev: true
 
-  /@storybook/react-dom-shim@7.1.1(react-dom@18.2.0)(react@17.0.2):
-    resolution: {integrity: sha512-yfc0tCtg+OEfvOKwCF0+E0ot8XGpubMTpbfChahhzEYyI9zz1rA7OCwRzERMnX/C7TYW3aLab9f5MzWIKQClmQ==}
+  /@storybook/preview@7.5.2:
+    resolution: {integrity: sha512-dA5VpHp0D9nh9/wOzWP8At1wtz/SiaMBbwaiEOFTFUGcPerrkroEWadIlSSB7vgQJ9yWiD4l3KDaS8ANzHWtPQ==}
+    dev: true
+
+  /@storybook/react-dom-shim@7.5.2(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-x7h3TTLRLs8mrsCBKXbvjBRFms73XrNlm0Lo5Tu/Tf//+pwOFq+2sGBkqbRkYd54jNHhpqNF7+UUdzA93ESnbQ==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
     dependencies:
-      react: 17.0.2
-      react-dom: 18.2.0(react@17.0.2)
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
     dev: true
 
-  /@storybook/router@6.5.15(react-dom@18.2.0)(react@17.0.2):
+  /@storybook/router@6.5.15(react-dom@18.2.0)(react@18.2.0):
     resolution: {integrity: sha512-9t8rI8t7/Krolau29gsdjdbRQ66orONIyP0efp0EukVgv6reNFzb/U14ARrl0uHys6Tl5Xyece9FoakQUdn8Kg==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -6662,12 +9616,12 @@ packages:
       core-js: 3.31.0
       memoizerific: 1.11.3
       qs: 6.11.0
-      react: 17.0.2
-      react-dom: 18.2.0(react@17.0.2)
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
       regenerator-runtime: 0.13.11
     dev: true
 
-  /@storybook/router@7.0.7(react-dom@18.2.0)(react@17.0.2):
+  /@storybook/router@7.0.7(react-dom@18.2.0)(react@18.2.0):
     resolution: {integrity: sha512-/lM8/NHQKeshfnC3ayFuO8Y9TCSHnCAPRhIsVxvanBzcj+ILbCIyZ+TspvB3hT4MbX/Ez+JR8VrMbjXIGwmH8w==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -6676,11 +9630,11 @@ packages:
       '@storybook/client-logger': 7.0.7
       memoizerific: 1.11.3
       qs: 6.11.0
-      react: 17.0.2
-      react-dom: 18.2.0(react@17.0.2)
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
     dev: true
 
-  /@storybook/router@7.1.1(react-dom@18.2.0)(react@17.0.2):
+  /@storybook/router@7.1.1(react-dom@18.2.0)(react@18.2.0):
     resolution: {integrity: sha512-GRYYWVsqAtDm7DHxnGXuaAmr3PQfj+tonYsP8/L3gC5sOdQNF3yaBmvv1pu+bqezwXVowq0ew+iVYECiaGoB3Q==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -6689,8 +9643,34 @@ packages:
       '@storybook/client-logger': 7.1.1
       memoizerific: 1.11.3
       qs: 6.11.0
-      react: 17.0.2
-      react-dom: 18.2.0(react@17.0.2)
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
+    dev: true
+
+  /@storybook/router@7.5.2(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-jlh48TVUlqvGkU8MnkVp9SrCHomWGtQGx1WMK94NMyOPVPTLWzM6LjIybgmHz0MTe4lpzmbiIOfSlU3pPX054w==}
+    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.5.2
+      memoizerific: 1.11.3
+      qs: 6.11.0
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
+    dev: true
+
+  /@storybook/router@7.5.3(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-/iNYCFore7R5n6eFHbBYoB0P2/sybTVpA+uXTNUd3UEt7Ro6CEslTaFTEiH2RVQwOkceBp/NpyWon74xZuXhMg==}
+    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.5.3
+      memoizerific: 1.11.3
+      qs: 6.11.0
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
     dev: true
 
   /@storybook/semver@7.3.2:
@@ -6702,12 +9682,12 @@ packages:
       find-up: 4.1.0
     dev: true
 
-  /@storybook/telemetry@7.1.1:
-    resolution: {integrity: sha512-7bQBfphEHJA1kHyPVVvrRXRet57JhyRD4uxoWYfp4jkSt2wHzAAdGU8Iz7U+ozv4TG7AA1gb1Uh5BS4nCiijsw==}
+  /@storybook/telemetry@7.5.2:
+    resolution: {integrity: sha512-tUgrcIx1vTMhTySp11JbBnWLsaMUNlil5yuOWEJy5i71E4Xy/2hYUtLfxzgXWd/0W7eTl4p2tjUk9uS8AP+S0Q==}
     dependencies:
-      '@storybook/client-logger': 7.1.1
-      '@storybook/core-common': 7.1.1
-      '@storybook/csf-tools': 7.1.1
+      '@storybook/client-logger': 7.5.2
+      '@storybook/core-common': 7.5.2
+      '@storybook/csf-tools': 7.5.2
       chalk: 4.1.2
       detect-package-manager: 2.0.1
       fetch-retry: 5.0.3
@@ -6718,7 +9698,15 @@ packages:
       - supports-color
     dev: true
 
-  /@storybook/theming@6.5.15(react-dom@18.2.0)(react@17.0.2):
+  /@storybook/testing-library@0.2.2:
+    resolution: {integrity: sha512-L8sXFJUHmrlyU2BsWWZGuAjv39Jl1uAqUHdxmN42JY15M4+XCMjGlArdCCjDe1wpTSW6USYISA9axjZojgtvnw==}
+    dependencies:
+      '@testing-library/dom': 9.3.1
+      '@testing-library/user-event': 14.5.1(@testing-library/dom@9.3.1)
+      ts-dedent: 2.2.0
+    dev: true
+
+  /@storybook/theming@6.5.15(react-dom@18.2.0)(react@18.2.0):
     resolution: {integrity: sha512-pgdW0lVZKKXQ4VhIfLHycMmwFSVOY7vLTKnytag4Y8Yz+aXm0bwDN/QxPntFzDH47F1Rcy2ywNnvty8ooDTvuA==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -6727,37 +9715,65 @@ packages:
       '@storybook/client-logger': 6.5.15
       core-js: 3.31.0
       memoizerific: 1.11.3
-      react: 17.0.2
-      react-dom: 18.2.0(react@17.0.2)
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
       regenerator-runtime: 0.13.11
     dev: true
 
-  /@storybook/theming@7.0.7(react-dom@18.2.0)(react@17.0.2):
+  /@storybook/theming@7.0.7(react-dom@18.2.0)(react@18.2.0):
     resolution: {integrity: sha512-InTZe+Sgco1NsxgiG+cyUKWQe3GsjlIyU/o5qDdtOTXcZ64HzyBuAZlAequSddqfDeMDqxRFPc2w1J28MAUHxA==}
     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)
+      '@emotion/use-insertion-effect-with-fallbacks': 1.0.0(react@18.2.0)
       '@storybook/client-logger': 7.0.7
       '@storybook/global': 5.0.0
       memoizerific: 1.11.3
-      react: 17.0.2
-      react-dom: 18.2.0(react@17.0.2)
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
     dev: true
 
-  /@storybook/theming@7.1.1(react-dom@18.2.0)(react@17.0.2):
+  /@storybook/theming@7.1.1(react-dom@18.2.0)(react@18.2.0):
     resolution: {integrity: sha512-8ri/BvfgUzBln9EYB8N/xgRaxZIFFTG0IEEekuV2H5uv4q9JW9p3E5zqghmM1OC/vspJJa8e4Eajb1YiTO0W6w==}
     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)
+      '@emotion/use-insertion-effect-with-fallbacks': 1.0.0(react@18.2.0)
       '@storybook/client-logger': 7.1.1
       '@storybook/global': 5.0.0
       memoizerific: 1.11.3
-      react: 17.0.2
-      react-dom: 18.2.0(react@17.0.2)
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
+    dev: true
+
+  /@storybook/theming@7.5.2(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-DZBTcYErSYvmTYsGz7lKtiIcBe8flBw5Ojp52r3O4GcRYG4AbuUwwVvehz+O1cWaS+UW3HavrcgapERH7ZHd1A==}
+    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@18.2.0)
+      '@storybook/client-logger': 7.5.2
+      '@storybook/global': 5.0.0
+      memoizerific: 1.11.3
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
+    dev: true
+
+  /@storybook/theming@7.5.3(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-Cjmthe1MAk0z4RKCZ7m72gAD8YD0zTAH97z5ryM1Qv84QXjiCQ143fGOmYz1xEQdNFpOThPcwW6FEccLHTkVcg==}
+    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@18.2.0)
+      '@storybook/client-logger': 7.5.3
+      '@storybook/global': 5.0.0
+      memoizerific: 1.11.3
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
     dev: true
 
   /@storybook/types@7.0.7:
@@ -6778,22 +9794,40 @@ packages:
       file-system-cache: 2.3.0
     dev: true
 
-  /@storybook/vue3-vite@7.1.1(@vue/compiler-core@3.3.4)(react-dom@18.2.0)(react@17.0.2)(typescript@5.2.2)(vite@4.4.7)(vue@3.3.4):
-    resolution: {integrity: sha512-BHBDbxz8XjXBcVZjeb5JKrS4czNCGJixb2E0cRxM1ZbxrtWozk0ped153PrwJzK73M6y+MynAR5ySchD36MlwA==}
+  /@storybook/types@7.5.2:
+    resolution: {integrity: sha512-RDKHo6WUES+4nt7uZMfankjxdpYX2EI2GpJ2n2RPcnhzmb/ub1huNTjbzDEYMqY24SppljZeIN57m3Ar6L6f9A==}
+    dependencies:
+      '@storybook/channels': 7.5.2
+      '@types/babel__core': 7.20.0
+      '@types/express': 4.17.14
+      file-system-cache: 2.3.0
+    dev: true
+
+  /@storybook/types@7.5.3:
+    resolution: {integrity: sha512-iu5W0Kdd6nysN5CPkY4GRl+0BpxRTdSfBIJak7mb6xCIHSB5t1tw4BOuqMQ5EgpikRY3MWJ4gY647QkWBX3MNQ==}
+    dependencies:
+      '@storybook/channels': 7.5.3
+      '@types/babel__core': 7.20.0
+      '@types/express': 4.17.14
+      file-system-cache: 2.3.0
+    dev: true
+
+  /@storybook/vue3-vite@7.5.2(@vue/compiler-core@3.3.4)(react-dom@18.2.0)(react@18.2.0)(typescript@5.3.2)(vite@5.0.10)(vue@3.3.4):
+    resolution: {integrity: sha512-SChxq87nSFrf3Nywfa/iBNHIoBO0hcvoQdob0ePGSS1tXL2uVEP+A3NFeXb50MXBUSl+ojZpmkEaO4YRt2cZ1w==}
     engines: {node: ^14.18 || >=16}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-      vite: ^3.0.0 || ^4.0.0
+      vite: ^3.0.0 || ^4.0.0 || ^5.0.0
     dependencies:
-      '@storybook/builder-vite': 7.1.1(typescript@5.2.2)(vite@4.4.7)
-      '@storybook/core-server': 7.1.1
-      '@storybook/vue3': 7.1.1(@vue/compiler-core@3.3.4)(vue@3.3.4)
-      '@vitejs/plugin-vue': 4.2.3(vite@4.4.7)(vue@3.3.4)
+      '@storybook/builder-vite': 7.5.2(typescript@5.3.2)(vite@5.0.10)
+      '@storybook/core-server': 7.5.2
+      '@storybook/vue3': 7.5.2(@vue/compiler-core@3.3.4)(vue@3.3.4)
+      '@vitejs/plugin-vue': 4.5.2(vite@5.0.10)(vue@3.3.4)
       magic-string: 0.30.1
-      react: 17.0.2
-      react-dom: 18.2.0(react@17.0.2)
-      vite: 4.4.7(less@4.1.3)(sass@1.64.1)
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
+      vite: 5.0.10(sass@1.64.1)
       vue-docgen-api: 4.56.4(vue@3.3.4)
     transitivePeerDependencies:
       - '@preact/preset-vite'
@@ -6807,35 +9841,95 @@ packages:
       - vue
     dev: true
 
-  /@storybook/vue3@7.1.1(@vue/compiler-core@3.3.4)(vue@3.3.4):
-    resolution: {integrity: sha512-Q72N+QQL3a4Ws+vZM79PQZq9TuxbTJgQHH0PhBOEvlAGKdCLUu7CNkLR2OwMYqryePLNTcj0MKJRoE7NUKRswQ==}
+  /@storybook/vue3@7.5.2(@vue/compiler-core@3.3.4)(vue@3.3.4):
+    resolution: {integrity: sha512-k25uwQ33NuQOWEs+0kQUakHzeSu4suCthGv0qCMBoI55mXE7IvMjaPgPDgz/tKVh2qqNa36w1prfqwfWF9uKGw==}
     engines: {node: '>=16.0.0'}
     peerDependencies:
       '@vue/compiler-core': ^3.0.0
       vue: ^3.0.0
     dependencies:
-      '@storybook/core-client': 7.1.1
-      '@storybook/docs-tools': 7.1.1
+      '@storybook/core-client': 7.5.2
+      '@storybook/docs-tools': 7.5.2
       '@storybook/global': 5.0.0
-      '@storybook/preview-api': 7.1.1
-      '@storybook/types': 7.1.1
+      '@storybook/preview-api': 7.5.2
+      '@storybook/types': 7.5.2
       '@vue/compiler-core': 3.3.4
       lodash: 4.17.21
       ts-dedent: 2.2.0
-      type-fest: 3.13.1
+      type-fest: 2.19.0
       vue: 3.3.4
-      vue-component-type-helpers: 1.8.19
+      vue-component-type-helpers: 1.8.27
     transitivePeerDependencies:
       - encoding
       - supports-color
     dev: true
 
+  /@supabase/functions-js@2.1.5:
+    resolution: {integrity: sha512-BNzC5XhCzzCaggJ8s53DP+WeHHGT/NfTsx2wUSSGKR2/ikLFQTBCDzMvGz/PxYMqRko/LwncQtKXGOYp1PkPaw==}
+    dependencies:
+      '@supabase/node-fetch': 2.6.15
+    dev: false
+
+  /@supabase/gotrue-js@2.57.0:
+    resolution: {integrity: sha512-/CcAW40aPKgp9/w9WgXVUQFg1AOdvFR687ONOMjASPBuC6FsNbKlcXp4pc+rwKNtxyxDkBbR+x7zj/8g00r/Og==}
+    dependencies:
+      '@supabase/node-fetch': 2.6.15
+    dev: false
+
+  /@supabase/node-fetch@2.6.15:
+    resolution: {integrity: sha512-1ibVeYUacxWYi9i0cf5efil6adJ9WRyZBLivgjs+AUpewx1F3xPi7gLgaASI2SmIQxPoCEjAsLAzKPgMJVgOUQ==}
+    engines: {node: 4.x || >=6.0.0}
+    dependencies:
+      whatwg-url: 5.0.0
+    dev: false
+
+  /@supabase/postgrest-js@1.9.0:
+    resolution: {integrity: sha512-axP6cU69jDrLbfihJKQ6vU27tklD0gzb9idkMN363MtTXeJVt5DQNT3JnJ58JVNBdL74hgm26rAsFNvHk+tnSw==}
+    dependencies:
+      '@supabase/node-fetch': 2.6.15
+    dev: false
+
+  /@supabase/realtime-js@2.8.4:
+    resolution: {integrity: sha512-5C9slLTGikHnYmAnIBOaPogAgbcNY68vnIyE6GpqIKjHElVb6LIi4clwNcjHSj4z6szuvvzj8T/+ePEgGEGekw==}
+    dependencies:
+      '@supabase/node-fetch': 2.6.15
+      '@types/phoenix': 1.6.4
+      '@types/websocket': 1.0.10
+      websocket: 1.0.34
+    transitivePeerDependencies:
+      - supports-color
+    dev: false
+
+  /@supabase/storage-js@2.5.4:
+    resolution: {integrity: sha512-yspHD19I9uQUgfTh0J94+/r/g6hnhdQmw6Y7OWqr/EbnL6uvicGV1i1UDkkmeUHqfF9Mbt2sLtuxRycYyKv2ew==}
+    dependencies:
+      '@supabase/node-fetch': 2.6.15
+    dev: false
+
+  /@supabase/supabase-js@2.38.5:
+    resolution: {integrity: sha512-QTXld3AfwAJgeOGyOKsCcT7AjC3jJxN02iHy299Fw+qKX0lJ1tVVhMGlga101C1stUCvgzjcypmMSGiZ2oeKsw==}
+    dependencies:
+      '@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: false
+
+  /@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.0:
-    resolution: {integrity: sha512-lNAOoFHaZN+4huo30ukeqVrUmfC+avoEBYQ11QAnAw1PFhnI5oBCg8O/TNiCoEWix7gNGBIEjrQwtPREqKMPog==}
+  /@techteamer/ocsp@1.0.1:
+    resolution: {integrity: sha512-q4pW5wAC6Pc3JI8UePwE37CkLQ5gDGZMgjSX4MEEm4D4Di59auDQ8UNIDzC4gRnPNmmcwjpPxozq8p5pjiOmOw==}
     dependencies:
       asn1.js: 5.4.1
       asn1.js-rfc2560: 5.0.1(asn1.js@5.4.1)
@@ -6848,6 +9942,10 @@ packages:
     resolution: {integrity: sha512-d/keJiNKfpHo+GmSB8QcsAwBx8h+V1UbdozA5TD+eSLXprNY53JAYub47J9evsSKWDdNG5uVj0FiMozLKuzowQ==}
     dev: false
 
+  /@tediousjs/connection-string@0.4.4:
+    resolution: {integrity: sha512-Qssn7gmOILmqD0zkfA09YyFd52UajWYkLTTSi4Dx/XZaUuVcx4W4guv2rAVc5mm8wYRdonmG/HfFH3PS6izXAg==}
+    dev: false
+
   /@testing-library/dom@9.3.1:
     resolution: {integrity: sha512-0DGPd9AR3+iDTjGoMpxIkAsUihHZ3Ai6CneU6bRRrffXMgzCdlNk43jTrD2/5LT6CBb3MWTP8v510JzYtahD2w==}
     engines: {node: '>=14'}
@@ -6862,23 +9960,53 @@ packages:
       pretty-format: 27.5.1
     dev: true
 
-  /@testing-library/jest-dom@5.17.0:
-    resolution: {integrity: sha512-ynmNeT7asXyH3aSVv4vvX4Rb+0qjOhdNHnO/3vuZNqPmhDpV/+rCSGwQ7bLcmU2cJ4dvoheIO85LQj0IbJHEtg==}
-    engines: {node: '>=8', npm: '>=6', yarn: '>=1'}
+  /@testing-library/dom@9.3.3:
+    resolution: {integrity: sha512-fB0R+fa3AUqbLHWyxXa2kGVtf1Fe1ZZFr0Zp6AIbIAzXb2mKbEXl+PCQNUOaq5lbTab5tfctfXRNsWXxa2f7Aw==}
+    engines: {node: '>=14'}
     dependencies:
-      '@adobe/css-tools': 4.0.2
+      '@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
+
+  /@testing-library/jest-dom@6.1.5(@types/jest@29.5.3)(jest@29.6.2)(vitest@1.1.0):
+    resolution: {integrity: sha512-3y04JLW+EceVPy2Em3VwNr95dOKqA8DhR0RJHhHKDZNYXcVXnEK7WIrpj4eYU8SVt/qYZ2aRWt/WgQ+grNES8g==}
+    engines: {node: '>=14', npm: '>=6', yarn: '>=1'}
+    peerDependencies:
+      '@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:
+      '@adobe/css-tools': 4.3.2
       '@babel/runtime': 7.22.6
-      '@types/testing-library__jest-dom': 5.14.5
+      '@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.1.0
     dev: true
 
-  /@testing-library/user-event@14.4.3(@testing-library/dom@9.3.1):
-    resolution: {integrity: sha512-kCUc5MEwaEMakkO5x7aoD+DLi02ehmEM2QCGWvNqAS1dV/fAvORWEjnjsEIvml59M7Y5kCkWN6fCCyPOe8OL6Q==}
+  /@testing-library/user-event@14.5.1(@testing-library/dom@9.3.1):
+    resolution: {integrity: sha512-UCcUKrUYGj7ClomOo2SpNVvx4/fkd/2BbIHDCle8A0ax+P3bU7yJwDBDrS6ZwdTMARWTGODX1hEsCcO+7beJjg==}
     engines: {node: '>=12', npm: '>=6'}
     peerDependencies:
       '@testing-library/dom': '>=7.21.4'
@@ -6886,17 +10014,26 @@ packages:
       '@testing-library/dom': 9.3.1
     dev: true
 
-  /@testing-library/vue@7.0.0(@vue/compiler-sfc@3.3.4)(vue@3.3.4):
-    resolution: {integrity: sha512-JU/q93HGo2qdm1dCgWymkeQlfpC0/0/DBZ2nAHgEAsVZxX11xVIxT7gbXdI7HACQpUbsUWt1zABGU075Fzt9XQ==}
+  /@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:
+      '@testing-library/dom': '>=7.21.4'
+    dependencies:
+      '@testing-library/dom': 9.3.3
+    dev: true
+
+  /@testing-library/vue@8.0.1(@vue/compiler-sfc@3.3.4)(vue@3.3.4):
+    resolution: {integrity: sha512-l51ZEpjTQ6glq3wM+asQ1GbKJMGcxwgHEygETx0aCRN4TjFEGvMZy4YdWKs/y7bu4bmLrxcxhbEPP7iPSW/2OQ==}
     engines: {node: '>=14'}
     peerDependencies:
       '@vue/compiler-sfc': '>= 3'
       vue: '>= 3'
     dependencies:
-      '@babel/runtime': 7.22.6
-      '@testing-library/dom': 9.3.1
+      '@babel/runtime': 7.23.6
+      '@testing-library/dom': 9.3.3
       '@vue/compiler-sfc': 3.3.4
-      '@vue/test-utils': 2.4.1(vue@3.3.4)
+      '@vue/test-utils': 2.4.3(vue@3.3.4)
       vue: 3.3.4
     transitivePeerDependencies:
       - '@vue/server-renderer'
@@ -6916,12 +10053,25 @@ packages:
     resolution: {integrity: sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==}
     engines: {node: '>= 10'}
 
+  /@trysound/sax@0.2.0:
+    resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
+    engines: {node: '>=10.13.0'}
+    dev: true
+
+  /@tsconfig/node18@18.2.2:
+    resolution: {integrity: sha512-d6McJeGsuoRlwWZmVIeE8CUA27lu6jLjvv1JzqmpsytOYYbVi1tHZEnwCNVOXnj4pyLvneZlFlpXUK+X9wBWyw==}
+    dev: true
+
   /@types/amqplib@0.10.1:
     resolution: {integrity: sha512-j6ANKT79ncUDnAs/+9r9eDujxbeJoTjoVu33gHHcaPfmLQaMhvfbH2GqSe8KUM444epAp1Vl3peVOQfZk3UIqA==}
     dependencies:
       '@types/node': 18.16.16
     dev: true
 
+  /@types/argparse@1.0.38:
+    resolution: {integrity: sha512-ebDJ9b0e702Yr7pWgB0jzm+CX4Srzz8RcXtLJDJB+BSccqMa36uyH/zUsSYao5+BD1ytv3k3rPYCq4mAE1hsXA==}
+    dev: true
+
   /@types/aria-query@5.0.1:
     resolution: {integrity: sha512-XTIieEY+gvJ39ChLcB4If5zHtPxt3Syj5rgZR+e1ctpmK8NjPf0zFqsz4JpLJT0xla9GFDKjy8Cpu331nrmE1Q==}
     dev: true
@@ -6990,16 +10140,6 @@ packages:
     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.5
-    dev: true
-
-  /@types/chai@4.3.5:
-    resolution: {integrity: sha512-mEo1sAde+UCE6b2hxn332f1g1E8WfYRu6p5SvTKr2ZKC1f7gFJXk4h5PyGP9Dt6gCaG8y8XhwnXWC6Iy2cmBng==}
-    dev: true
-
   /@types/cheerio@0.22.31:
     resolution: {integrity: sha512-Kt7Cdjjdi2XWSfrZ53v4Of0wG3ZcmaegFXjMmz9tfNrZSkzzo36G0AL1YqSdcIA78Etjt6E609pt5h1xnQkPUw==}
     dependencies:
@@ -7059,10 +10199,6 @@ packages:
       '@types/node': 18.16.16
     dev: true
 
-  /@types/crypto-js@4.1.3:
-    resolution: {integrity: sha512-YP1sYYayLe7Eg5oXyLLvOLfxBfZ5Fgpz6sVWkpB18wDMywCLPWmqzRz+9gyuOoLF0fzDTTFwlyNbx7koONUwqA==}
-    dev: true
-
   /@types/dateformat@3.0.1:
     resolution: {integrity: sha512-KlPPdikagvL6ELjWsljbyDIPzNCeliYkqRpI+zea99vBBbCIA5JNshZAwQKTON139c87y9qvTFVgkFd14rtS4g==}
     dev: true
@@ -7096,15 +10232,15 @@ packages:
   /@types/eslint-scope@3.7.4:
     resolution: {integrity: sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==}
     dependencies:
-      '@types/eslint': 8.44.1
+      '@types/eslint': 8.44.7
       '@types/estree': 1.0.0
     dev: true
 
-  /@types/eslint@8.44.1:
-    resolution: {integrity: sha512-XpNDc4Z5Tb4x+SW1MriMVeIsMoONHCkWFMkR/aPJbzEsxqHy+4Glu/BqTdPrApfDeMaXbtNh6bseNgl5KaWrSg==}
+  /@types/eslint@8.44.7:
+    resolution: {integrity: sha512-f5ORu2hcBbKei97U73mf+l9t4zTGl74IqZ0GQk4oVea/VS8tQZYkUveSYojk+frraAVYId0V2WC9O4PTNru2FQ==}
     dependencies:
       '@types/estree': 1.0.0
-      '@types/json-schema': 7.0.11
+      '@types/json-schema': 7.0.12
     dev: true
 
   /@types/estree@0.0.51:
@@ -7159,7 +10295,6 @@ packages:
     dependencies:
       '@types/minimatch': 5.1.2
       '@types/node': 18.16.16
-    dev: true
 
   /@types/gm@1.25.0:
     resolution: {integrity: sha512-y0nI4vp+0Vtsve+daADIHeSckm11TnWAdC4CBq2BEXTg+CfJiolnsnzsXeIEuIpBCksjN26LUZlvQKJDpthw5g==}
@@ -7173,6 +10308,10 @@ packages:
       '@types/node': 18.16.16
     dev: true
 
+  /@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
@@ -7200,7 +10339,7 @@ packages:
   /@types/ioredis-mock@8.2.2:
     resolution: {integrity: sha512-bnbPHOjxy4TUDjRh61MMoK2QvDNZqrMDXJYrEDZP/HPFvBubR24CQ0DBi5lgWhLxG4lvVsXPRDXtZ03+JgonoQ==}
     dependencies:
-      ioredis: 5.3.2
+      ioredis: 5.2.4
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -7245,17 +10384,21 @@ packages:
     dependencies:
       '@types/node': 18.16.16
       '@types/tough-cookie': 4.0.2
-      parse5: 7.1.1
+      parse5: 7.1.2
+    dev: true
+
+  /@types/jsdom@21.1.6:
+    resolution: {integrity: sha512-/7kkMsC+/kMs7gAYmmBR9P0vGTnOoLhQhyhQJSlXGI5bzTHp6xdo0TtKWQAsz6pmSAeVqKSbqeyP6hytqr9FDw==}
+    dependencies:
+      '@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.11:
-    resolution: {integrity: sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==}
-    dev: true
-
   /@types/json-schema@7.0.12:
     resolution: {integrity: sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==}
 
@@ -7270,11 +10413,6 @@ packages:
 
   /@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
 
   /@types/lodash-es@4.17.6:
     resolution: {integrity: sha512-R+zTeVUKDdfoRxpAryaQNRKk3105Rrgx2CFRClIgRGaqDTdjsm8h6IYA8ir584W3ePzkZfst5xIgDwYrlh9HLg==}
@@ -7284,6 +10422,10 @@ packages:
   /@types/lodash@4.14.195:
     resolution: {integrity: sha512-Hwx9EUgdwf2GLarOjQp5ZH8ZmblzcbTBC2wtQWNKARBSxM9ezRIAUpeDTgoQRAFB0+8CNWXVA9+MaSOzOF3nPg==}
 
+  /@types/long@4.0.2:
+    resolution: {integrity: sha512-MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA==}
+    dev: false
+
   /@types/lossless-json@1.0.1:
     resolution: {integrity: sha512-zPE8kmpeL5/6L5gtTQHSOkAW/OSYYNTDRt6/2oEgLO1Zd3Rj5WVDoMloTtLJxQJhZGLGbL4pktKSh3NbzdaWdw==}
     dev: true
@@ -7315,11 +10457,13 @@ packages:
     dependencies:
       '@types/linkify-it': 3.0.2
       '@types/mdurl': 1.0.2
+
+  /@types/md5@2.3.5:
+    resolution: {integrity: sha512-/i42wjYNgE6wf0j2bcTX6kuowmdL/6PE4IVitMpm2eYKBUuYCprdcWVK+xEF0gcV6ufMCRhtxmReGfc6hIK7Jw==}
     dev: true
 
   /@types/mdurl@1.0.2:
     resolution: {integrity: sha512-eC4U9MlIcu2q0KQmXszyn5Akca/0jrQmwDRgpAMJai7qBWq4amIQhZyNau4VYGtCeALvW1/NtjzJJ567aZxfKA==}
-    dev: true
 
   /@types/mdx@2.0.3:
     resolution: {integrity: sha512-IgHxcT3RC8LzFLhKwP3gbMPeaK7BM9eBH46OdapPA7yvuIUJ8H6zHZV53J8hGZcTSnt95jANt+rTBNUUc22ACQ==}
@@ -7338,7 +10482,6 @@ packages:
 
   /@types/minimatch@5.1.2:
     resolution: {integrity: sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==}
-    dev: true
 
   /@types/mssql@6.0.8:
     resolution: {integrity: sha512-N3dr3o1c6EXhHhhNRaKpLTdAoXT/s6qDEJET5FID2gFCj58vIV9q/7RtkvYdE6ntpkJF5F9hpURhxT/oC62yLw==}
@@ -7409,6 +10552,10 @@ packages:
       '@types/express': 4.17.14
     dev: true
 
+  /@types/phoenix@1.6.4:
+    resolution: {integrity: sha512-B34A7uot1Cv0XtaHRYDATltAdKx0BvVKNgYNqE4WjtPUa4VQJM7kxeXcVKaH+KS+kCmZ+6w+QaUdcljiheiBJA==}
+    dev: false
+
   /@types/pretty-hrtime@1.0.1:
     resolution: {integrity: sha512-VjID5MJb1eGKthz2qUerWT8+R4b9N+CHvGCzg9fn4kWZgaF9AhdYikQio3R7wV8YY1NsQKPaCwKz1Yff+aHNUQ==}
     dev: true
@@ -7473,10 +10620,25 @@ packages:
       form-data: 2.5.1
     dev: true
 
+  /@types/resolve@1.20.2:
+    resolution: {integrity: sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q==}
+    dev: true
+
+  /@types/retry@0.12.0:
+    resolution: {integrity: sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==}
+    dev: false
+
   /@types/rfc2047@2.0.1:
     resolution: {integrity: sha512-slgtykv+XXME7EperkdqfdBBUGcs28ru+a21BK0zOQY4IoxE7tEqvIcvAFAz5DJVxyOmoAUXo30Oxpm3KS+TBQ==}
     dev: true
 
+  /@types/rimraf@3.0.2:
+    resolution: {integrity: sha512-F3OznnSLAUxFrCEu/L5PY8+ny8DtcFRjx7fZZ9bycvXRi3KPTRS9HOitGZwvPg0juRhXFWIeKX58cnX5YqLohQ==}
+    dependencies:
+      '@types/glob': 8.0.0
+      '@types/node': 18.16.16
+    dev: false
+
   /@types/sanitize-html@2.9.0:
     resolution: {integrity: sha512-4fP/kEcKNj2u39IzrxWYuf/FnCCwwQCpif6wwY6ROUS1EPRIfWJjGkY3HIowY1EX/VbX5e86yq8AAE7UPMgATg==}
     dependencies:
@@ -7523,8 +10685,8 @@ packages:
     resolution: {integrity: sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==}
     dev: true
 
-  /@types/snowflake-sdk@1.6.12:
-    resolution: {integrity: sha512-Ndz6x750TkuvHvdRBH8Cb7T8et2anyyY1j8kFChJ+s8FtURNRKut7DWaq9YdseKXZvqwA3ZYZxKaQRwtSq67eg==}
+  /@types/snowflake-sdk@1.6.20:
+    resolution: {integrity: sha512-Dr7oIXrWthlk9wVWpZgpm49BT8cFFXz43u7SkJKyiZK3WHiHQo4b+m2/p3WIpkYzZCcOZZ/t1B09XMd7+u1Wjw==}
     dependencies:
       '@types/node': 18.16.16
       generic-pool: 3.9.0
@@ -7591,10 +10753,10 @@ packages:
       '@types/node': 18.16.16
     dev: true
 
-  /@types/testing-library__jest-dom@5.14.5:
-    resolution: {integrity: sha512-SBwbxYoyPIvxHbeHxTZX2Pe/74F/tX2/D3mMvzabdeJ25bBojfW0TyB8BHrbq/9zaaKICJZjLP+8r6AeZMFCuQ==}
+  /@types/temp@0.9.4:
+    resolution: {integrity: sha512-+VfWIwrlept2VBTj7Y2wQnI/Xfscy1u8Pyj/puYwss6V1IblXn1x7S0S9eFh6KyBolgLCm+rUFzhFAbdkR691g==}
     dependencies:
-      '@types/jest': 29.5.3
+      '@types/node': 18.16.16
     dev: true
 
   /@types/through@0.0.30:
@@ -7628,6 +10790,10 @@ packages:
     resolution: {integrity: sha512-kr90f+ERiQtKWMz5rP32ltJ/BtULDI5RVO0uavn1HQUOwjx0R1h0rnDYNL0CepF1zL5bSY6FISAfd9tOdDhU5Q==}
     dev: false
 
+  /@types/uuid@9.0.7:
+    resolution: {integrity: sha512-WUtIVRUZ9i5dYXefDEAI7sh9/O7jGvHg7Df/5O/gtH3Yabe5odI3UWopVR1qbPXQtvOxWu3mM4XxlYeZtMWF4g==}
+    dev: false
+
   /@types/validator@13.7.10:
     resolution: {integrity: sha512-t1yxFAR2n0+VO6hd/FJ9F2uezAZVWHLmpmlJzm1eX03+H7+HsuTAp7L8QJs+2pQCfWkP1+EXsGK9Z9v7o/qPVQ==}
     dev: false
@@ -7640,8 +10806,8 @@ packages:
     resolution: {integrity: sha512-oh8q2Zc32S6gd/j50GowEjKLoOVOwHP/bWVjKJInBwQqdOYMdPrf1oVlelTlyfFK3CKxL1uahMDAr+vy8T7yMQ==}
     dev: false
 
-  /@types/web-bluetooth@0.0.17:
-    resolution: {integrity: sha512-4p9vcSmxAayx72yn70joFoL44c9MO/0+iVEBIQXe3v2h2SiAsEIo/G5v6ObFWvNKRFjbrVadNf9LqEEZeQPzdA==}
+  /@types/web-bluetooth@0.0.18:
+    resolution: {integrity: sha512-v/ZHEj9xh82usl8LMR3GarzFY1IrbXJw5L4QfQhokjRV91q+SelFqxQWSep1ucXEZ22+dSTwLFkXeur25sPIbw==}
     dev: false
 
   /@types/webidl-conversions@7.0.0:
@@ -7652,6 +10818,12 @@ packages:
     resolution: {integrity: sha512-56/MAlX5WMsPVbOg7tAxnYvNYMMWr/QJiIp6BxVSW3JJXUVzzOn64qW8TzQyMSqSUFM2+PVI4aUHcHOzIz/1tg==}
     dev: true
 
+  /@types/websocket@1.0.10:
+    resolution: {integrity: sha512-svjGZvPB7EzuYS94cI7a+qhwgGU1y89wUgjT6E2wVUfmAGIvRfT7obBvRtnhXCSsoMdlG4gBFGE7MfkIXZLoww==}
+    dependencies:
+      '@types/node': 18.16.16
+    dev: false
+
   /@types/whatwg-url@8.2.2:
     resolution: {integrity: sha512-FtQu10RWgn3D9U4aazdwIE2yzphmTJREDqNdODHrbrZmmMqI0vMheC/6NE/J1Yveaj8H+ela+YwWTjq5PGmuhA==}
     dependencies:
@@ -7680,6 +10852,12 @@ packages:
     resolution: {integrity: sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==}
     dev: true
 
+  /@types/yargs@16.0.9:
+    resolution: {integrity: sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==}
+    dependencies:
+      '@types/yargs-parser': 21.0.0
+    dev: true
+
   /@types/yargs@17.0.19:
     resolution: {integrity: sha512-cAx3qamwaYX9R0fzOIZAlFpo4A+1uBVCxqpKz9D26uTF4srRXaGTTsikQmaotCtNdbhzyUH7ft6p9ktz9s6UNQ==}
     dependencies:
@@ -7693,36 +10871,8 @@ packages:
     dev: true
     optional: true
 
-  /@typescript-eslint/eslint-plugin@5.59.5(@typescript-eslint/parser@5.59.5)(eslint@8.45.0)(typescript@5.2.2):
-    resolution: {integrity: sha512-feA9xbVRWJZor+AnLNAr7A8JRWeZqHUf4T9tlP+TN04b05pFVhO5eN7/O93Y/1OUlLMHKbnJisgDURs/qvtqdg==}
-    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
-    dependencies:
-      '@eslint-community/regexpp': 4.6.2
-      '@typescript-eslint/parser': 5.59.5(eslint@8.45.0)(typescript@5.2.2)
-      '@typescript-eslint/scope-manager': 5.59.5
-      '@typescript-eslint/type-utils': 5.59.5(eslint@8.45.0)(typescript@5.2.2)
-      '@typescript-eslint/utils': 5.59.5(eslint@8.45.0)(typescript@5.2.2)
-      debug: 4.3.4(supports-color@8.1.1)
-      eslint: 8.45.0
-      grapheme-splitter: 1.0.4
-      ignore: 5.2.4
-      natural-compare-lite: 1.4.0
-      semver: 7.5.4
-      tsutils: 3.21.0(typescript@5.2.2)
-      typescript: 5.2.2
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@typescript-eslint/eslint-plugin@6.2.0(@typescript-eslint/parser@6.2.0)(eslint@8.45.0)(typescript@5.2.2):
-    resolution: {integrity: sha512-rClGrMuyS/3j0ETa1Ui7s6GkLhfZGKZL3ZrChLeAiACBE/tRc1wq8SNZESUuluxhLj9FkUefRs2l6bCIArWBiQ==}
+  /@typescript-eslint/eslint-plugin@6.12.0(@typescript-eslint/parser@6.12.0)(eslint@8.54.0)(typescript@5.3.2):
+    resolution: {integrity: sha512-XOpZ3IyJUIV1b15M7HVOpgQxPPF7lGXgsfcEIu3yDxFPaf/xZKt7s9QO/pbk7vpWQyVulpJbu4E5LwpZiQo4kA==}
     engines: {node: ^16.0.0 || >=18.0.0}
     peerDependencies:
       '@typescript-eslint/parser': ^6.0.0 || ^6.0.0-alpha
@@ -7733,46 +10883,25 @@ packages:
         optional: true
     dependencies:
       '@eslint-community/regexpp': 4.6.2
-      '@typescript-eslint/parser': 6.2.0(eslint@8.45.0)(typescript@5.2.2)
-      '@typescript-eslint/scope-manager': 6.2.0
-      '@typescript-eslint/type-utils': 6.2.0(eslint@8.45.0)(typescript@5.2.2)
-      '@typescript-eslint/utils': 6.2.0(eslint@8.45.0)(typescript@5.2.2)
-      '@typescript-eslint/visitor-keys': 6.2.0
+      '@typescript-eslint/parser': 6.12.0(eslint@8.54.0)(typescript@5.3.2)
+      '@typescript-eslint/scope-manager': 6.12.0
+      '@typescript-eslint/type-utils': 6.12.0(eslint@8.54.0)(typescript@5.3.2)
+      '@typescript-eslint/utils': 6.12.0(eslint@8.54.0)(typescript@5.3.2)
+      '@typescript-eslint/visitor-keys': 6.12.0
       debug: 4.3.4(supports-color@8.1.1)
-      eslint: 8.45.0
+      eslint: 8.54.0
       graphemer: 1.4.0
       ignore: 5.2.4
       natural-compare: 1.4.0
-      natural-compare-lite: 1.4.0
       semver: 7.5.4
-      ts-api-utils: 1.0.1(typescript@5.2.2)
-      typescript: 5.2.2
+      ts-api-utils: 1.0.1(typescript@5.3.2)
+      typescript: 5.3.2
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@typescript-eslint/parser@5.59.5(eslint@8.45.0)(typescript@5.2.2):
-    resolution: {integrity: sha512-NJXQC4MRnF9N9yWqQE2/KLRSOLvrrlZb48NGVfBa+RuPMN6B7ZcK5jZOvhuygv4D64fRKnZI4L4p8+M+rfeQuw==}
-    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
-    dependencies:
-      '@typescript-eslint/scope-manager': 5.59.5
-      '@typescript-eslint/types': 5.59.5
-      '@typescript-eslint/typescript-estree': 5.59.5(typescript@5.2.2)
-      debug: 4.3.4(supports-color@8.1.1)
-      eslint: 8.45.0
-      typescript: 5.2.2
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@typescript-eslint/parser@6.2.0(eslint@8.45.0)(typescript@5.2.2):
-    resolution: {integrity: sha512-igVYOqtiK/UsvKAmmloQAruAdUHihsOCvplJpplPZ+3h4aDkC/UKZZNKgB6h93ayuYLuEymU3h8nF1xMRbh37g==}
+  /@typescript-eslint/parser@6.12.0(eslint@8.54.0)(typescript@5.3.2):
+    resolution: {integrity: sha512-s8/jNFPKPNRmXEnNXfuo1gemBdVmpQsK1pcu+QIvuNJuhFzGrpD7WjOcvDc/+uEdfzSYpNu7U/+MmbScjoQ6vg==}
     engines: {node: ^16.0.0 || >=18.0.0}
     peerDependencies:
       eslint: ^7.0.0 || ^8.0.0
@@ -7781,63 +10910,35 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/scope-manager': 6.2.0
-      '@typescript-eslint/types': 6.2.0
-      '@typescript-eslint/typescript-estree': 6.2.0(typescript@5.2.2)
-      '@typescript-eslint/visitor-keys': 6.2.0
+      '@typescript-eslint/scope-manager': 6.12.0
+      '@typescript-eslint/types': 6.12.0
+      '@typescript-eslint/typescript-estree': 6.12.0(typescript@5.3.2)
+      '@typescript-eslint/visitor-keys': 6.12.0
       debug: 4.3.4(supports-color@8.1.1)
-      eslint: 8.45.0
-      typescript: 5.2.2
+      eslint: 8.54.0
+      typescript: 5.3.2
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@typescript-eslint/scope-manager@5.59.5:
-    resolution: {integrity: sha512-jVecWwnkX6ZgutF+DovbBJirZcAxgxC0EOHYt/niMROf8p4PwxxG32Qdhj/iIQQIuOflLjNkxoXyArkcIP7C3A==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    dependencies:
-      '@typescript-eslint/types': 5.59.5
-      '@typescript-eslint/visitor-keys': 5.59.5
-    dev: true
-
-  /@typescript-eslint/scope-manager@6.2.0:
-    resolution: {integrity: sha512-1ZMNVgm5nnHURU8ZSJ3snsHzpFeNK84rdZjluEVBGNu7jDymfqceB3kdIZ6A4xCfEFFhRIB6rF8q/JIqJd2R0Q==}
+  /@typescript-eslint/scope-manager@6.12.0:
+    resolution: {integrity: sha512-5gUvjg+XdSj8pcetdL9eXJzQNTl3RD7LgUiYTl8Aabdi8hFkaGSYnaS6BLc0BGNaDH+tVzVwmKtWvu0jLgWVbw==}
     engines: {node: ^16.0.0 || >=18.0.0}
     dependencies:
-      '@typescript-eslint/types': 6.2.0
-      '@typescript-eslint/visitor-keys': 6.2.0
+      '@typescript-eslint/types': 6.12.0
+      '@typescript-eslint/visitor-keys': 6.12.0
     dev: true
 
-  /@typescript-eslint/scope-manager@6.3.0:
-    resolution: {integrity: sha512-WlNFgBEuGu74ahrXzgefiz/QlVb+qg8KDTpknKwR7hMH+lQygWyx0CQFoUmMn1zDkQjTBBIn75IxtWss77iBIQ==}
+  /@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.3.0
-      '@typescript-eslint/visitor-keys': 6.3.0
+      '@typescript-eslint/types': 6.7.5
+      '@typescript-eslint/visitor-keys': 6.7.5
     dev: true
 
-  /@typescript-eslint/type-utils@5.59.5(eslint@8.45.0)(typescript@5.2.2):
-    resolution: {integrity: sha512-4eyhS7oGym67/pSxA2mmNq7X164oqDYNnZCUayBwJZIRVvKpBCMBzFnFxjeoDeShjtO6RQBHBuwybuX3POnDqg==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    peerDependencies:
-      eslint: '*'
-      typescript: '*'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
-    dependencies:
-      '@typescript-eslint/typescript-estree': 5.59.5(typescript@5.2.2)
-      '@typescript-eslint/utils': 5.59.5(eslint@8.45.0)(typescript@5.2.2)
-      debug: 4.3.4(supports-color@8.1.1)
-      eslint: 8.45.0
-      tsutils: 3.21.0(typescript@5.2.2)
-      typescript: 5.2.2
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@typescript-eslint/type-utils@6.2.0(eslint@8.45.0)(typescript@5.2.2):
-    resolution: {integrity: sha512-DnGZuNU2JN3AYwddYIqrVkYW0uUQdv0AY+kz2M25euVNlujcN2u+rJgfJsBFlUEzBB6OQkUqSZPyuTLf2bP5mw==}
+  /@typescript-eslint/type-utils@6.12.0(eslint@8.54.0)(typescript@5.3.2):
+    resolution: {integrity: sha512-WWmRXxhm1X8Wlquj+MhsAG4dU/Blvf1xDgGaYCzfvStP2NwPQh6KBvCDbiOEvaE0filhranjIlK/2fSTVwtBng==}
     engines: {node: ^16.0.0 || >=18.0.0}
     peerDependencies:
       eslint: ^7.0.0 || ^8.0.0
@@ -7846,54 +10947,28 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/typescript-estree': 6.2.0(typescript@5.2.2)
-      '@typescript-eslint/utils': 6.2.0(eslint@8.45.0)(typescript@5.2.2)
+      '@typescript-eslint/typescript-estree': 6.12.0(typescript@5.3.2)
+      '@typescript-eslint/utils': 6.12.0(eslint@8.54.0)(typescript@5.3.2)
       debug: 4.3.4(supports-color@8.1.1)
-      eslint: 8.45.0
-      ts-api-utils: 1.0.1(typescript@5.2.2)
-      typescript: 5.2.2
+      eslint: 8.54.0
+      ts-api-utils: 1.0.1(typescript@5.3.2)
+      typescript: 5.3.2
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@typescript-eslint/types@5.59.5:
-    resolution: {integrity: sha512-xkfRPHbqSH4Ggx4eHRIO/eGL8XL4Ysb4woL8c87YuAo8Md7AUjyWKa9YMwTL519SyDPrfEgKdewjkxNCVeJW7w==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    dev: true
-
-  /@typescript-eslint/types@6.2.0:
-    resolution: {integrity: sha512-1nRRaDlp/XYJQLvkQJG5F3uBTno5SHPT7XVcJ5n1/k2WfNI28nJsvLakxwZRNY5spuatEKO7d5nZWsQpkqXwBA==}
+  /@typescript-eslint/types@6.12.0:
+    resolution: {integrity: sha512-MA16p/+WxM5JG/F3RTpRIcuOghWO30//VEOvzubM8zuOOBYXsP+IfjoCXXiIfy2Ta8FRh9+IO9QLlaFQUU+10Q==}
     engines: {node: ^16.0.0 || >=18.0.0}
     dev: true
 
-  /@typescript-eslint/types@6.3.0:
-    resolution: {integrity: sha512-K6TZOvfVyc7MO9j60MkRNWyFSf86IbOatTKGrpTQnzarDZPYPVy0oe3myTMq7VjhfsUAbNUW8I5s+2lZvtx1gg==}
+  /@typescript-eslint/types@6.7.5:
+    resolution: {integrity: sha512-WboQBlOXtdj1tDFPyIthpKrUb+kZf2VroLZhxKa/VlwLlLyqv/PwUNgL30BlTVZV1Wu4Asu2mMYPqarSO4L5ZQ==}
     engines: {node: ^16.0.0 || >=18.0.0}
     dev: true
 
-  /@typescript-eslint/typescript-estree@5.59.5(typescript@5.2.2):
-    resolution: {integrity: sha512-+XXdLN2CZLZcD/mO7mQtJMvCkzRfmODbeSKuMY/yXbGkzvA9rJyDY5qDYNoiz2kP/dmyAxXquL2BvLQLJFPQIg==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    peerDependencies:
-      typescript: '*'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
-    dependencies:
-      '@typescript-eslint/types': 5.59.5
-      '@typescript-eslint/visitor-keys': 5.59.5
-      debug: 4.3.4(supports-color@8.1.1)
-      globby: 11.1.0
-      is-glob: 4.0.3
-      semver: 7.5.4
-      tsutils: 3.21.0(typescript@5.2.2)
-      typescript: 5.2.2
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@typescript-eslint/typescript-estree@6.2.0(typescript@5.2.2):
-    resolution: {integrity: sha512-Mts6+3HQMSM+LZCglsc2yMIny37IhUgp1Qe8yJUYVyO6rHP7/vN0vajKu3JvHCBIy8TSiKddJ/Zwu80jhnGj1w==}
+  /@typescript-eslint/typescript-estree@6.12.0(typescript@5.3.2):
+    resolution: {integrity: sha512-vw9E2P9+3UUWzhgjyyVczLWxZ3GuQNT7QpnIY3o5OMeLO/c8oHljGc8ZpryBMIyympiAAaKgw9e5Hl9dCWFOYw==}
     engines: {node: ^16.0.0 || >=18.0.0}
     peerDependencies:
       typescript: '*'
@@ -7901,20 +10976,20 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/types': 6.2.0
-      '@typescript-eslint/visitor-keys': 6.2.0
+      '@typescript-eslint/types': 6.12.0
+      '@typescript-eslint/visitor-keys': 6.12.0
       debug: 4.3.4(supports-color@8.1.1)
       globby: 11.1.0
       is-glob: 4.0.3
       semver: 7.5.4
-      ts-api-utils: 1.0.1(typescript@5.2.2)
-      typescript: 5.2.2
+      ts-api-utils: 1.0.1(typescript@5.3.2)
+      typescript: 5.3.2
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@typescript-eslint/typescript-estree@6.3.0(typescript@5.2.2):
-    resolution: {integrity: sha512-Xh4NVDaC4eYKY4O3QGPuQNp5NxBAlEvNQYOqJquR2MePNxO11E5K3t5x4M4Mx53IZvtpW+mBxIT0s274fLUocg==}
+  /@typescript-eslint/typescript-estree@6.7.5(typescript@5.3.2):
+    resolution: {integrity: sha512-NhJiJ4KdtwBIxrKl0BqG1Ur+uw7FiOnOThcYx9DpOGJ/Abc9z2xNzLeirCG02Ig3vkvrc2qFLmYSSsaITbKjlg==}
     engines: {node: ^16.0.0 || >=18.0.0}
     peerDependencies:
       typescript: '*'
@@ -7922,186 +10997,177 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/types': 6.3.0
-      '@typescript-eslint/visitor-keys': 6.3.0
+      '@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.5.4
-      ts-api-utils: 1.0.1(typescript@5.2.2)
-      typescript: 5.2.2
+      ts-api-utils: 1.0.1(typescript@5.3.2)
+      typescript: 5.3.2
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@typescript-eslint/utils@5.59.5(eslint@8.45.0)(typescript@5.2.2):
-    resolution: {integrity: sha512-sCEHOiw+RbyTii9c3/qN74hYDPNORb8yWCoPLmB7BIflhplJ65u2PBpdRla12e3SSTJ2erRkPjz7ngLHhUegxA==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+  /@typescript-eslint/utils@6.12.0(eslint@8.54.0)(typescript@5.3.2):
+    resolution: {integrity: sha512-LywPm8h3tGEbgfyjYnu3dauZ0U7R60m+miXgKcZS8c7QALO9uWJdvNoP+duKTk2XMWc7/Q3d/QiCuLN9X6SWyQ==}
+    engines: {node: ^16.0.0 || >=18.0.0}
     peerDependencies:
-      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
+      eslint: ^7.0.0 || ^8.0.0
     dependencies:
-      '@eslint-community/eslint-utils': 4.4.0(eslint@8.45.0)
+      '@eslint-community/eslint-utils': 4.4.0(eslint@8.54.0)
       '@types/json-schema': 7.0.12
       '@types/semver': 7.5.0
-      '@typescript-eslint/scope-manager': 5.59.5
-      '@typescript-eslint/types': 5.59.5
-      '@typescript-eslint/typescript-estree': 5.59.5(typescript@5.2.2)
-      eslint: 8.45.0
-      eslint-scope: 5.1.1
+      '@typescript-eslint/scope-manager': 6.12.0
+      '@typescript-eslint/types': 6.12.0
+      '@typescript-eslint/typescript-estree': 6.12.0(typescript@5.3.2)
+      eslint: 8.54.0
       semver: 7.5.4
     transitivePeerDependencies:
       - supports-color
       - typescript
     dev: true
 
-  /@typescript-eslint/utils@6.2.0(eslint@8.45.0)(typescript@5.2.2):
-    resolution: {integrity: sha512-RCFrC1lXiX1qEZN8LmLrxYRhOkElEsPKTVSNout8DMzf8PeWoQG7Rxz2SadpJa3VSh5oYKGwt7j7X/VRg+Y3OQ==}
+  /@typescript-eslint/utils@6.7.5(eslint@8.54.0)(typescript@5.3.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.45.0)
+      '@eslint-community/eslint-utils': 4.4.0(eslint@8.54.0)
       '@types/json-schema': 7.0.12
       '@types/semver': 7.5.0
-      '@typescript-eslint/scope-manager': 6.2.0
-      '@typescript-eslint/types': 6.2.0
-      '@typescript-eslint/typescript-estree': 6.2.0(typescript@5.2.2)
-      eslint: 8.45.0
+      '@typescript-eslint/scope-manager': 6.7.5
+      '@typescript-eslint/types': 6.7.5
+      '@typescript-eslint/typescript-estree': 6.7.5(typescript@5.3.2)
+      eslint: 8.54.0
       semver: 7.5.4
     transitivePeerDependencies:
       - supports-color
       - typescript
     dev: true
 
-  /@typescript-eslint/utils@6.3.0(eslint@8.45.0)(typescript@5.2.2):
-    resolution: {integrity: sha512-hLLg3BZE07XHnpzglNBG8P/IXq/ZVXraEbgY7FM0Cnc1ehM8RMdn9mat3LubJ3KBeYXXPxV1nugWbQPjGeJk6Q==}
-    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.45.0)
-      '@types/json-schema': 7.0.12
-      '@types/semver': 7.5.0
-      '@typescript-eslint/scope-manager': 6.3.0
-      '@typescript-eslint/types': 6.3.0
-      '@typescript-eslint/typescript-estree': 6.3.0(typescript@5.2.2)
-      eslint: 8.45.0
-      semver: 7.5.4
-    transitivePeerDependencies:
-      - supports-color
-      - typescript
-    dev: true
-
-  /@typescript-eslint/visitor-keys@5.59.5:
-    resolution: {integrity: sha512-qL+Oz+dbeBRTeyJTIy0eniD3uvqU7x+y1QceBismZ41hd4aBSRh8UAw4pZP0+XzLuPZmx4raNMq/I+59W2lXKA==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    dependencies:
-      '@typescript-eslint/types': 5.59.5
-      eslint-visitor-keys: 3.4.1
-    dev: true
-
-  /@typescript-eslint/visitor-keys@6.2.0:
-    resolution: {integrity: sha512-QbaYUQVKKo9bgCzpjz45llCfwakyoxHetIy8CAvYCtd16Zu1KrpzNHofwF8kGkpPOxZB2o6kz+0nqH8ZkIzuoQ==}
+  /@typescript-eslint/visitor-keys@6.12.0:
+    resolution: {integrity: sha512-rg3BizTZHF1k3ipn8gfrzDXXSFKyOEB5zxYXInQ6z0hUvmQlhaZQzK+YmHmNViMA9HzW5Q9+bPPt90bU6GQwyw==}
     engines: {node: ^16.0.0 || >=18.0.0}
     dependencies:
-      '@typescript-eslint/types': 6.2.0
-      eslint-visitor-keys: 3.4.1
+      '@typescript-eslint/types': 6.12.0
+      eslint-visitor-keys: 3.4.3
     dev: true
 
-  /@typescript-eslint/visitor-keys@6.3.0:
-    resolution: {integrity: sha512-kEhRRj7HnvaSjux1J9+7dBen15CdWmDnwrpyiHsFX6Qx2iW5LOBUgNefOFeh2PjWPlNwN8TOn6+4eBU3J/gupw==}
+  /@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.3.0
-      eslint-visitor-keys: 3.4.1
+      '@typescript-eslint/types': 6.7.5
+      eslint-visitor-keys: 3.4.3
     dev: true
 
-  /@vitejs/plugin-vue@4.2.3(vite@4.4.7)(vue@3.3.4):
-    resolution: {integrity: sha512-R6JDUfiZbJA9cMiguQ7jxALsgiprjBeHL5ikpXfJCH62pPHtI+JdJ5xWj6Ev73yXSlYl86+blXn1kZHQ7uElxw==}
+  /@ungap/structured-clone@1.2.0:
+    resolution: {integrity: sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==}
+    dev: true
+
+  /@vitejs/plugin-vue@4.5.2(vite@5.0.10)(vue@3.3.4):
+    resolution: {integrity: sha512-UGR3DlzLi/SaVBPX0cnSyE37vqxU3O6chn8l0HJNzQzDia6/Au2A4xKv+iIJW8w2daf80G7TYHhi1pAUjdZ0bQ==}
     engines: {node: ^14.18.0 || >=16.0.0}
     peerDependencies:
-      vite: ^4.0.0
+      vite: ^4.0.0 || ^5.0.0
       vue: ^3.2.25
     dependencies:
-      vite: 4.4.7(less@4.1.3)(sass@1.64.1)
+      vite: 5.0.10(sass@1.64.1)
       vue: 3.3.4
     dev: true
 
-  /@vitest/coverage-v8@0.33.0(vitest@0.33.0):
-    resolution: {integrity: sha512-Rj5IzoLF7FLj6yR7TmqsfRDSeaFki6NAJ/cQexqhbWkHEV2htlVGrmuOde3xzvFsCbLCagf4omhcIaVmfU8Okg==}
+  /@vitest/coverage-v8@1.1.0(vitest@1.1.0):
+    resolution: {integrity: sha512-kHQRk70vTdXAyQY2C0vKOHPyQD/R6IUzcGdO4vCuyr4alE5Yg1+Sk2jSdjlIrTTXdcNEs+ReWVM09mmSFJpzyQ==}
     peerDependencies:
-      vitest: '>=0.32.0 <1'
+      vitest: ^1.0.0
     dependencies:
       '@ampproject/remapping': 2.2.1
       '@bcoe/v8-coverage': 0.2.3
-      istanbul-lib-coverage: 3.2.0
-      istanbul-lib-report: 3.0.0
+      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.5
-      magic-string: 0.30.1
+      istanbul-reports: 3.1.6
+      magic-string: 0.30.5
+      magicast: 0.3.2
       picocolors: 1.0.0
-      std-env: 3.3.3
+      std-env: 3.6.0
       test-exclude: 6.0.0
-      v8-to-istanbul: 9.1.0
-      vitest: 0.33.0
+      v8-to-istanbul: 9.2.0
+      vitest: 1.1.0
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@vitest/expect@0.33.0:
-    resolution: {integrity: sha512-sVNf+Gla3mhTCxNJx+wJLDPp/WcstOe0Ksqz4Vec51MmgMth/ia0MGFEkIZmVGeTL5HtjYR4Wl/ZxBxBXZJTzQ==}
+  /@vitest/expect@1.1.0:
+    resolution: {integrity: sha512-9IE2WWkcJo2BR9eqtY5MIo3TPmS50Pnwpm66A6neb2hvk/QSLfPXBz2qdiwUOQkwyFuuXEUj5380CbwfzW4+/w==}
     dependencies:
-      '@vitest/spy': 0.33.0
-      '@vitest/utils': 0.33.0
-      chai: 4.3.7
+      '@vitest/spy': 1.1.0
+      '@vitest/utils': 1.1.0
+      chai: 4.3.10
     dev: true
 
-  /@vitest/runner@0.33.0:
-    resolution: {integrity: sha512-UPfACnmCB6HKRHTlcgCoBh6ppl6fDn+J/xR8dTufWiKt/74Y9bHci5CKB8tESSV82zKYtkBJo9whU3mNvfaisg==}
+  /@vitest/runner@1.1.0:
+    resolution: {integrity: sha512-zdNLJ00pm5z/uhbWF6aeIJCGMSyTyWImy3Fcp9piRGvueERFlQFbUwCpzVce79OLm2UHk9iwaMSOaU9jVHgNVw==}
     dependencies:
-      '@vitest/utils': 0.33.0
-      p-limit: 4.0.0
+      '@vitest/utils': 1.1.0
+      p-limit: 5.0.0
       pathe: 1.1.1
     dev: true
 
-  /@vitest/snapshot@0.33.0:
-    resolution: {integrity: sha512-tJjrl//qAHbyHajpFvr8Wsk8DIOODEebTu7pgBrP07iOepR5jYkLFiqLq2Ltxv+r0uptUb4izv1J8XBOwKkVYA==}
+  /@vitest/snapshot@1.1.0:
+    resolution: {integrity: sha512-5O/wyZg09V5qmNmAlUgCBqflvn2ylgsWJRRuPrnHEfDNT6tQpQ8O1isNGgo+VxofISHqz961SG3iVvt3SPK/QQ==}
     dependencies:
-      magic-string: 0.30.1
+      magic-string: 0.30.5
       pathe: 1.1.1
-      pretty-format: 29.6.2
+      pretty-format: 29.7.0
     dev: true
 
-  /@vitest/spy@0.33.0:
-    resolution: {integrity: sha512-Kv+yZ4hnH1WdiAkPUQTpRxW8kGtH8VRTnus7ZTGovFYM1ZezJpvGtb9nPIjPnptHbsyIAxYZsEpVPYgtpjGnrg==}
+  /@vitest/spy@1.1.0:
+    resolution: {integrity: sha512-sNOVSU/GE+7+P76qYo+VXdXhXffzWZcYIPQfmkiRxaNCSPiLANvQx5Mx6ZURJ/ndtEkUJEpvKLXqAYTKEY+lTg==}
     dependencies:
-      tinyspy: 2.1.1
+      tinyspy: 2.2.0
     dev: true
 
-  /@vitest/utils@0.33.0:
-    resolution: {integrity: sha512-pF1w22ic965sv+EN6uoePkAOTkAPWM03Ri/jXNyMIKBb/XHLDPfhLvf/Fa9g0YECevAIz56oVYXhodLvLQ/awA==}
+  /@vitest/utils@1.1.0:
+    resolution: {integrity: sha512-z+s510fKmYz4Y41XhNs3vcuFTFhcij2YF7F8VQfMEYAAUfqQh0Zfg7+w9xdgFGhPf3tX3TicAe+8BDITk6ampQ==}
     dependencies:
-      diff-sequences: 29.4.3
-      loupe: 2.3.6
-      pretty-format: 29.6.2
+      diff-sequences: 29.6.3
+      loupe: 2.3.7
+      pretty-format: 29.7.0
     dev: true
 
-  /@volar/language-core@1.10.0:
-    resolution: {integrity: sha512-ddyWwSYqcbEZNFHm+Z3NZd6M7Ihjcwl/9B5cZd8kECdimVXUFdFi60XHWD27nrWtUQIsUYIG7Ca1WBwV2u2LSQ==}
+  /@volar/language-core@1.10.10:
+    resolution: {integrity: sha512-nsV1o3AZ5n5jaEAObrS3MWLBWaGwUj/vAsc15FVNIv+DbpizQRISg9wzygsHBr56ELRH8r4K75vkYNMtsSNNWw==}
     dependencies:
-      '@volar/source-map': 1.10.0
+      '@volar/source-map': 1.10.10
     dev: true
 
-  /@volar/source-map@1.10.0:
-    resolution: {integrity: sha512-/ibWdcOzDGiq/GM1JU2eX8fH1bvAhl66hfe8yEgLEzg9txgr6qb5sQ/DEz5PcDL75tF5H5sCRRwn8Eu8ezi9mw==}
+  /@volar/language-core@1.11.1:
+    resolution: {integrity: sha512-dOcNn3i9GgZAcJt43wuaEykSluAuOkQgzni1cuxLxTV0nJKanQztp7FxyswdRILaKH+P2XZMPRp2S4MV/pElCw==}
+    dependencies:
+      '@volar/source-map': 1.11.1
+    dev: true
+
+  /@volar/source-map@1.10.10:
+    resolution: {integrity: sha512-GVKjLnifV4voJ9F0vhP56p4+F3WGf+gXlRtjFZsv6v3WxBTWU3ZVeaRaEHJmWrcv5LXmoYYpk/SC25BKemPRkg==}
     dependencies:
       muggle-string: 0.3.1
     dev: true
 
-  /@volar/typescript@1.10.0:
-    resolution: {integrity: sha512-OtqGtFbUKYC0pLNIk3mHQp5xWnvL1CJIUc9VE39VdZ/oqpoBh5jKfb9uJ45Y4/oP/WYTrif/Uxl1k8VTPz66Gg==}
+  /@volar/source-map@1.11.1:
+    resolution: {integrity: sha512-hJnOnwZ4+WT5iupLRnuzbULZ42L7BWWPMmruzwtLhJfpDVoZLjNBxHDi2sY2bgZXCKlpU5XcsMFoYrsQmPhfZg==}
     dependencies:
-      '@volar/language-core': 1.10.0
+      muggle-string: 0.3.1
+    dev: true
+
+  /@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
 
   /@vue/compiler-core@3.3.4:
@@ -8145,43 +11211,77 @@ packages:
   /@vue/devtools-api@6.5.0:
     resolution: {integrity: sha512-o9KfBeaBmCKl10usN4crU53fYtC1r7jJwdGKjPT24t348rHxgfpZ0xL3Xm/gLUYnc0oTp8LAmrxOeLyu6tbk2Q==}
 
-  /@vue/eslint-config-typescript@11.0.3(eslint-plugin-vue@9.15.1)(eslint@8.45.0)(typescript@5.2.2):
-    resolution: {integrity: sha512-dkt6W0PX6H/4Xuxg/BlFj5xHvksjpSlVjtkQCpaYJBIEuKj2hOVU7r+TIe+ysCwRYFz/lGqvklntRkCAibsbPw==}
+  /@vue/eslint-config-prettier@8.0.0(@types/eslint@8.44.7)(eslint@8.54.0)(prettier@3.1.0):
+    resolution: {integrity: sha512-55dPqtC4PM/yBjhAr+yEw6+7KzzdkBuLmnhBrDfp4I48+wy+Giqqj9yUr5T2uD/BkBROjjmqnLZmXRdOx/VtQg==}
+    peerDependencies:
+      eslint: '>= 8.0.0'
+      prettier: ^3.1.0
+    dependencies:
+      eslint: 8.54.0
+      eslint-config-prettier: 8.10.0(eslint@8.54.0)
+      eslint-plugin-prettier: 5.0.1(@types/eslint@8.44.7)(eslint-config-prettier@8.10.0)(eslint@8.54.0)(prettier@3.1.0)
+      prettier: 3.1.0
+    transitivePeerDependencies:
+      - '@types/eslint'
+    dev: true
+
+  /@vue/eslint-config-typescript@12.0.0(eslint-plugin-vue@9.18.1)(eslint@8.54.0)(typescript@5.3.2):
+    resolution: {integrity: sha512-StxLFet2Qe97T8+7L8pGlhYBBr8Eg05LPuTDVopQV6il+SK6qqom59BA/rcFipUef2jD8P2X44Vd8tMFytfvlg==}
     engines: {node: ^14.17.0 || >=16.0.0}
     peerDependencies:
       eslint: ^6.2.0 || ^7.0.0 || ^8.0.0
       eslint-plugin-vue: ^9.0.0
-      typescript: ^5.2.2
+      typescript: ^5.3.0
     peerDependenciesMeta:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/eslint-plugin': 5.59.5(@typescript-eslint/parser@5.59.5)(eslint@8.45.0)(typescript@5.2.2)
-      '@typescript-eslint/parser': 5.59.5(eslint@8.45.0)(typescript@5.2.2)
-      eslint: 8.45.0
-      eslint-plugin-vue: 9.15.1(eslint@8.45.0)
-      typescript: 5.2.2
-      vue-eslint-parser: 9.3.1(eslint@8.45.0)
+      '@typescript-eslint/eslint-plugin': 6.12.0(@typescript-eslint/parser@6.12.0)(eslint@8.54.0)(typescript@5.3.2)
+      '@typescript-eslint/parser': 6.12.0(eslint@8.54.0)(typescript@5.3.2)
+      eslint: 8.54.0
+      eslint-plugin-vue: 9.18.1(eslint@8.54.0)
+      typescript: 5.3.2
+      vue-eslint-parser: 9.3.2(eslint@8.54.0)
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@vue/language-core@1.8.8(typescript@5.2.2):
-    resolution: {integrity: sha512-i4KMTuPazf48yMdYoebTkgSOJdFraE4pQf0B+FTOFkbB+6hAfjrSou/UmYWRsWyZV6r4Rc6DDZdI39CJwL0rWw==}
+  /@vue/language-core@1.8.22(typescript@5.3.2):
+    resolution: {integrity: sha512-bsMoJzCrXZqGsxawtUea1cLjUT9dZnDsy5TuZ+l1fxRMzUGQUG9+Ypq4w//CqpWmrx7nIAJpw2JVF/t258miRw==}
     peerDependencies:
-      typescript: ^5.2.2
+      typescript: ^5.3.0
     peerDependenciesMeta:
       typescript:
         optional: true
     dependencies:
-      '@volar/language-core': 1.10.0
-      '@volar/source-map': 1.10.0
+      '@volar/language-core': 1.10.10
+      '@volar/source-map': 1.10.10
       '@vue/compiler-dom': 3.3.4
-      '@vue/reactivity': 3.3.4
       '@vue/shared': 3.3.4
-      minimatch: 9.0.1
+      computeds: 0.0.1
+      minimatch: 9.0.3
       muggle-string: 0.3.1
-      typescript: 5.2.2
+      typescript: 5.3.2
+      vue-template-compiler: 2.7.14
+    dev: true
+
+  /@vue/language-core@1.8.25(typescript@5.3.2):
+    resolution: {integrity: sha512-NJk/5DnAZlpvXX8BdWmHI45bWGLViUaS3R/RMrmFSvFMSbJKuEODpM4kR0F0Ofv5SFzCWuNiMhxameWpVdQsnA==}
+    peerDependencies:
+      typescript: ^5.3.0
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+    dependencies:
+      '@volar/language-core': 1.11.1
+      '@volar/source-map': 1.11.1
+      '@vue/compiler-dom': 3.3.4
+      '@vue/shared': 3.3.4
+      computeds: 0.0.1
+      minimatch: 9.0.3
+      muggle-string: 0.3.1
+      path-browserify: 1.0.1
+      typescript: 5.3.2
       vue-template-compiler: 2.7.14
     dev: true
 
@@ -8224,8 +11324,8 @@ packages:
   /@vue/shared@3.3.4:
     resolution: {integrity: sha512-7OjdcV8vQ74eiz1TZLzZP4JwqM5fA94K6yntPS5Z25r9HDuGNzaGdgvwKYq6S+MxwF0TFRwe50fIR/MYnakdkQ==}
 
-  /@vue/test-utils@2.4.1(vue@3.3.4):
-    resolution: {integrity: sha512-VO8nragneNzUZUah6kOjiFmD/gwRjUauG9DROh6oaOeFwX1cZRUNHhdeogE8635cISigXFTtGLUQWx5KCb0xeg==}
+  /@vue/test-utils@2.4.3(vue@3.3.4):
+    resolution: {integrity: sha512-F4K7mF+ad++VlTrxMJVRnenKSJmO6fkQt2wpRDiKDesQMkfpniGWsqEi/JevxGBo2qEkwwjvTUAoiGJLNx++CA==}
     peerDependencies:
       '@vue/server-renderer': ^3.0.1
       vue: ^3.0.1
@@ -8235,36 +11335,31 @@ packages:
     dependencies:
       js-beautify: 1.14.9
       vue: 3.3.4
-      vue-component-type-helpers: 1.8.4
+      vue-component-type-helpers: 1.8.25
     dev: true
 
-  /@vue/typescript@1.8.8(typescript@5.2.2):
-    resolution: {integrity: sha512-jUnmMB6egu5wl342eaUH236v8tdcEPXXkPgj+eI/F6JwW/lb+yAU6U07ZbQ3MVabZRlupIlPESB7ajgAGixhow==}
-    dependencies:
-      '@volar/typescript': 1.10.0
-      '@vue/language-core': 1.8.8(typescript@5.2.2)
-    transitivePeerDependencies:
-      - typescript
+  /@vue/tsconfig@0.5.1:
+    resolution: {integrity: sha512-VcZK7MvpjuTPx2w6blwnwZAu5/LgBUtejFOi3pPGQFXQN5Ela03FUtd2Qtg4yWGGissVL0dr6Ro1LfOFh+PCuQ==}
     dev: true
 
-  /@vueuse/components@10.2.0(vue@3.3.4):
-    resolution: {integrity: sha512-fpGtxx8G3BCJUoTd6d4xI7qELvm4nwVKLZYgIVdv7weqprKWwK5IO+t3LULovPuS7W2guVZgpyMy9NkD4qa2Bw==}
+  /@vueuse/components@10.5.0(vue@3.3.4):
+    resolution: {integrity: sha512-zWQZ8zkNBvX++VHfyiUaQ4otb+4PWI8679GR8FvdrNnj+01LXnqvrkyKd8yTCMJ9nHqwRRTJikS5fu4Zspn9DQ==}
     dependencies:
-      '@vueuse/core': 10.2.0(vue@3.3.4)
-      '@vueuse/shared': 10.2.0(vue@3.3.4)
-      vue-demi: 0.14.5(vue@3.3.4)
+      '@vueuse/core': 10.5.0(vue@3.3.4)
+      '@vueuse/shared': 10.5.0(vue@3.3.4)
+      vue-demi: 0.14.6(vue@3.3.4)
     transitivePeerDependencies:
       - '@vue/composition-api'
       - vue
     dev: false
 
-  /@vueuse/core@10.2.0(vue@3.3.4):
-    resolution: {integrity: sha512-aHBnoCteIS3hFu7ZZkVB93SanVDY6t4TIb7XDLxJT/HQdAZz+2RdIEJ8rj5LUoEJr7Damb5+sJmtpCwGez5ozQ==}
+  /@vueuse/core@10.5.0(vue@3.3.4):
+    resolution: {integrity: sha512-z/tI2eSvxwLRjOhDm0h/SXAjNm8N5ld6/SC/JQs6o6kpJ6Ya50LnEL8g5hoYu005i28L0zqB5L5yAl8Jl26K3A==}
     dependencies:
-      '@types/web-bluetooth': 0.0.17
-      '@vueuse/metadata': 10.2.0
-      '@vueuse/shared': 10.2.0(vue@3.3.4)
-      vue-demi: 0.14.5(vue@3.3.4)
+      '@types/web-bluetooth': 0.0.18
+      '@vueuse/metadata': 10.5.0
+      '@vueuse/shared': 10.5.0(vue@3.3.4)
+      vue-demi: 0.14.6(vue@3.3.4)
     transitivePeerDependencies:
       - '@vue/composition-api'
       - vue
@@ -8282,18 +11377,18 @@ packages:
       - vue
     dev: false
 
-  /@vueuse/metadata@10.2.0:
-    resolution: {integrity: sha512-IR7Mkq6QSgZ38q/2ZzOt+Zz1OpcEsnwE64WBumDQ+RGKrosFCtUA2zgRrOqDEzPBXrVB+4HhFkwDjQMu0fDBKw==}
+  /@vueuse/metadata@10.5.0:
+    resolution: {integrity: sha512-fEbElR+MaIYyCkeM0SzWkdoMtOpIwO72x8WsZHRE7IggiOlILttqttM69AS13nrDxosnDBYdyy3C5mR1LCxHsw==}
     dev: false
 
   /@vueuse/metadata@9.13.0:
     resolution: {integrity: sha512-gdU7TKNAUVlXXLbaF+ZCfte8BjRJQWPCa2J55+7/h+yDtzw3vOoGQDRXzI6pyKyo6bXFT5/QoPE4hAknExjRLQ==}
     dev: false
 
-  /@vueuse/shared@10.2.0(vue@3.3.4):
-    resolution: {integrity: sha512-dIeA8+g9Av3H5iF4NXR/sft4V6vys76CpZ6hxwj8eMXybXk2WRl3scSsOVi+kQ9SX38COR7AH7WwY83UcuxbSg==}
+  /@vueuse/shared@10.5.0(vue@3.3.4):
+    resolution: {integrity: sha512-18iyxbbHYLst9MqU1X1QNdMHIjks6wC7XTVf0KNOv5es/Ms6gjVFCAAWTVP2JStuGqydg3DT+ExpFORUEi9yhg==}
     dependencies:
-      vue-demi: 0.14.5(vue@3.3.4)
+      vue-demi: 0.14.6(vue@3.3.4)
     transitivePeerDependencies:
       - '@vue/composition-api'
       - vue
@@ -8414,6 +11509,14 @@ packages:
       '@xtuc/long': 4.2.2
     dev: true
 
+  /@xata.io/client@0.25.3(typescript@5.3.2):
+    resolution: {integrity: sha512-JM3FWFRFNG4W+F4PO0jNVf2byMqJP319iH3SrOQh8Hi+AI+WUW2PyNVShCt5cwykjxhJVzeEd9xUnq++HVVdWA==}
+    peerDependencies:
+      typescript: ^5.3.0
+    dependencies:
+      typescript: 5.3.2
+    dev: false
+
   /@xmldom/xmldom@0.8.6:
     resolution: {integrity: sha512-uRjjusqpoqfmRkTaNuLJ2VohVr67Q5YwDATW3VU7PfzTj6IRaihGrYI7zckGZjxQPBIp63nfvJbM+Yu5ICh0Bg==}
     engines: {node: '>=10.0.0'}
@@ -8481,59 +11584,54 @@ packages:
   /acorn-globals@7.0.1:
     resolution: {integrity: sha512-umOSDSDrfHbTNPuNpC2NSnnA3LUrqpevPb4T9jRx4MagXNS0rs+gwiTcAvqCRmsD6utzsrzNt+ebm00SNWiC3Q==}
     dependencies:
-      acorn: 8.10.0
+      acorn: 8.11.2
       acorn-walk: 8.2.0
     dev: true
 
-  /acorn-import-assertions@1.8.0(acorn@8.10.0):
+  /acorn-import-assertions@1.8.0(acorn@8.11.2):
     resolution: {integrity: sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==}
     peerDependencies:
       acorn: ^8
     dependencies:
-      acorn: 8.10.0
+      acorn: 8.11.2
     dev: true
 
-  /acorn-jsx@5.3.2(acorn@8.10.0):
+  /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:
-      acorn: 8.10.0
-    dev: true
+      acorn: 8.11.2
 
   /acorn-walk@8.2.0:
     resolution: {integrity: sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==}
     engines: {node: '>=0.4.0'}
 
+  /acorn-walk@8.3.1:
+    resolution: {integrity: sha512-TgUZgYvqZprrl7YldZNoa9OciCAyZR+Ejm9eXzKCmjsF5IKp/wgQ7Z/ZpjpGTIUPwrHQIcYeI8qDh4PsEwxMbw==}
+    engines: {node: '>=0.4.0'}
+    dev: true
+
   /acorn@7.4.1:
     resolution: {integrity: sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==}
     engines: {node: '>=0.4.0'}
     hasBin: true
     dev: true
 
-  /acorn@8.10.0:
-    resolution: {integrity: sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==}
+  /acorn@8.11.2:
+    resolution: {integrity: sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==}
     engines: {node: '>=0.4.0'}
     hasBin: true
 
-  /acorn@8.8.1:
-    resolution: {integrity: sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==}
-    engines: {node: '>=0.4.0'}
-    hasBin: true
-    dev: true
-
   /address@1.2.2:
     resolution: {integrity: sha512-4B/qKCfeE/ODUaAUpSwfzazo5x29WD4r3vXiWsB7I2mSDAihwEqKO+g8GELZUQSSAo5e1XTYh3ZVfLyxBc12nA==}
     engines: {node: '>= 10.0.0'}
     dev: true
 
-  /adjust-sourcemap-loader@4.0.0:
-    resolution: {integrity: sha512-OXwN5b9pCUXNQHJpwwD2qP40byEmSgzj8B4ydSN0uMNYWiFmJ6x6KwUllMmfk8Rwu/HJDFR7U8ubsWBoN0Xp0A==}
-    engines: {node: '>=8.9'}
-    dependencies:
-      loader-utils: 2.0.4
-      regex-parser: 2.2.11
-    dev: true
+  /adm-zip@0.5.10:
+    resolution: {integrity: sha512-x0HvcHqVJNTPk/Bw8JbLWlWoo6Wwnsug0fnYYro1HBrjxZ3G7/AZk7Ahv8JwDe1uIcz8eBqvu86FuF1POiG7vQ==}
+    engines: {node: '>=6.0'}
+    dev: false
 
   /agent-base@5.1.1:
     resolution: {integrity: sha512-TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g==}
@@ -8548,6 +11646,14 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
+  /agent-base@7.1.0:
+    resolution: {integrity: sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==}
+    engines: {node: '>= 14'}
+    dependencies:
+      debug: 4.3.4(supports-color@8.1.1)
+    transitivePeerDependencies:
+      - supports-color
+
   /agentkeepalive@4.2.1:
     resolution: {integrity: sha512-Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA==}
     engines: {node: '>= 8.0.0'}
@@ -8558,7 +11664,6 @@ packages:
     transitivePeerDependencies:
       - supports-color
     dev: false
-    optional: true
 
   /aggregate-error@3.1.0:
     resolution: {integrity: sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==}
@@ -8583,6 +11688,15 @@ packages:
       json-schema-traverse: 0.4.1
       uri-js: 4.4.1
 
+  /ajv@8.12.0:
+    resolution: {integrity: sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==}
+    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
+
   /amqplib@0.10.3:
     resolution: {integrity: sha512-UHmuSa7n8vVW/a5HGh2nFPqAEr8+cD4dEZ6u9GjP91nHfr1a54RyAKyra7Sb5NH7NBKOUlyQSMXIp0qAixKexw==}
     engines: {node: '>=10'}
@@ -8654,7 +11768,6 @@ packages:
   /ansi-styles@5.2.0:
     resolution: {integrity: sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==}
     engines: {node: '>=10'}
-    dev: true
 
   /ansi-styles@6.2.1:
     resolution: {integrity: sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==}
@@ -8748,6 +11861,13 @@ packages:
   /argparse@2.0.1:
     resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==}
 
+  /aria-hidden@1.2.3:
+    resolution: {integrity: sha512-xcLxITLe2HYa1cnYnwCjkOO1PqUHQpozB8x9AR0OgWN2woOBi5kSDVxKfd0b7sb1hw5qFeJhXm9H1nu3xSfLeQ==}
+    engines: {node: '>=10'}
+    dependencies:
+      tslib: 2.6.1
+    dev: true
+
   /aria-query@5.1.3:
     resolution: {integrity: sha512-R5iJ5lkuHybztUfuOAznmboyjWq8O6sqNqtK7CLOqdydi54VNbORp49mb14KbWgG1QD3JFO9hJdZ+y4KutfdOQ==}
     dependencies:
@@ -8797,14 +11917,21 @@ packages:
   /array-flatten@1.1.1:
     resolution: {integrity: sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==}
 
-  /array-includes@3.1.6:
-    resolution: {integrity: sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==}
+  /array-hyper-unique@2.1.4:
+    resolution: {integrity: sha512-RVsGx2YpFGhGpgdkK7A0VjFQecVUCowpkQerGCsyXVRXHxccAlPPTDt9ueF/X7Zq/6z6duZ49i9WzTCzcnQygQ==}
+    dependencies:
+      deep-eql: 4.0.0
+      lodash: 4.17.21
+    dev: false
+
+  /array-includes@3.1.7:
+    resolution: {integrity: sha512-dlcsNBIiWhPkHdOEEKnehA+RNUWDc4UqFtnIXU4uuYDPtA4LDkr7qip2p0VvFAEXNDr0yWZ9PJyIRiGjRLQzwQ==}
     engines: {node: '>= 0.4'}
     dependencies:
       call-bind: 1.0.2
-      define-properties: 1.1.4
-      es-abstract: 1.21.1
-      get-intrinsic: 1.1.3
+      define-properties: 1.2.0
+      es-abstract: 1.22.1
+      get-intrinsic: 1.2.1
       is-string: 1.0.7
     dev: true
 
@@ -8854,39 +11981,39 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /array.prototype.findlastindex@1.2.2:
-    resolution: {integrity: sha512-tb5thFFlUcp7NdNF6/MpDk/1r/4awWG1FIz3YqDf+/zJSTezBb+/5WViH41obXULHVpDzoiCLpJ/ZO9YbJMsdw==}
+  /array.prototype.findlastindex@1.2.3:
+    resolution: {integrity: sha512-LzLoiOMAxvy+Gd3BAq3B7VeIgPdo+Q8hthvKtXybMvRV0jrXfJM/t8mw7nNlpEcVlVUnCnM2KSX4XU5HmpodOA==}
     engines: {node: '>= 0.4'}
     dependencies:
       call-bind: 1.0.2
-      define-properties: 1.1.4
-      es-abstract: 1.21.1
+      define-properties: 1.2.0
+      es-abstract: 1.22.1
       es-shim-unscopables: 1.0.0
-      get-intrinsic: 1.1.3
+      get-intrinsic: 1.2.1
     dev: true
 
-  /array.prototype.flat@1.3.1:
-    resolution: {integrity: sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==}
+  /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.2
-      define-properties: 1.1.4
-      es-abstract: 1.21.1
+      define-properties: 1.2.0
+      es-abstract: 1.22.1
       es-shim-unscopables: 1.0.0
     dev: true
 
-  /array.prototype.flatmap@1.3.1:
-    resolution: {integrity: sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==}
+  /array.prototype.flatmap@1.3.2:
+    resolution: {integrity: sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==}
     engines: {node: '>= 0.4'}
     dependencies:
       call-bind: 1.0.2
-      define-properties: 1.1.4
-      es-abstract: 1.21.1
+      define-properties: 1.2.0
+      es-abstract: 1.22.1
       es-shim-unscopables: 1.0.0
     dev: true
 
-  /array.prototype.reduce@1.0.4:
-    resolution: {integrity: sha512-WnM+AjG/DvLRLo4DDl+r+SvCzYtD2Jd9oeBYMcEaI7t3fFrHY9M53/wdLcTvmZNQ70IU6Htj0emFkZ5TS+lrdw==}
+  /array.prototype.reduce@1.0.6:
+    resolution: {integrity: sha512-UW+Mz8LG/sPSU8jRDCjVr6J/ZKAGpHfwrZ6kWTG5qCxIEiXdVshqGnu5vEZA8S1y6X4aCSbQZ0/EEsfvEvBiSg==}
     engines: {node: '>= 0.4'}
     dependencies:
       call-bind: 1.0.2
@@ -9053,15 +12180,15 @@ packages:
       core-js: 3.31.0
       handlebars: 4.7.7
       lodash.uniqby: 4.7.0
-      node-fetch: 2.6.8
+      node-fetch: 2.7.0(encoding@0.1.13)
       parse-github-url: 1.0.2
-      regenerator-runtime: 0.13.9
+      regenerator-runtime: 0.13.11
       semver: 7.5.4
     transitivePeerDependencies:
       - encoding
     dev: false
 
-  /autoprefixer@10.4.14(postcss@8.4.27):
+  /autoprefixer@10.4.14(postcss@8.4.32):
     resolution: {integrity: sha512-FQzyfOsTlwVzjHxKEqRIAdJx9niO6VCBCoEwax/VLSoQF29ggECcPuBqUMZ+u8jCZOPSy8b8/8KnuFbp0SaFZQ==}
     engines: {node: ^10 || ^12 || >=14}
     hasBin: true
@@ -9073,7 +12200,7 @@ packages:
       fraction.js: 4.2.0
       normalize-range: 0.1.2
       picocolors: 1.0.0
-      postcss: 8.4.27
+      postcss: 8.4.32
       postcss-value-parser: 4.2.0
     dev: true
 
@@ -9086,22 +12213,6 @@ packages:
     engines: {node: '>=0.11'}
     dev: false
 
-  /aws-sdk@2.1231.0:
-    resolution: {integrity: sha512-ONBuRsOxsu0zL8u/Vmz49tPWi9D4ls2pjb6szdfSx9VQef7bOnWe9gJpWoA94OTzcjOWsvjsG7UgjvQJkIuPBg==}
-    engines: {node: '>= 10.0.0'}
-    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.5
-      uuid: 8.0.0
-      xml2js: 0.5.0
-    dev: false
-
   /aws-sign2@0.7.0:
     resolution: {integrity: sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==}
     dev: true
@@ -9114,55 +12225,48 @@ packages:
     engines: {node: '>=4'}
     dev: true
 
-  /axios-retry@3.3.1:
-    resolution: {integrity: sha512-RohAUQTDxBSWLFEnoIG/6bvmy8l3TfpkclgStjl5MDCMBDgapAWCmr1r/9harQfWC8bzLC8job6UcL1A1Yc+/Q==}
+  /axios-retry@3.7.0:
+    resolution: {integrity: sha512-ZTnCkJbRtfScvwiRnoVskFAfvU0UG3xNcsjwTR0mawSbIJoothxn67gKsMaNAFHRXJ1RmuLhmZBzvyXi3+9WyQ==}
     dependencies:
-      '@babel/runtime': 7.22.6
+      '@babel/runtime': 7.23.6
+      is-retry-allowed: 2.2.0
+    dev: false
+
+  /axios-retry@4.0.0(axios@1.6.2):
+    resolution: {integrity: sha512-F6P4HVGITD/v4z9Lw2mIA24IabTajvpDZmKa6zq/gGwn57wN5j1P3uWrAV0+diqnW6kTM2fTqmWNfgYWGmMuiA==}
+    peerDependencies:
+      axios: 0.x || 1.x
+    dependencies:
+      axios: 1.6.2(debug@3.2.7)
       is-retry-allowed: 2.2.0
     dev: false
 
   /axios@0.21.4:
     resolution: {integrity: sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==}
     dependencies:
-      follow-redirects: 1.15.2(debug@4.3.4)
+      follow-redirects: 1.15.2(debug@3.2.7)
     transitivePeerDependencies:
       - debug
     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
-    dev: false
-
-  /axios@0.27.2(debug@3.2.7):
-    resolution: {integrity: sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==}
+  /axios@1.6.2(debug@3.2.7):
+    resolution: {integrity: sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A==}
     dependencies:
       follow-redirects: 1.15.2(debug@3.2.7)
       form-data: 4.0.0
+      proxy-from-env: 1.1.0
     transitivePeerDependencies:
       - debug
     dev: false
 
-  /axios@0.27.2(debug@4.3.4):
-    resolution: {integrity: sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==}
-    dependencies:
-      follow-redirects: 1.15.2(debug@4.3.4)
-      form-data: 4.0.0
-    transitivePeerDependencies:
-      - debug
-
-  /axios@1.4.0:
-    resolution: {integrity: sha512-S4XCWMEmzvo64T9GfvQDOXgYRDJ/wsSZc7Jvdgx5u1sd0JwsuPLqb3SYmusag+edF6ziyMensPVqLTSc1PiSEA==}
+  /axios@1.6.2(debug@4.3.4):
+    resolution: {integrity: sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A==}
     dependencies:
       follow-redirects: 1.15.2(debug@4.3.4)
       form-data: 4.0.0
       proxy-from-env: 1.1.0
     transitivePeerDependencies:
       - debug
-    dev: false
 
   /babel-core@7.0.0-bridge.0(@babel/core@7.22.9):
     resolution: {integrity: sha512-poPX9mZH/5CSanm50Q+1toVci6pv5KSRv/5TWCwtzQS5XEwn40BcCrgIeMFWP9CKKIniKXNxoIOnOq4VVlGXhg==}
@@ -9194,7 +12298,7 @@ packages:
     resolution: {integrity: sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==}
     engines: {node: '>=8'}
     dependencies:
-      '@babel/helper-plugin-utils': 7.21.5
+      '@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
@@ -9305,6 +12409,10 @@ packages:
   /balanced-match@1.0.2:
     resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==}
 
+  /base-64@0.1.0:
+    resolution: {integrity: sha512-Y5gU45svrR5tI2Vt/X9GPd3L0HNIKzGu202EjxrXMpuc2V2CiKgemAbUUsqYmZJvPtCXoUKjNZwBJzsNScUbXA==}
+    dev: false
+
   /base-64@1.0.0:
     resolution: {integrity: sha512-kwDPIFCGx0NZHog36dj+tHiwP4QMzsZ3AgMViUBKI0+V5n4U0ufTCUMhnQ04diaRI8EX/QcPfql7zlhZ7j4zgg==}
     dev: false
@@ -9356,18 +12464,22 @@ packages:
     resolution: {integrity: sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==}
     dev: true
 
-  /bignumber.js@2.4.0:
-    resolution: {integrity: sha512-uw4ra6Cv483Op/ebM0GBKKfxZlSmn6NgFRby5L3yGTlunLj53KQgndDlqy2WVFOwgvurocApYkSud0aO+mvrpQ==}
-    dev: false
-
   /bignumber.js@9.1.1:
     resolution: {integrity: sha512-pHm4LsMJ6lzgNGVfZHjMoO8sdoRhOzOH4MLmY65Jg70bpxCKu5iOHNJyfF6OyvYw7t8Fpf35RuzUyqnQsj8Vig==}
     dev: false
 
+  /bignumber.js@9.1.2:
+    resolution: {integrity: sha512-2/mKyZH9K85bzOEfhXDBFZTGd1CTs+5IHpeFQo9luiBG7hghdC851Pj2WAhb6E3R6b9tZj/XKhbg4fum+Kepug==}
+    dev: false
+
   /binary-extensions@2.2.0:
     resolution: {integrity: sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==}
     engines: {node: '>=8'}
 
+  /binary-search@1.3.6:
+    resolution: {integrity: sha512-nbE1WxOTTrUWIfsfZ4aHGYu5DOuNkbxGokjV6Z2kxfJK3uaAb8zNK1muzOeipoLHZjInT4Br88BHpzevc681xA==}
+    dev: false
+
   /binascii@0.0.2:
     resolution: {integrity: sha512-rA2CrUl1+6yKrn+XgLs8Hdy18OER1UW146nM+ixzhQXDY+Bd3ySkyIJGwF2a4I45JwbvF1mDL/nWkqBwpOcdBA==}
     dev: false
@@ -9400,9 +12512,12 @@ packages:
     resolution: {integrity: sha512-UfFSr22dmHPQqPP9XWHRhq+gWnHCYguQGkXQlbyPtW5qTnhFWA8/iXg765tH0cAjy7l/zPJ1aBTO0g5XgA7kvQ==}
     dev: false
 
+  /bluebird@3.4.7:
+    resolution: {integrity: sha512-iD3898SR7sWVRHbiQv+sHUtHnMvC1o3nW5rAcqnq3uOn07DSAppZYUkIGslDz6gXC7HfunPe7YVBgoEJASPcHA==}
+    dev: false
+
   /bluebird@3.7.2:
     resolution: {integrity: sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==}
-    dev: true
 
   /bn.js@4.12.0:
     resolution: {integrity: sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==}
@@ -9437,7 +12552,6 @@ packages:
   /bowser@2.11.0:
     resolution: {integrity: sha512-AlcaJBi/pqqJBIQ8U9Mcpc9i8Aqxn88Skv5d+xBX006BY5u8N3mGLHa5Lgppa7L/HfwgwLgZ6NYs+Ag6uUmJRA==}
     dev: false
-    optional: true
 
   /bplist-parser@0.2.0:
     resolution: {integrity: sha512-z0M+byMThzQmD9NILRniCUXYsYpjwnlO8N5uCFaCqIOpqRsJCrQL9NK3JsD67CN5a08nF5oIL2bD6loTdHOuKw==}
@@ -9552,14 +12666,6 @@ packages:
     engines: {node: '>=4'}
     dev: false
 
-  /buffer@4.9.2:
-    resolution: {integrity: sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==}
-    dependencies:
-      base64-js: 1.5.1
-      ieee754: 1.2.1
-      isarray: 1.0.0
-    dev: false
-
   /buffer@5.7.1:
     resolution: {integrity: sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==}
     dependencies:
@@ -9573,6 +12679,13 @@ packages:
       ieee754: 1.2.1
     dev: false
 
+  /bufferutil@4.0.8:
+    resolution: {integrity: sha512-4T53u4PdgsXqKaIctwF8ifXlRTTmEPJ8iEPWFdGZvcf7sbwYo6FKFEX9eNNAnzFZ7EzJAQ3CJeOtCRA4rDp7Pw==}
+    engines: {node: '>=6.14.2'}
+    dependencies:
+      node-gyp-build: 4.7.0
+    dev: false
+
   /buildcheck@0.0.3:
     resolution: {integrity: sha512-pziaA+p/wdVImfcbsZLNF32EiWyujlQLwolMqUQE8xpKNOH7KmZQaY8sXN7DGOEzPAElo9QTaeNRfGnf3iOJbA==}
     engines: {node: '>=10.0.0'}
@@ -9594,9 +12707,9 @@ packages:
       ioredis: 4.28.5
       lodash: 4.17.21
       p-timeout: 3.2.0
-      promise.prototype.finally: 3.1.3
+      promise.prototype.finally: 3.1.7
       semver: 7.5.4
-      util.promisify: 1.1.1
+      util.promisify: 1.1.2
       uuid: 8.3.2
     transitivePeerDependencies:
       - supports-color
@@ -9681,16 +12794,6 @@ packages:
       unset-value: 1.0.0
     dev: true
 
-  /cache-manager-ioredis-yet@1.2.2:
-    resolution: {integrity: sha512-o03N/tQxfFONZ1XLGgIxOFHuQQpjpRdnSAL1THG1YWZIVp1JMUfjU3ElSAjFN1LjbJXa55IpC8waG+VEoLUCUw==}
-    engines: {node: '>= 16.17.0'}
-    dependencies:
-      cache-manager: 5.2.3
-      ioredis: 5.3.2
-    transitivePeerDependencies:
-      - supports-color
-    dev: false
-
   /cache-manager@5.2.3:
     resolution: {integrity: sha512-9OErI8fksFkxAMJ8Mco0aiZSdphyd90HcKiOMJQncSlU1yq/9lHHxrT8PDayxrmr9IIIZPOAEfXuGSD7g29uog==}
     dependencies:
@@ -9706,7 +12809,7 @@ packages:
   /call-bind@1.0.2:
     resolution: {integrity: sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==}
     dependencies:
-      function-bind: 1.1.1
+      function-bind: 1.1.2
       get-intrinsic: 1.2.1
 
   /call-me-maybe@1.0.1:
@@ -9736,6 +12839,15 @@ packages:
     resolution: {integrity: sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==}
     engines: {node: '>=10'}
 
+  /caniuse-api@3.0.0:
+    resolution: {integrity: sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==}
+    dependencies:
+      browserslist: 4.21.9
+      caniuse-lite: 1.0.30001517
+      lodash.memoize: 4.1.2
+      lodash.uniq: 4.5.0
+    dev: true
+
   /caniuse-lite@1.0.30001517:
     resolution: {integrity: sha512-Vdhm5S11DaFVLlyiKu4hiUTkpZu+y1KA/rZZqVQfOD5YdDT/eQKlkt7NaE0WGOFgX32diqt9MiP9CAiFeRklaA==}
     dev: true
@@ -9759,14 +12871,21 @@ packages:
     resolution: {integrity: sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==}
     dev: true
 
-  /chai@4.3.7:
-    resolution: {integrity: sha512-HLnAzZ2iupm25PlN0xFreAlBA5zaBSv3og0DdeGA4Ar6h6rJ3A0rolRUKJhSF2V10GZKDgWF/VmAEsNWjCRB+A==}
+  /catharsis@0.9.0:
+    resolution: {integrity: sha512-prMTQVpcns/tzFgFVkVp6ak6RykZyWb3gu8ckUpd6YkTlacOd3DXGJjIpD4Q6zJirizvaiAjSSHlOsA+6sNh2A==}
+    engines: {node: '>= 10'}
+    dependencies:
+      lodash: 4.17.21
+    dev: false
+
+  /chai@4.3.10:
+    resolution: {integrity: sha512-0UXG04VuVbruMUYbJ6JctvH0YnC/4q3/AkT18q4NaITo91CUm0liMS9VqzT9vZhVQ/1eqPanMWjBM+Juhfb/9g==}
     engines: {node: '>=4'}
     dependencies:
       assertion-error: 1.1.0
-      check-error: 1.0.2
+      check-error: 1.0.3
       deep-eql: 4.1.3
-      get-func-name: 2.0.0
+      get-func-name: 2.0.2
       loupe: 2.3.6
       pathval: 1.1.1
       type-detect: 4.0.8
@@ -9796,6 +12915,11 @@ packages:
       ansi-styles: 4.3.0
       supports-color: 7.2.0
 
+  /chalk@5.3.0:
+    resolution: {integrity: sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==}
+    engines: {node: ^12.17.0 || ^14.13 || >=16.0.0}
+    dev: true
+
   /change-case@4.1.2:
     resolution: {integrity: sha512-bSxY2ws9OtviILG1EiY5K7NNxkqg/JnRnFxLtKQ96JaviiIxi7djMrSd0ECT9AC+lttClmYwKw53BWpOMblo7A==}
     dependencies:
@@ -9832,8 +12956,17 @@ packages:
     resolution: {integrity: sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA==}
     dev: false
 
-  /check-error@1.0.2:
-    resolution: {integrity: sha512-BrgHpW9NURQgzoNyjfq0Wu6VFO6D7IZEmJNdtgNqpzGG8RuNFHt2jQxWlAs4HMe119chBnv+34syEZtc6IhLtA==}
+  /chart.js@4.4.0:
+    resolution: {integrity: sha512-vQEj6d+z0dcsKLlQvbKIMYFHd3t8W/7L2vfJIbYcfyPcRx92CsHqECpueN8qVGNlKyDcr5wBrYAYKnfu/9Q1hQ==}
+    engines: {pnpm: '>=7'}
+    dependencies:
+      '@kurkle/color': 0.3.2
+    dev: false
+
+  /check-error@1.0.3:
+    resolution: {integrity: sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==}
+    dependencies:
+      get-func-name: 2.0.2
     dev: true
 
   /check-more-types@2.24.0:
@@ -9875,7 +13008,7 @@ packages:
       normalize-path: 3.0.0
       readdirp: 3.6.0
     optionalDependencies:
-      fsevents: 2.3.2
+      fsevents: 2.3.3
 
   /chownr@1.1.4:
     resolution: {integrity: sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==}
@@ -9895,6 +13028,12 @@ packages:
     engines: {node: '>=8'}
     dev: true
 
+  /citty@0.1.5:
+    resolution: {integrity: sha512-AS7n5NSc0OQVMV9v6wt3ByujNIrne0/cTjiC2MYqhvao57VNfiuVksTSr2p17nVOhEr2KtqiAkGwHcgMC/qUuQ==}
+    dependencies:
+      consola: 3.2.3
+    dev: true
+
   /cjs-module-lexer@1.2.2:
     resolution: {integrity: sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA==}
     dev: true
@@ -10097,6 +13236,11 @@ packages:
     resolution: {integrity: sha512-rwHwUfXL40Chm1r08yrhU3qpUvdVlgkKNeyeGPOxnW8/SyVDvgRaed/Uz54AqWNaTCAThlj6QAs3TZcKI0xDEw==}
     engines: {node: '>=0.10.0'}
 
+  /cluster-key-slot@1.1.2:
+    resolution: {integrity: sha512-RMr0FhtfXemyinomL4hrWcYJxmX6deFdCxpJzhDttxgO1+bcCnkk+9drydLVDmAMG7NE6aN/fl4F7ucU/90gAA==}
+    engines: {node: '>=0.10.0'}
+    dev: false
+
   /co@4.6.0:
     resolution: {integrity: sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==}
     engines: {iojs: '>= 1.0.0', node: '>= 0.12.0'}
@@ -10110,12 +13254,12 @@ packages:
   /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.1.0)
-      '@codemirror/lang-css': 6.0.1(@codemirror/view@6.5.1)(@lezer/common@1.1.0)
-      '@codemirror/lang-javascript': 6.1.2
-      '@codemirror/language': 6.2.1
-      '@codemirror/state': 6.1.4
-      '@codemirror/view': 6.5.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/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
@@ -10123,11 +13267,11 @@ packages:
       '@lezer/lr': 1.2.3
     dev: false
 
-  /codemirror-lang-n8n-expression@0.2.0(@codemirror/state@6.1.4)(@codemirror/view@6.5.1)(@lezer/common@1.1.0):
+  /codemirror-lang-n8n-expression@0.2.0(@codemirror/state@6.3.3)(@codemirror/view@6.22.3)(@lezer/common@1.1.0):
     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.1.0)
-      '@codemirror/language': 6.2.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
       '@lezer/highlight': 1.1.1
       '@lezer/lr': 1.2.3
     transitivePeerDependencies:
@@ -10136,6 +13280,10 @@ packages:
       - '@lezer/common'
     dev: false
 
+  /cohere-ai@6.2.2:
+    resolution: {integrity: sha512-+Tq+4e8N/YWKJqFpWaULsfbZR/GOvGh8WWYFKR1bpipu8bCok3VcbTPnBmIToQiIqOgFpGk3HsA4b0guVyL3vg==}
+    dev: false
+
   /collect-v8-coverage@1.0.1:
     resolution: {integrity: sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==}
     dev: true
@@ -10192,10 +13340,19 @@ packages:
       color-string: 1.9.1
     dev: false
 
+  /colord@2.9.3:
+    resolution: {integrity: sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==}
+    dev: true
+
   /colorette@2.0.19:
     resolution: {integrity: sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==}
     dev: true
 
+  /colors@1.2.5:
+    resolution: {integrity: sha512-erNRLao/Y3Fv54qUa0LBB+//Uf3YwMUmdJinN20yMXm9zdKKqH9wt7R9IIVZ+K7ShzfpLV/Zg8+VyrBJYB4lpg==}
+    engines: {node: '>=0.1.90'}
+    dev: true
+
   /colors@1.4.0:
     resolution: {integrity: sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==}
     engines: {node: '>=0.1.90'}
@@ -10217,11 +13374,15 @@ packages:
   /commander@10.0.1:
     resolution: {integrity: sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==}
     engines: {node: '>=14'}
-    dev: true
 
   /commander@2.20.3:
     resolution: {integrity: sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==}
 
+  /commander@4.1.1:
+    resolution: {integrity: sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==}
+    engines: {node: '>= 6'}
+    dev: false
+
   /commander@5.1.0:
     resolution: {integrity: sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==}
     engines: {node: '>= 6'}
@@ -10232,6 +13393,11 @@ packages:
     engines: {node: '>= 6'}
     dev: true
 
+  /commander@7.2.0:
+    resolution: {integrity: sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==}
+    engines: {node: '>= 10'}
+    dev: true
+
   /commander@9.4.1:
     resolution: {integrity: sha512-5EEkTNyHNGFPD2H+c/dXXfQZYa/scCKasxWcXJaWnNJ99pnQN9Vnmqow+p+PlFPE63Q6mThaZws1T+HxfpgtPw==}
     engines: {node: ^12.20.0 || >=14}
@@ -10251,7 +13417,6 @@ packages:
 
   /component-emitter@1.3.0:
     resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==}
-    dev: true
 
   /component-type@1.2.1:
     resolution: {integrity: sha512-Kgy+2+Uwr75vAi6ChWXgHuLvd+QLD7ssgpaRq2zCvt80ptvAfMc/hijcJxXkBa2wMlEZcJvC2H8Ubo+A9ATHIg==}
@@ -10277,6 +13442,10 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
+  /computeds@0.0.1:
+    resolution: {integrity: sha512-7CEBgcMjVmitjYo5q8JTJVra6X5mQ20uTThdK+0kR7UEaDrAWEQcRiBtWJzga4eRpP6afNwwLsX2SET2JhVB1Q==}
+    dev: true
+
   /concat-map@0.0.1:
     resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==}
 
@@ -10331,6 +13500,11 @@ packages:
     engines: {node: '>=0.8'}
     dev: false
 
+  /consola@3.2.3:
+    resolution: {integrity: sha512-I5qxpzLv+sJhTVEoLYNcTW+bThDCPsit0vLNKShZx6rLtpilNpmmeTPaeqJb9ZE9dV3DGaeby6Vuhrw38WjeyQ==}
+    engines: {node: ^14.18.0 || >=16.10.0}
+    dev: true
+
   /console-control-strings@1.1.0:
     resolution: {integrity: sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==}
 
@@ -10394,6 +13568,7 @@ packages:
   /cookie@0.4.2:
     resolution: {integrity: sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==}
     engines: {node: '>= 0.6'}
+    dev: false
 
   /cookie@0.5.0:
     resolution: {integrity: sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==}
@@ -10401,13 +13576,6 @@ packages:
 
   /cookiejar@2.1.4:
     resolution: {integrity: sha512-LDx6oHrK+PhzLKJU9j5S7/Y3jM/mUHvD/DeI1WQmJn652iPC5Y4TBzC9l+5OMOXlyTTA+SmVUPm0HQUwpD5Jqw==}
-    dev: true
-
-  /copy-anything@2.0.6:
-    resolution: {integrity: sha512-1j20GZTsvKNkc4BY3NpMOM8tt///wY3FpIzozTOFO2ffuZcV61nojHXVKIy3WM+7ADCy5FVhdZYHYDdgTU0yJw==}
-    dependencies:
-      is-what: 3.14.1
-    dev: true
 
   /copy-descriptor@0.1.1:
     resolution: {integrity: sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==}
@@ -10421,16 +13589,6 @@ packages:
       is-plain-object: 5.0.0
     dev: true
 
-  /copy-to-clipboard@3.3.3:
-    resolution: {integrity: sha512-2KV8NhB5JqC3ky0r9PMCAZKbUHSwtEo4CwCs0KXgruG43gX5PMqDEBbVU4OUzw2MuAWUfsuFmWvEKG5QRfSnJA==}
-    dependencies:
-      toggle-selection: 1.0.6
-    dev: false
-
-  /copy-to@2.0.1:
-    resolution: {integrity: sha512-3DdaFaU/Zf1AnpLiFDeNCD4TOWe3Zl2RZaTzUvWiIk5ERzcCodOE20Vqq4fzCbNoHURFHT4/us/Lfq+S2zyY4w==}
-    dev: false
-
   /core-js-compat@3.32.0:
     resolution: {integrity: sha512-7a9a3D1k4UCVKnLhrgALyFcP7YCsLOQIxPd0dKjf/6GuPcgyiGP70ewWdCGrSK7evyhymi0qO4EqCmSJofDeYw==}
     dependencies:
@@ -10458,16 +13616,6 @@ packages:
       yaml: 1.10.2
     dev: true
 
-  /cosmiconfig@8.2.0:
-    resolution: {integrity: sha512-3rTMnFJA1tCOPwRxtgF4wd7Ab2qvDbL8jX+3smjIbS4HlZBagTlpERbdN7iAbWlrfxE3M8c27kTwTawQ7st+OQ==}
-    engines: {node: '>=14'}
-    dependencies:
-      import-fresh: 3.3.0
-      js-yaml: 4.1.0
-      parse-json: 5.2.0
-      path-type: 4.0.0
-    dev: true
-
   /cpu-features@0.0.4:
     resolution: {integrity: sha512-fKiZ/zp1mUwQbnzb9IghXtHtDoTMtNeb8oYGx6kX2SYfhnG0HNdBEBIzB9b5KlXu5DQPhfy3mInbBxFcgwAr3A==}
     engines: {node: '>=10.0.0'}
@@ -10481,6 +13629,14 @@ packages:
     resolution: {integrity: sha512-+BO9wPPi+DWTDcNYhr/W90myha8ptzftZT+LwcmUbbok0rcP/fequmFYCw8NMoH7pkAZQzU78b3kYrlua5a9eA==}
     dev: false
 
+  /crlf-normalize@1.0.19(ts-toolbelt@9.6.0):
+    resolution: {integrity: sha512-cpV1h7YwFtIA36NHtyWuMMMPGxUp6zrzxjRnFEDLh1ZH0SPNUqCWmM8RlKVycxvKHgZOxWXs3XxX/DAlBAjFzA==}
+    dependencies:
+      ts-type: 3.0.1(ts-toolbelt@9.6.0)
+    transitivePeerDependencies:
+      - ts-toolbelt
+    dev: false
+
   /cron-parser@2.18.0:
     resolution: {integrity: sha512-s4odpheTyydAbTBQepsqd2rNWGa2iV3cyo8g7zbI2QQYGLVsfbhmwukayS1XHppe02Oy1fg7mg6xoaraVJeEcg==}
     engines: {node: '>=0.8'}
@@ -10510,6 +13666,14 @@ packages:
       cross-spawn: 7.0.3
     dev: true
 
+  /cross-fetch@3.1.8(encoding@0.1.13):
+    resolution: {integrity: sha512-cvA+JwZoU0Xq+h6WkMvAUqPEYy92Obet6UdKLfW60qn99ftItKjB5T+BkyWOFWe2pUyfQ+IJHmpOTznqk1M6Kg==}
+    dependencies:
+      node-fetch: 2.7.0(encoding@0.1.13)
+    transitivePeerDependencies:
+      - encoding
+    dev: false
+
   /cross-spawn@4.0.2:
     resolution: {integrity: sha512-yAXz/pA1tD8Gtg2S98Ekf/sewp3Lcp3YoFKJ4Hkp5h5yLWnKVTDU0kwjKJ8NDCYcfTLfyGkzTikst+jWypT1iA==}
     dependencies:
@@ -10540,8 +13704,8 @@ packages:
     resolution: {integrity: sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow==}
     dev: false
 
-  /crypto-js@4.1.1:
-    resolution: {integrity: sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw==}
+  /crypto-js@4.2.0:
+    resolution: {integrity: sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q==}
     dev: false
 
   /crypto-random-string@2.0.0:
@@ -10558,6 +13722,15 @@ packages:
       uid-safe: 2.1.5
     dev: false
 
+  /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:
+      postcss: 8.4.32
+    dev: true
+
   /css-loader@3.6.0(webpack@5.75.0):
     resolution: {integrity: sha512-M5lSukoWi1If8dhQAUCvj4H8vUt3vOnwbQBH9DdTm/s4Ym2B/3dPMtYZeJmq7Q3S3Pa+I94DcZ7pc9bP14cWIQ==}
     engines: {node: '>= 8.9.0'}
@@ -10580,23 +13753,6 @@ packages:
       webpack: 5.75.0(esbuild@0.18.17)
     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
-    dependencies:
-      icss-utils: 5.1.0(postcss@8.4.27)
-      postcss: 8.4.27
-      postcss-modules-extract-imports: 3.0.0(postcss@8.4.27)
-      postcss-modules-local-by-default: 4.0.0(postcss@8.4.27)
-      postcss-modules-scope: 3.0.0(postcss@8.4.27)
-      postcss-modules-values: 4.0.0(postcss@8.4.27)
-      postcss-value-parser: 4.2.0
-      semver: 7.5.4
-      webpack: 5.75.0(esbuild@0.18.17)
-    dev: true
-
   /css-select@4.3.0:
     resolution: {integrity: sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==}
     dependencies:
@@ -10607,10 +13763,35 @@ packages:
       nth-check: 2.1.1
     dev: false
 
+  /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
+
+  /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:
+      mdn-data: 2.0.28
+      source-map-js: 1.0.2
+    dev: true
+
+  /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:
+      mdn-data: 2.0.30
+      source-map-js: 1.0.2
+    dev: true
+
   /css-what@6.1.0:
     resolution: {integrity: sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==}
     engines: {node: '>= 6'}
-    dev: false
 
   /css.escape@1.5.1:
     resolution: {integrity: sha512-YUifsXXuknHlUsmlgyY0PKzgPOr7/FjCePfHNt0jxm83wHZi44VDMQ7/fGNkjY3/jV1MC+1CmZbaHzugyeRtpg==}
@@ -10626,6 +13807,71 @@ packages:
     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:
+      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
+
+  /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:
+      postcss: 8.4.32
+    dev: true
+
+  /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:
+      cssnano-preset-default: 6.0.2(postcss@8.4.32)
+      lilconfig: 3.0.0
+      postcss: 8.4.32
+    dev: true
+
+  /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
+
   /cssom@0.3.8:
     resolution: {integrity: sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==}
     dev: true
@@ -10641,6 +13887,13 @@ packages:
       cssom: 0.3.8
     dev: true
 
+  /cssstyle@3.0.0:
+    resolution: {integrity: sha512-N4u2ABATi3Qplzf0hWbVCdjenim8F3ojEXpBDF5hBpjzW182MjNGLqfmQ0SkSPeQ+V86ZXgeH8aXj6kayd4jgg==}
+    engines: {node: '>=14'}
+    dependencies:
+      rrweb-cssom: 0.6.0
+    dev: true
+
   /csstype@3.1.1:
     resolution: {integrity: sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw==}
 
@@ -10676,21 +13929,20 @@ packages:
       otplib: 12.0.1
     dev: true
 
-  /cypress-real-events@1.9.1(cypress@12.17.2):
-    resolution: {integrity: sha512-eDYW6NagNs8+68ugyPbB6U1aIsYF0E0WHR6upXo0PbTXZNqBNc2s9Y0u/N+pbU9HpFh+krl6iMhoz/ENlYBdCg==}
+  /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
+      cypress: ^4.x || ^5.x || ^6.x || ^7.x || ^8.x || ^9.x || ^10.x || ^11.x || ^12.x || ^13.x
     dependencies:
-      cypress: 12.17.2
-      prettier: 3.0.3
+      cypress: 13.6.2
     dev: true
 
-  /cypress@12.17.2:
-    resolution: {integrity: sha512-hxWAaWbqQBzzMuadSGSuQg5PDvIGOovm6xm0hIfpCVcORsCAj/gF2p0EvfnJ4f+jK2PCiDgP6D2eeE9/FK4Mjg==}
-    engines: {node: ^14.0.0 || ^16.0.0 || >=18.0.0}
+  /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': 2.88.11
+      '@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
@@ -10725,6 +13977,7 @@ packages:
       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.5.4
@@ -10734,12 +13987,20 @@ packages:
       yauzl: 2.10.0
     dev: true
 
+  /d3-dsv@2.0.0:
+    resolution: {integrity: sha512-E+Pn8UJYx9mViuIUkoc93gJGGYut6mSDKy2+XaPwccwkRGlR+LO97L2VCCRjQivTwLHkSnAJG7yo00BWY6QM+w==}
+    hasBin: true
+    dependencies:
+      commander: 2.20.3
+      iconv-lite: 0.4.24
+      rw: 1.3.3
+    dev: false
+
   /d@1.0.1:
     resolution: {integrity: sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==}
     dependencies:
       es5-ext: 0.10.62
       type: 1.2.0
-    dev: true
 
   /dashdash@1.14.1:
     resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==}
@@ -10756,6 +14017,22 @@ packages:
       whatwg-url: 11.0.0
     dev: true
 
+  /data-urls@5.0.0:
+    resolution: {integrity: sha512-ZYP5VBHshaDAiVZxjbRVcFJpc+4xGgT0bK3vzy1HLN8jTO975HEbuYzZJcHoQEY5K1a0z8YayJkyVETa08eNTg==}
+    engines: {node: '>=18'}
+    dependencies:
+      whatwg-mimetype: 4.0.0
+      whatwg-url: 14.0.0
+    dev: true
+
+  /date-fns-tz@2.0.0(date-fns@2.30.0):
+    resolution: {integrity: sha512-OAtcLdB9vxSXTWHdT8b398ARImVwQMyjfYGkKD2zaGpHseG2UPHbHjXELReErZFxWdSLph3c2zOaaTyHfOhERQ==}
+    peerDependencies:
+      date-fns: '>=2.0.0'
+    dependencies:
+      date-fns: 2.30.0
+    dev: false
+
   /date-fns@2.30.0:
     resolution: {integrity: sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==}
     engines: {node: '>=0.11'}
@@ -10806,18 +14083,6 @@ packages:
       supports-color: 8.1.1
     dev: true
 
-  /debug@4.3.2:
-    resolution: {integrity: sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==}
-    engines: {node: '>=6.0'}
-    peerDependencies:
-      supports-color: '*'
-    peerDependenciesMeta:
-      supports-color:
-        optional: true
-    dependencies:
-      ms: 2.1.2
-    dev: false
-
   /debug@4.3.4(supports-color@8.1.1):
     resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==}
     engines: {node: '>=6.0'}
@@ -10832,12 +14097,12 @@ packages:
 
   /debuglog@1.0.1:
     resolution: {integrity: sha512-syBZ+rnAK3EgMsH2aYEOLUW7mZSY9Gb+0wUMCFsZvcmiz+HigA0LOcq/HoQqVuGG+EKykunc7QG2bzrponfaSw==}
+    deprecated: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.
     dev: false
 
   /decamelize@1.2.0:
     resolution: {integrity: sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==}
     engines: {node: '>=0.10.0'}
-    dev: true
 
   /decimal.js@10.4.3:
     resolution: {integrity: sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==}
@@ -10856,6 +14121,13 @@ packages:
         optional: true
     dev: true
 
+  /deep-eql@4.0.0:
+    resolution: {integrity: sha512-GxJC5MOg2KyQlv6WiUF/VAnMj4MWnYiXo4oLgeptOELVoknyErb4Z8+5F/IM/K4g9/80YzzatxmWcyRwUseH0A==}
+    engines: {node: '>=6'}
+    dependencies:
+      type-detect: 4.0.8
+    dev: false
+
   /deep-eql@4.1.3:
     resolution: {integrity: sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw==}
     engines: {node: '>=6'}
@@ -10868,9 +14140,9 @@ packages:
     dependencies:
       call-bind: 1.0.2
       es-get-iterator: 1.1.3
-      get-intrinsic: 1.1.3
+      get-intrinsic: 1.2.1
       is-arguments: 1.1.1
-      is-array-buffer: 3.0.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
@@ -10878,11 +14150,11 @@ packages:
       object-is: 1.1.5
       object-keys: 1.1.1
       object.assign: 4.1.4
-      regexp.prototype.flags: 1.4.3
+      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.9
+      which-typed-array: 1.1.11
 
   /deep-is@0.1.4:
     resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==}
@@ -10891,6 +14163,10 @@ packages:
     resolution: {integrity: sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==}
     engines: {node: '>=0.10.0'}
 
+  /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'}
@@ -10911,31 +14187,25 @@ packages:
     engines: {node: '>= 0.10'}
     dev: true
 
-  /default-user-agent@1.0.0:
-    resolution: {integrity: sha512-bDF7bg6OSNcSwFWPu4zYKpVkJZQYVrAANMYB8bc9Szem1D0yKdm4sa/rOCs2aC9+2GMqQ7KnwtZRvDhmLF0dXw==}
-    engines: {node: '>= 0.10.0'}
-    dependencies:
-      os-name: 1.0.3
-    dev: false
-
   /defaults@1.0.4:
     resolution: {integrity: sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==}
     dependencies:
       clone: 1.0.4
     dev: true
 
+  /define-data-property@1.1.1:
+    resolution: {integrity: sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      get-intrinsic: 1.2.1
+      gopd: 1.0.1
+      has-property-descriptors: 1.0.0
+    dev: false
+
   /define-lazy-prop@2.0.0:
     resolution: {integrity: sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==}
     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
-    dev: true
-
   /define-properties@1.2.0:
     resolution: {integrity: sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==}
     engines: {node: '>= 0.4'}
@@ -10943,6 +14213,15 @@ packages:
       has-property-descriptors: 1.0.0
       object-keys: 1.1.1
 
+  /define-properties@1.2.1:
+    resolution: {integrity: sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      define-data-property: 1.1.1
+      has-property-descriptors: 1.0.0
+      object-keys: 1.1.1
+    dev: false
+
   /define-property@0.2.5:
     resolution: {integrity: sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==}
     engines: {node: '>=0.10.0'}
@@ -10969,6 +14248,10 @@ packages:
     resolution: {integrity: sha512-+uO4+qr7msjNNWKYPHqN/3+Dx3NFkmIzayk2L1MyZQlvgZb/J1A0fo410dpKrN2SnqFjt8n4JL8fDJE0wIgjFQ==}
     dev: true
 
+  /defu@6.1.3:
+    resolution: {integrity: sha512-Vy2wmG3NTkmHNg/kzpuvHhkqeIx3ODWqasgCRbKtbXEN0G+HpEEv9BtJLp7ZG1CZloFaC41Ah3ZFbq7aqCqMeQ==}
+    dev: true
+
   /del@6.1.1:
     resolution: {integrity: sha512-ua8BhapfP0JUJKC/zV9yHHDW/rDoDxP4Zhn3AkA6/xT6gY7jYXJiaeyBZznYVujhZZET+UgcbZiQ7sN3WqcImg==}
     engines: {node: '>=10'}
@@ -11003,7 +14286,6 @@ packages:
     resolution: {integrity: sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==}
     engines: {node: '>= 0.6'}
     dev: false
-    optional: true
 
   /depd@2.0.0:
     resolution: {integrity: sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==}
@@ -11038,6 +14320,10 @@ packages:
     engines: {node: '>=8'}
     dev: true
 
+  /detect-node-es@1.1.0:
+    resolution: {integrity: sha512-ypdmJU/TbBby2Dxibuv7ZLW3Bs1QEmM7nHjEANfohJLvE0XVujisn1qPJcZxg+qDucsr+bP6fLD1rPS3AhJ7EQ==}
+    dev: true
+
   /detect-package-manager@2.0.1:
     resolution: {integrity: sha512-j/lJHyoLlWi6G1LDdLgvUtz60Zo5GEj+sVYtTVXnYLDPuzgC3llMxonXym9zIwhhUII8vjdw0LXxavpLqTbl1A==}
     engines: {node: '>=12'}
@@ -11066,9 +14352,20 @@ packages:
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dev: true
 
-  /digest-header@1.1.0:
-    resolution: {integrity: sha512-glXVh42vz40yZb9Cq2oMOt70FIoWiv+vxNvdKdU8CwjLad25qHM3trLxhl9bVjdr6WaslIXhWpn0NO8T/67Qjg==}
-    engines: {node: '>= 8.0.0'}
+  /diff-sequences@29.6.3:
+    resolution: {integrity: sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    dev: true
+
+  /digest-fetch@1.3.0:
+    resolution: {integrity: sha512-CGJuv6iKNM7QyZlM2T3sPAdZWd/p9zQiRNS9G+9COUCwzWFTs0Xp8NF5iePx7wtvhDykReiRRrSeNb4oMmB8lA==}
+    dependencies:
+      base-64: 0.1.0
+      md5: 2.3.0
+    dev: false
+
+  /dingbat-to-unicode@1.0.1:
+    resolution: {integrity: sha512-98l0sW87ZT58pU4i61wa2OHwxbiYSbuxsCBozaVnYX2iCnr3bLM3fIes1/ej7h1YdOKuKt/MLs706TVnALA65w==}
     dev: false
 
   /dir-glob@3.0.1:
@@ -11177,11 +14474,6 @@ packages:
     engines: {node: '>=12'}
     dev: true
 
-  /dotenv@16.0.3:
-    resolution: {integrity: sha512-7GO6HghkA5fYG9TYnNxi14/7K9f5occMlp3zXAuSxn7CKCxt9xbNWG7yF8hTCSUchlfWSe3uLmlPfigevRItzQ==}
-    engines: {node: '>=12'}
-    dev: false
-
   /dotenv@16.3.1:
     resolution: {integrity: sha512-IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ==}
     engines: {node: '>=12'}
@@ -11198,6 +14490,12 @@ packages:
       wordwrap: 1.0.0
     dev: false
 
+  /duck@0.1.12:
+    resolution: {integrity: sha512-wkctla1O6VfP89gQ+J/yDesM0S7B7XLXjKGzXxMDVFg7uEn706niAtyYovKbyq1oT9YwDcly721/iUWoc8MVRg==}
+    dependencies:
+      underscore: 1.13.6
+    dev: false
+
   /duplexer@0.1.2:
     resolution: {integrity: sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==}
     dev: true
@@ -11327,8 +14625,6 @@ packages:
     resolution: {integrity: sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==}
     dependencies:
       iconv-lite: 0.6.3
-    dev: false
-    optional: true
 
   /end-of-stream@1.4.4:
     resolution: {integrity: sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==}
@@ -11383,63 +14679,29 @@ packages:
     hasBin: true
     dev: true
 
+  /epub2@3.0.1(ts-toolbelt@9.6.0):
+    resolution: {integrity: sha512-qwAPzDvcfKOZza1FU38BHo7qyiHMZXpJKVkdLK7I+wHi4nUhIhh+6qQbOGxPdiPaqAuI985d/nIUuJmbZ1ACrA==}
+    dependencies:
+      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.1
+      xml2js: 0.5.0
+    transitivePeerDependencies:
+      - ts-toolbelt
+    dev: false
+
   /err-code@2.0.3:
     resolution: {integrity: sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==}
     dev: false
 
-  /errno@0.1.8:
-    resolution: {integrity: sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==}
-    hasBin: true
-    dependencies:
-      prr: 1.0.1
-    dev: true
-    optional: true
-
   /error-ex@1.3.2:
     resolution: {integrity: sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==}
     dependencies:
       is-arrayish: 0.2.1
     dev: true
 
-  /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.2.1
-      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.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.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.5.0
-      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.11
-    dev: true
-
   /es-abstract@1.22.1:
     resolution: {integrity: sha512-ioRRcXMO6OFyRpyzV3kE1IIBd4WG5/kltnzdxSCqoP8CMGs/Li+M1uF5o7lOkZVFjDs+NLesthnF66Pg/0q0Lw==}
     engines: {node: '>= 0.4'}
@@ -11490,7 +14752,7 @@ packages:
     dependencies:
       define-properties: 1.2.0
       es-abstract: 1.22.1
-      function-bind: 1.1.1
+      function-bind: 1.1.2
       functions-have-names: 1.2.3
       get-intrinsic: 1.2.1
       globalthis: 1.0.3
@@ -11547,7 +14809,6 @@ packages:
       es6-iterator: 2.0.3
       es6-symbol: 3.1.3
       next-tick: 1.1.0
-    dev: true
 
   /es6-iterator@2.0.3:
     resolution: {integrity: sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==}
@@ -11555,7 +14816,6 @@ packages:
       d: 1.0.1
       es5-ext: 0.10.62
       es6-symbol: 3.1.3
-    dev: true
 
   /es6-object-assign@1.1.0:
     resolution: {integrity: sha512-MEl9uirslVwqQU369iHNWZXsI8yaZYGg/D65aOgZkeyFJwHYSxilf7rQzXKI7DdDuBPrBXbfk3sl9hJhmd5AUw==}
@@ -11565,7 +14825,6 @@ packages:
     dependencies:
       d: 1.0.1
       ext: 1.7.0
-    dev: true
 
   /es6-weak-map@2.0.3:
     resolution: {integrity: sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==}
@@ -11580,8 +14839,8 @@ packages:
     resolution: {integrity: sha512-jyfL/pwPqaFXyKnj8lP8iLk6Z0m099uXR45aSN8Av1XD4vhvQutxxPzgA2bTcAwQpa1zCXDcWOlhFgyP3GKqhQ==}
     dev: true
 
-  /esbuild-register@3.4.2(esbuild@0.18.17):
-    resolution: {integrity: sha512-kG/XyTDyz6+YDuyfB9ZoSIOOmgyFCH+xPRtsCa8W85HLRV5Csp+o3jWVbOSHgSLfyLc5DmP+KFDNwty4mEjC+Q==}
+  /esbuild-register@3.5.0(esbuild@0.18.17):
+    resolution: {integrity: sha512-+4G/XmakeBAsvJuDugJvtyF1x+XJT4FMocynNpxrvEBViirpfUn2PgNpCHedfWhF4WokNsO/OvMKrmJOIJsI5A==}
     peerDependencies:
       esbuild: '>=0.12 <1'
     dependencies:
@@ -11620,6 +14879,35 @@ packages:
       '@esbuild/win32-x64': 0.18.17
     dev: true
 
+  /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
+
   /escalade@3.1.1:
     resolution: {integrity: sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==}
     engines: {node: '>=6'}
@@ -11634,7 +14922,6 @@ packages:
   /escape-string-regexp@2.0.0:
     resolution: {integrity: sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==}
     engines: {node: '>=8'}
-    dev: true
 
   /escape-string-regexp@4.0.0:
     resolution: {integrity: sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==}
@@ -11666,7 +14953,7 @@ packages:
       source-map: 0.6.1
     dev: true
 
-  /eslint-config-airbnb-base@15.0.0(eslint-plugin-import@2.28.0)(eslint@8.45.0):
+  /eslint-config-airbnb-base@15.0.0(eslint-plugin-import@2.29.0)(eslint@8.54.0):
     resolution: {integrity: sha512-xaX3z4ZZIcFLvh2oUNvcX5oEofXda7giYmuplVxoOg5A7EXJMrUyqRgR+mhDhPK8LZ4PttFOBvCYDbX3sUoUig==}
     engines: {node: ^10.12.0 || >=12.0.0}
     peerDependencies:
@@ -11674,14 +14961,14 @@ packages:
       eslint-plugin-import: ^2.25.2
     dependencies:
       confusing-browser-globals: 1.0.11
-      eslint: 8.45.0
-      eslint-plugin-import: 2.28.0(@typescript-eslint/parser@6.2.0)(eslint-import-resolver-typescript@3.5.5)(eslint@8.45.0)
+      eslint: 8.54.0
+      eslint-plugin-import: 2.29.0(@typescript-eslint/parser@6.12.0)(eslint-import-resolver-typescript@3.6.1)(eslint@8.54.0)
       object.assign: 4.1.4
       object.entries: 1.1.5
       semver: 7.5.4
     dev: true
 
-  /eslint-config-airbnb-typescript@17.1.0(@typescript-eslint/eslint-plugin@6.2.0)(@typescript-eslint/parser@6.2.0)(eslint-plugin-import@2.28.0)(eslint@8.45.0):
+  /eslint-config-airbnb-typescript@17.1.0(@typescript-eslint/eslint-plugin@6.12.0)(@typescript-eslint/parser@6.12.0)(eslint-plugin-import@2.29.0)(eslint@8.54.0):
     resolution: {integrity: sha512-GPxI5URre6dDpJ0CtcthSZVBAfI+Uw7un5OYNVxP2EYi3H81Jw701yFP7AU+/vCE7xBtFmjge7kfhhk4+RAiig==}
     peerDependencies:
       '@typescript-eslint/eslint-plugin': ^5.13.0 || ^6.0.0
@@ -11689,38 +14976,47 @@ packages:
       eslint: ^7.32.0 || ^8.2.0
       eslint-plugin-import: ^2.25.3
     dependencies:
-      '@typescript-eslint/eslint-plugin': 6.2.0(@typescript-eslint/parser@6.2.0)(eslint@8.45.0)(typescript@5.2.2)
-      '@typescript-eslint/parser': 6.2.0(eslint@8.45.0)(typescript@5.2.2)
-      eslint: 8.45.0
-      eslint-config-airbnb-base: 15.0.0(eslint-plugin-import@2.28.0)(eslint@8.45.0)
-      eslint-plugin-import: 2.28.0(@typescript-eslint/parser@6.2.0)(eslint-import-resolver-typescript@3.5.5)(eslint@8.45.0)
+      '@typescript-eslint/eslint-plugin': 6.12.0(@typescript-eslint/parser@6.12.0)(eslint@8.54.0)(typescript@5.3.2)
+      '@typescript-eslint/parser': 6.12.0(eslint@8.54.0)(typescript@5.3.2)
+      eslint: 8.54.0
+      eslint-config-airbnb-base: 15.0.0(eslint-plugin-import@2.29.0)(eslint@8.54.0)
+      eslint-plugin-import: 2.29.0(@typescript-eslint/parser@6.12.0)(eslint-import-resolver-typescript@3.6.1)(eslint@8.54.0)
     dev: true
 
-  /eslint-config-prettier@8.9.0(eslint@8.45.0):
-    resolution: {integrity: sha512-+sbni7NfVXnOpnRadUA8S28AUlsZt9GjgFvABIRL9Hkn8KqNzOp+7Lw4QWtrwn20KzU3wqu1QoOj2m+7rKRqkA==}
+  /eslint-config-prettier@8.10.0(eslint@8.54.0):
+    resolution: {integrity: sha512-SM8AMJdeQqRYT9O9zguiruQZaN7+z+E4eAP9oiLNGKMtomwaB1E9dcgUD6ZAn/eQAb52USbvezbiljfZUhbJcg==}
     hasBin: true
     peerDependencies:
       eslint: '>=7.0.0'
     dependencies:
-      eslint: 8.45.0
+      eslint: 8.54.0
+    dev: true
+
+  /eslint-config-prettier@9.0.0(eslint@8.54.0):
+    resolution: {integrity: sha512-IcJsTkJae2S35pRsRAwoCE+925rJJStOdkKnLVgtE+tEpqU0EVVM7OqrwxqgptKdX29NUwC82I5pXsGFIgSevw==}
+    hasBin: true
+    peerDependencies:
+      eslint: '>=7.0.0'
+    dependencies:
+      eslint: 8.54.0
     dev: true
 
   /eslint-config-riot@1.0.0:
     resolution: {integrity: sha512-NB/L/1Y30qyJcG5xZxCJKW/+bqyj+llbcCwo9DEz8bESIP0SLTOQ8T1DWCCFc+wJ61AMEstj4511PSScqMMfCw==}
     dev: false
 
-  /eslint-import-resolver-node@0.3.7:
-    resolution: {integrity: sha512-gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA==}
+  /eslint-import-resolver-node@0.3.9:
+    resolution: {integrity: sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==}
     dependencies:
       debug: 3.2.7(supports-color@5.5.0)
-      is-core-module: 2.12.1
-      resolve: 1.22.3
+      is-core-module: 2.13.1
+      resolve: 1.22.8
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /eslint-import-resolver-typescript@3.5.5(@typescript-eslint/parser@6.2.0)(eslint-plugin-import@2.28.0)(eslint@8.45.0):
-    resolution: {integrity: sha512-TdJqPHs2lW5J9Zpe17DZNQuDnox4xo2o+0tE7Pggain9Rbc19ik8kFtXdxZ250FVx2kF4vlt2RSf4qlUpG7bhw==}
+  /eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@6.12.0)(eslint-plugin-import@2.29.0)(eslint@8.54.0):
+    resolution: {integrity: sha512-xgdptdoi5W3niYeuQxKmzVDTATvLYqhpwmykwsh7f6HIOStGWEIL9iqZgQDF9u9OEzrRwR8no5q2VT+bjAujTg==}
     engines: {node: ^14.18.0 || >=16.0.0}
     peerDependencies:
       eslint: '*'
@@ -11728,14 +15024,13 @@ packages:
     dependencies:
       debug: 4.3.4(supports-color@8.1.1)
       enhanced-resolve: 5.13.0
-      eslint: 8.45.0
-      eslint-module-utils: 2.7.4(@typescript-eslint/parser@6.2.0)(eslint-import-resolver-typescript@3.5.5)(eslint@8.45.0)
-      eslint-plugin-import: 2.28.0(@typescript-eslint/parser@6.2.0)(eslint-import-resolver-typescript@3.5.5)(eslint@8.45.0)
+      eslint: 8.54.0
+      eslint-module-utils: 2.8.0(@typescript-eslint/parser@6.12.0)(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1)(eslint@8.54.0)
+      eslint-plugin-import: 2.29.0(@typescript-eslint/parser@6.12.0)(eslint-import-resolver-typescript@3.6.1)(eslint@8.54.0)
+      fast-glob: 3.3.2
       get-tsconfig: 4.5.0
-      globby: 13.1.3
-      is-core-module: 2.11.0
+      is-core-module: 2.13.1
       is-glob: 4.0.3
-      synckit: 0.8.5
     transitivePeerDependencies:
       - '@typescript-eslint/parser'
       - eslint-import-resolver-node
@@ -11743,36 +15038,7 @@ packages:
       - supports-color
     dev: true
 
-  /eslint-module-utils@2.7.4(@typescript-eslint/parser@6.2.0)(eslint-import-resolver-typescript@3.5.5)(eslint@8.45.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
-    dependencies:
-      '@typescript-eslint/parser': 6.2.0(eslint@8.45.0)(typescript@5.2.2)
-      debug: 3.2.7(supports-color@5.5.0)
-      eslint: 8.45.0
-      eslint-import-resolver-typescript: 3.5.5(@typescript-eslint/parser@6.2.0)(eslint-plugin-import@2.28.0)(eslint@8.45.0)
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /eslint-module-utils@2.8.0(@typescript-eslint/parser@6.2.0)(eslint-import-resolver-node@0.3.7)(eslint-import-resolver-typescript@3.5.5)(eslint@8.45.0):
+  /eslint-module-utils@2.8.0(@typescript-eslint/parser@6.12.0)(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1)(eslint@8.54.0):
     resolution: {integrity: sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==}
     engines: {node: '>=4'}
     peerDependencies:
@@ -11793,17 +15059,17 @@ packages:
       eslint-import-resolver-webpack:
         optional: true
     dependencies:
-      '@typescript-eslint/parser': 6.2.0(eslint@8.45.0)(typescript@5.2.2)
+      '@typescript-eslint/parser': 6.12.0(eslint@8.54.0)(typescript@5.3.2)
       debug: 3.2.7(supports-color@5.5.0)
-      eslint: 8.45.0
-      eslint-import-resolver-node: 0.3.7
-      eslint-import-resolver-typescript: 3.5.5(@typescript-eslint/parser@6.2.0)(eslint-plugin-import@2.28.0)(eslint@8.45.0)
+      eslint: 8.54.0
+      eslint-import-resolver-node: 0.3.9
+      eslint-import-resolver-typescript: 3.6.1(@typescript-eslint/parser@6.12.0)(eslint-plugin-import@2.29.0)(eslint@8.54.0)
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /eslint-plugin-import@2.28.0(@typescript-eslint/parser@6.2.0)(eslint-import-resolver-typescript@3.5.5)(eslint@8.45.0):
-    resolution: {integrity: sha512-B8s/n+ZluN7sxj9eUf7/pRFERX0r5bnFA2dCaLHy2ZeaQEAz0k+ZZkFWRFHJAqxfxQDx6KLv9LeIki7cFdwW+Q==}
+  /eslint-plugin-import@2.29.0(@typescript-eslint/parser@6.12.0)(eslint-import-resolver-typescript@3.6.1)(eslint@8.54.0):
+    resolution: {integrity: sha512-QPOO5NO6Odv5lpoTkddtutccQjysJuFxoPS7fAHO+9m9udNHvTCPSAMW9zGAYj8lAIdr40I8yPCdUYrncXtrwg==}
     engines: {node: '>=4'}
     peerDependencies:
       '@typescript-eslint/parser': '*'
@@ -11812,24 +15078,23 @@ packages:
       '@typescript-eslint/parser':
         optional: true
     dependencies:
-      '@typescript-eslint/parser': 6.2.0(eslint@8.45.0)(typescript@5.2.2)
-      array-includes: 3.1.6
-      array.prototype.findlastindex: 1.2.2
-      array.prototype.flat: 1.3.1
-      array.prototype.flatmap: 1.3.1
+      '@typescript-eslint/parser': 6.12.0(eslint@8.54.0)(typescript@5.3.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.45.0
-      eslint-import-resolver-node: 0.3.7
-      eslint-module-utils: 2.8.0(@typescript-eslint/parser@6.2.0)(eslint-import-resolver-node@0.3.7)(eslint-import-resolver-typescript@3.5.5)(eslint@8.45.0)
-      has: 1.0.3
-      is-core-module: 2.12.1
+      eslint: 8.54.0
+      eslint-import-resolver-node: 0.3.9
+      eslint-module-utils: 2.8.0(@typescript-eslint/parser@6.12.0)(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1)(eslint@8.54.0)
+      hasown: 2.0.0
+      is-core-module: 2.13.1
       is-glob: 4.0.3
       minimatch: 3.1.2
-      object.fromentries: 2.0.6
-      object.groupby: 1.0.0
-      object.values: 1.1.6
-      resolve: 1.22.3
+      object.fromentries: 2.0.7
+      object.groupby: 1.0.1
+      object.values: 1.1.7
       semver: 7.5.4
       tsconfig-paths: 4.2.0
     transitivePeerDependencies:
@@ -11842,11 +15107,11 @@ packages:
     resolution: {integrity: sha512-qe6sVFDP1Vj5eXlqZxYZpIjwYvhuqXlI0P8OfPyhiPOhMkFtr0TpFphD8/6WCzkm7LJCvG1eJEzURCtMIsFTAg==}
     dev: true
 
-  /eslint-plugin-n8n-nodes-base@1.16.0(eslint@8.45.0)(typescript@5.2.2):
+  /eslint-plugin-n8n-nodes-base@1.16.0(eslint@8.54.0)(typescript@5.3.2):
     resolution: {integrity: sha512-OEztJRuT/jv/WvwRXbXNirdYYddpAo2KZEJeOsVniK1ZCChuG4rrZJU3sgMRZMK6W9Pr613uWabW2q8tU2eKJg==}
     engines: {node: '>=18.10', pnpm: '>=8.6'}
     dependencies:
-      '@typescript-eslint/utils': 6.3.0(eslint@8.45.0)(typescript@5.2.2)
+      '@typescript-eslint/utils': 6.7.5(eslint@8.54.0)(typescript@5.3.2)
       camel-case: 4.1.2
       indefinite: 2.4.3
       pascal-case: 3.1.2
@@ -11859,44 +15124,65 @@ packages:
       - typescript
     dev: true
 
-  /eslint-plugin-prettier@5.0.0(@types/eslint@8.44.1)(eslint-config-prettier@8.9.0)(eslint@8.45.0)(prettier@3.0.3):
-    resolution: {integrity: sha512-AgaZCVuYDXHUGxj/ZGu1u8H8CYgDY3iG6w5kUFw4AzMVXzB7VvbKgYR4nATIN+OvUrghMbiDLeimVjVY5ilq3w==}
+  /eslint-plugin-prettier@5.0.1(@types/eslint@8.44.7)(eslint-config-prettier@8.10.0)(eslint@8.54.0)(prettier@3.1.0):
+    resolution: {integrity: sha512-m3u5RnR56asrwV/lDC4GHorlW75DsFfmUcjfCYylTUs85dBRnB7VM6xG8eCMJdeDRnppzmxZVf1GEPJvl1JmNg==}
     engines: {node: ^14.18.0 || >=16.0.0}
     peerDependencies:
       '@types/eslint': '>=8.0.0'
       eslint: '>=8.0.0'
       eslint-config-prettier: '*'
-      prettier: ^3.0.3
+      prettier: ^3.1.0
     peerDependenciesMeta:
       '@types/eslint':
         optional: true
       eslint-config-prettier:
         optional: true
     dependencies:
-      '@types/eslint': 8.44.1
-      eslint: 8.45.0
-      eslint-config-prettier: 8.9.0(eslint@8.45.0)
-      prettier: 3.0.3
+      '@types/eslint': 8.44.7
+      eslint: 8.54.0
+      eslint-config-prettier: 8.10.0(eslint@8.54.0)
+      prettier: 3.1.0
       prettier-linter-helpers: 1.0.0
       synckit: 0.8.5
     dev: true
 
-  /eslint-plugin-unicorn@48.0.1(eslint@8.45.0):
-    resolution: {integrity: sha512-FW+4r20myG/DqFcCSzoumaddKBicIPeFnTrifon2mWIzlfyvzwyqZjqVP7m4Cqr/ZYisS2aiLghkUWaPg6vtCw==}
+  /eslint-plugin-prettier@5.0.1(@types/eslint@8.44.7)(eslint-config-prettier@9.0.0)(eslint@8.54.0)(prettier@3.1.0):
+    resolution: {integrity: sha512-m3u5RnR56asrwV/lDC4GHorlW75DsFfmUcjfCYylTUs85dBRnB7VM6xG8eCMJdeDRnppzmxZVf1GEPJvl1JmNg==}
+    engines: {node: ^14.18.0 || >=16.0.0}
+    peerDependencies:
+      '@types/eslint': '>=8.0.0'
+      eslint: '>=8.0.0'
+      eslint-config-prettier: '*'
+      prettier: ^3.1.0
+    peerDependenciesMeta:
+      '@types/eslint':
+        optional: true
+      eslint-config-prettier:
+        optional: true
+    dependencies:
+      '@types/eslint': 8.44.7
+      eslint: 8.54.0
+      eslint-config-prettier: 9.0.0(eslint@8.54.0)
+      prettier: 3.1.0
+      prettier-linter-helpers: 1.0.0
+      synckit: 0.8.5
+    dev: true
+
+  /eslint-plugin-unicorn@49.0.0(eslint@8.54.0):
+    resolution: {integrity: sha512-0fHEa/8Pih5cmzFW5L7xMEfUTvI9WKeQtjmKpTUmY+BiFCDxkxrTdnURJOHKykhtwIeyYsxnecbGvDCml++z4Q==}
     engines: {node: '>=16'}
     peerDependencies:
-      eslint: '>=8.44.0'
+      eslint: '>=8.52.0'
     dependencies:
-      '@babel/helper-validator-identifier': 7.22.5
-      '@eslint-community/eslint-utils': 4.4.0(eslint@8.45.0)
+      '@babel/helper-validator-identifier': 7.22.20
+      '@eslint-community/eslint-utils': 4.4.0(eslint@8.54.0)
       ci-info: 3.8.0
       clean-regexp: 1.0.0
-      eslint: 8.45.0
+      eslint: 8.54.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.27
@@ -11905,7 +15191,7 @@ packages:
       strip-indent: 3.0.0
     dev: true
 
-  /eslint-plugin-unused-imports@3.0.0(@typescript-eslint/eslint-plugin@6.2.0)(eslint@8.45.0):
+  /eslint-plugin-unused-imports@3.0.0(@typescript-eslint/eslint-plugin@6.12.0)(eslint@8.54.0):
     resolution: {integrity: sha512-sduiswLJfZHeeBJ+MQaG+xYzSWdRXoSw61DpU13mzWumCkR0ufD0HmO4kdNokjrkluMHpj/7PJeN35pgbhW3kw==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
@@ -11915,24 +15201,24 @@ packages:
       '@typescript-eslint/eslint-plugin':
         optional: true
     dependencies:
-      '@typescript-eslint/eslint-plugin': 6.2.0(@typescript-eslint/parser@6.2.0)(eslint@8.45.0)(typescript@5.2.2)
-      eslint: 8.45.0
+      '@typescript-eslint/eslint-plugin': 6.12.0(@typescript-eslint/parser@6.12.0)(eslint@8.54.0)(typescript@5.3.2)
+      eslint: 8.54.0
       eslint-rule-composer: 0.3.0
     dev: true
 
-  /eslint-plugin-vue@9.15.1(eslint@8.45.0):
-    resolution: {integrity: sha512-CJE/oZOslvmAR9hf8SClTdQ9JLweghT6JCBQNrT2Iel1uVw0W0OLJxzvPd6CxmABKCvLrtyDnqGV37O7KQv6+A==}
+  /eslint-plugin-vue@9.18.1(eslint@8.54.0):
+    resolution: {integrity: sha512-7hZFlrEgg9NIzuVik2I9xSnJA5RsmOfueYgsUGUokEDLJ1LHtxO0Pl4duje1BriZ/jDWb+44tcIlC3yi0tdlZg==}
     engines: {node: ^14.17.0 || >=16.0.0}
     peerDependencies:
       eslint: ^6.2.0 || ^7.0.0 || ^8.0.0
     dependencies:
-      '@eslint-community/eslint-utils': 4.4.0(eslint@8.45.0)
-      eslint: 8.45.0
+      '@eslint-community/eslint-utils': 4.4.0(eslint@8.54.0)
+      eslint: 8.54.0
       natural-compare: 1.4.0
       nth-check: 2.1.1
-      postcss-selector-parser: 6.0.11
+      postcss-selector-parser: 6.0.13
       semver: 7.5.4
-      vue-eslint-parser: 9.3.1(eslint@8.45.0)
+      vue-eslint-parser: 9.3.2(eslint@8.54.0)
       xml-name-validator: 4.0.0
     transitivePeerDependencies:
       - supports-color
@@ -11951,44 +15237,39 @@ packages:
       estraverse: 4.3.0
     dev: true
 
-  /eslint-scope@7.2.0:
-    resolution: {integrity: sha512-DYj5deGlHBfMt15J7rdtyKNq/Nqlv5KfU4iodrQ019XESsRnwXH9KAE0y3cwtUHDo2ob7CypAnCqefh6vioWRw==}
+  /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:
       esrecurse: 4.3.0
       estraverse: 5.3.0
     dev: true
 
-  /eslint-visitor-keys@3.4.0:
-    resolution: {integrity: sha512-HPpKPUBQcAsZOsHAFwTtIKcYlCje62XB7SEAcxjtmW6TD1WVpkS6i6/hOVtTZIl4zGj/mBqpFVGvaDneik+VoQ==}
+  /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}
-    dev: true
 
-  /eslint-visitor-keys@3.4.1:
-    resolution: {integrity: sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    dev: true
-
-  /eslint@8.45.0:
-    resolution: {integrity: sha512-pd8KSxiQpdYRfYa9Wufvdoct3ZPQQuVuU5O6scNgMuOMYuxvH0IGaYK0wUFjo4UYYQQCUndlXiMbnxopwvvTiw==}
+  /eslint@8.54.0:
+    resolution: {integrity: sha512-NY0DfAkM8BIZDVl6PgSa1ttZbx3xHgJzSNJKYcQglem6CppHyMhRIQkBVSSMaSRnLhig3jsDbEzOjwCVt4AmmA==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     hasBin: true
     dependencies:
-      '@eslint-community/eslint-utils': 4.4.0(eslint@8.45.0)
-      '@eslint-community/regexpp': 4.5.0
-      '@eslint/eslintrc': 2.1.0
-      '@eslint/js': 8.44.0
-      '@humanwhocodes/config-array': 0.11.10
+      '@eslint-community/eslint-utils': 4.4.0(eslint@8.54.0)
+      '@eslint-community/regexpp': 4.6.2
+      '@eslint/eslintrc': 2.1.3
+      '@eslint/js': 8.54.0
+      '@humanwhocodes/config-array': 0.11.13
       '@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.0
-      eslint-visitor-keys: 3.4.1
+      eslint-scope: 7.2.2
+      eslint-visitor-keys: 3.4.3
       espree: 9.6.1
       esquery: 1.5.0
       esutils: 2.0.3
@@ -12015,23 +15296,13 @@ packages:
       - supports-color
     dev: true
 
-  /espree@9.5.1:
-    resolution: {integrity: sha512-5yxtHSZXRSW5pvv3hAlXM5+/Oswi1AUFqBmbibKb5s6bp3rGIDkyXU6xCoyuuLhijr4SFwPrXRoZjz0AZDN9tg==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    dependencies:
-      acorn: 8.10.0
-      acorn-jsx: 5.3.2(acorn@8.10.0)
-      eslint-visitor-keys: 3.4.1
-    dev: true
-
   /espree@9.6.1:
     resolution: {integrity: sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
-      acorn: 8.10.0
-      acorn-jsx: 5.3.2(acorn@8.10.0)
-      eslint-visitor-keys: 3.4.1
-    dev: true
+      acorn: 8.11.2
+      acorn-jsx: 5.3.2(acorn@8.11.2)
+      eslint-visitor-keys: 3.4.3
 
   /esprima-next@5.8.4:
     resolution: {integrity: sha512-8nYVZ4ioIH4Msjb/XmhnBdz5WRRBaYqevKa1cv9nGJdCehMbzZCPNEEnqfLCZVetUVrUPEcb5IYyu1GG4hFqgg==}
@@ -12071,7 +15342,6 @@ packages:
   /estraverse@5.3.0:
     resolution: {integrity: sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==}
     engines: {node: '>=4.0'}
-    dev: true
 
   /estree-walker@2.0.2:
     resolution: {integrity: sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==}
@@ -12105,9 +15375,8 @@ packages:
     resolution: {integrity: sha512-tYUSVOGeQPKt/eC1ABfhHy5Xd96N3oIijJvN3O9+TsC28T5V9yX9oEfEK5faP0EFSNVOG97qtAS68GBrQB2hDg==}
     dev: true
 
-  /events@1.1.1:
-    resolution: {integrity: sha512-kEcvvCBByWXGnZy6JUlgAp2gBIUjfCAV6P6TgT1/aaQKcmuAEC4OZTV1I4EWQLz2gxZw76atuVyvHhTxvi0Flw==}
-    engines: {node: '>=0.4.x'}
+  /eventemitter3@4.0.7:
+    resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
     dev: false
 
   /events@3.3.0:
@@ -12162,6 +15431,21 @@ packages:
       strip-final-newline: 2.0.0
     dev: true
 
+  /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
+
   /executable@4.1.1:
     resolution: {integrity: sha512-8iA79xD3uAch729dUG8xaaBBFGaEa0wdD2VkYLFHwlqosEj/jT66AzcreRDSgV7ehnNLBW2WR5jIXwGKjVdTLg==}
     engines: {node: '>=4'}
@@ -12218,6 +15502,10 @@ packages:
       jest-util: 29.6.2
     dev: true
 
+  /expr-eval@2.0.2:
+    resolution: {integrity: sha512-4EMSHGOPSwAfBiibw3ndnP0AvjDWLsMvGOvWEZ2F96IGk0bIVdjQisOHxReSkE13mHcfbuCiXw+G4y0zv6N8Eg==}
+    dev: false
+
   /express-async-errors@3.1.1(express@4.18.2):
     resolution: {integrity: sha512-h6aK1da4tpqWSbyCa3FxB/V6Ehd4EEB15zyQq9qe75OZBp0krinNKuH4rAY+S/U/2I36vdLAUFSjQJ+TFmODng==}
     peerDependencies:
@@ -12230,7 +15518,7 @@ packages:
     resolution: {integrity: sha512-W7QuI8i4jjxGNqZJebXzugHuJV32uGTMWqSzqTKsgBTPVsWR3oYR2b9VNQ53vmWbUH1G8r/9GIO3WCqa1Myf1w==}
     engines: {node: '>=v16'}
     dependencies:
-      glob: 9.3.1
+      glob: 9.3.2
       graceful-fs: 4.2.10
       handlebars: 4.7.7
     dev: false
@@ -12263,6 +15551,15 @@ packages:
       url-value-parser: 2.2.0
     dev: false
 
+  /express-rate-limit@7.1.3(express@4.18.2):
+    resolution: {integrity: sha512-BDes6WeNYSGRRGQU8QDNwUnwqaBro28HN/TTweM3RlxXRHDld8RLoH7tbfCxAc0hamQyn6aL0KrfR45+ZxknYg==}
+    engines: {node: '>= 16'}
+    peerDependencies:
+      express: 4 || 5 || ^5.0.0-beta.1
+    dependencies:
+      express: 4.18.2
+    dev: false
+
   /express@4.18.2:
     resolution: {integrity: sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==}
     engines: {node: '>= 0.10.0'}
@@ -12305,13 +15602,13 @@ packages:
     resolution: {integrity: sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==}
     dependencies:
       type: 2.7.2
-    dev: true
 
   /extend-shallow@2.0.1:
     resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
     engines: {node: '>=0.10.0'}
     dependencies:
       is-extendable: 0.1.1
+    dev: true
 
   /extend-shallow@3.0.2:
     resolution: {integrity: sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==}
@@ -12416,6 +15713,17 @@ packages:
       merge2: 1.4.1
       micromatch: 4.0.5
 
+  /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
+
   /fast-json-stable-stringify@2.1.0:
     resolution: {integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==}
 
@@ -12428,7 +15736,6 @@ packages:
 
   /fast-safe-stringify@2.1.1:
     resolution: {integrity: sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==}
-    dev: true
 
   /fast-text-encoding@1.0.6:
     resolution: {integrity: sha512-VhXlQgj9ioXCqGstD37E/HBeqEGV/qOD/kmbVG8h5xKBYvM1L3lR1Zn4555cQ8GkYbJa8aJSipLPndE1k6zK2w==}
@@ -12440,7 +15747,6 @@ packages:
     dependencies:
       strnum: 1.0.5
     dev: false
-    optional: true
 
   /fast-xml-parser@4.2.7:
     resolution: {integrity: sha512-J8r6BriSLO1uj2miOk1NW0YVm8AGOOu3Si2HQp/cSmo6EA4m3fcwu2WKjJ4RK9wMLBtg69y1kS8baDiQBR41Ig==}
@@ -12449,6 +15755,11 @@ packages:
       strnum: 1.0.5
     dev: false
 
+  /fastest-levenshtein@1.0.16:
+    resolution: {integrity: sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==}
+    engines: {node: '>= 4.9.1'}
+    dev: false
+
   /fastq@1.15.0:
     resolution: {integrity: sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==}
     dependencies:
@@ -12674,6 +15985,11 @@ packages:
       rimraf: 3.0.2
     dev: true
 
+  /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==}
 
@@ -12705,18 +16021,6 @@ packages:
       debug: 3.2.7(supports-color@5.5.0)
     dev: false
 
-  /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
-    dependencies:
-      debug: 4.3.2
-    dev: false
-
   /follow-redirects@1.15.2(debug@4.3.4):
     resolution: {integrity: sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==}
     engines: {node: '>=4.0'}
@@ -12750,13 +16054,17 @@ packages:
     engines: {node: '>=14'}
     dependencies:
       cross-spawn: 7.0.3
-      signal-exit: 4.0.2
+      signal-exit: 4.1.0
     dev: true
 
   /forever-agent@0.6.1:
     resolution: {integrity: sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==}
     dev: true
 
+  /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'}
@@ -12791,6 +16099,14 @@ packages:
       combined-stream: 1.0.8
       mime-types: 2.1.35
 
+  /formdata-node@4.4.1:
+    resolution: {integrity: sha512-0iirZp3uVDjVGt9p49aTaqjk84TrglENEDuqfdlZQ1roC9CWlPk6Avf8EEnZNcAqPonwkG35x4n3ww/1THYAeQ==}
+    engines: {node: '>= 12.20'}
+    dependencies:
+      node-domexception: 1.0.0
+      web-streams-polyfill: 4.0.0-beta.3
+    dev: false
+
   /formidable@2.1.2:
     resolution: {integrity: sha512-CM3GuJ57US06mlpQ47YcunuUZ9jpm8Vx+P2CGt2j7HpgkKZO/DJYQ0Bobim8G6PFQmK5lOqOOdUXboU+h73A4g==}
     dependencies:
@@ -12798,7 +16114,6 @@ packages:
       hexoid: 1.0.0
       once: 1.4.0
       qs: 6.11.0
-    dev: true
 
   /formidable@3.5.0:
     resolution: {integrity: sha512-WwsMWvPmY+Kv37C3+KP3A+2Ym1aZoac4nz4ZEe5z0UPBoCg0O/wHay3eeYkZr4KJIbCzpSUeno+STMhde+KCfw==}
@@ -12808,14 +16123,6 @@ packages:
       once: 1.4.0
     dev: false
 
-  /formstream@1.1.1:
-    resolution: {integrity: sha512-yHRxt3qLFnhsKAfhReM4w17jP+U1OlhUjnKPPtonwKbIJO7oBP0MvoxkRUwb8AU9n0MIkYy5X5dK6pQnbj+R2Q==}
-    dependencies:
-      destroy: 1.2.0
-      mime: 2.6.0
-      pause-stream: 0.0.11
-    dev: false
-
   /forwarded@0.2.0:
     resolution: {integrity: sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==}
     engines: {node: '>= 0.6'}
@@ -12860,6 +16167,15 @@ packages:
       universalify: 0.1.2
     dev: true
 
+  /fs-extra@7.0.1:
+    resolution: {integrity: sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==}
+    engines: {node: '>=6 <7 || >=8'}
+    dependencies:
+      graceful-fs: 4.2.10
+      jsonfile: 4.0.0
+      universalify: 0.1.2
+    dev: true
+
   /fs-extra@8.1.0:
     resolution: {integrity: sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==}
     engines: {node: '>=6 <7 || >=8'}
@@ -12894,14 +16210,14 @@ packages:
   /fs.realpath@1.0.0:
     resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==}
 
-  /fsevents@2.3.2:
-    resolution: {integrity: sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==}
+  /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.1:
-    resolution: {integrity: sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==}
+  /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==}
@@ -12951,7 +16267,7 @@ packages:
       extend: 3.0.2
       https-proxy-agent: 5.0.1
       is-stream: 2.0.1
-      node-fetch: 2.6.8
+      node-fetch: 2.7.0(encoding@0.1.13)
     transitivePeerDependencies:
       - encoding
       - supports-color
@@ -12991,25 +16307,23 @@ packages:
     resolution: {integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==}
     engines: {node: 6.* || 8.* || >= 10.*}
 
-  /get-func-name@2.0.0:
-    resolution: {integrity: sha512-Hm0ixYtaSZ/V7C8FJrtZIuBBI+iSgL+1Aq82zSu8VQNB4S3Gk8e7Qs3VwBDJAhmRZcFqkl3tQu36g/Foh5I5ig==}
+  /get-func-name@2.0.2:
+    resolution: {integrity: sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==}
     dev: true
 
-  /get-intrinsic@1.1.3:
-    resolution: {integrity: sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==}
-    dependencies:
-      function-bind: 1.1.1
-      has: 1.0.3
-      has-symbols: 1.0.3
-
   /get-intrinsic@1.2.1:
     resolution: {integrity: sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==}
     dependencies:
-      function-bind: 1.1.1
+      function-bind: 1.1.2
       has: 1.0.3
       has-proto: 1.0.1
       has-symbols: 1.0.3
 
+  /get-nonce@1.0.1:
+    resolution: {integrity: sha512-FJhYRoDaiatfEkUK8HKlicmu/3SGFD51q3itKDGoSTysQJBnfOcxU5GxnhE1E6soB76MbT0MBtnKJuXyAx+96Q==}
+    engines: {node: '>=6'}
+    dev: true
+
   /get-npm-tarball-url@2.0.3:
     resolution: {integrity: sha512-R/PW6RqyaBQNWYaSyfrh54/qtcnOp22FHCCiRhSSZj0FP3KQWCsxxt0DzIdVTbwTqe9CtQfvl/FPD4UIPt4pqw==}
     engines: {node: '>=12.17'}
@@ -13040,6 +16354,11 @@ packages:
     engines: {node: '>=10'}
     dev: true
 
+  /get-stream@8.0.1:
+    resolution: {integrity: sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==}
+    engines: {node: '>=16'}
+    dev: true
+
   /get-symbol-description@1.0.0:
     resolution: {integrity: sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==}
     engines: {node: '>= 0.4'}
@@ -13157,7 +16476,7 @@ packages:
     dependencies:
       foreground-child: 3.1.1
       jackspeak: 2.2.2
-      minimatch: 9.0.1
+      minimatch: 9.0.3
       minipass: 7.0.2
       path-scurry: 1.10.1
     dev: true
@@ -13182,16 +16501,6 @@ packages:
       minimatch: 5.1.5
       once: 1.4.0
 
-  /glob@9.3.1:
-    resolution: {integrity: sha512-qERvJb7IGsnkx6YYmaaGvDpf77c951hICMdWaFXyH3PlVob8sbPJJyJX0kWkiCWyXUzoy9UOTNjGg0RbD8bYIw==}
-    engines: {node: '>=16 || 14 >=14.17'}
-    dependencies:
-      fs.realpath: 1.0.0
-      minimatch: 7.4.2
-      minipass: 4.2.5
-      path-scurry: 1.6.2
-    dev: false
-
   /glob@9.3.2:
     resolution: {integrity: sha512-BTv/JhKXFEHsErMte/AnfiSv8yYOLLiyH2lTg8vn02O21zWFgHPTfxtgn1QRe7NRgggUhC8hacR2Re94svHqeA==}
     engines: {node: '>=16 || 14 >=14.17'}
@@ -13200,7 +16509,6 @@ packages:
       minimatch: 7.4.2
       minipass: 4.2.5
       path-scurry: 1.10.1
-    dev: true
 
   /global-dirs@3.0.0:
     resolution: {integrity: sha512-v8ho2DS5RiCjftj1nD9NmnfaOzTdud7RRnVd9kFNOjqZbISlx5DQ+OrTkywgd0dIt7oFCvKetZSHoHcP3sDdiA==}
@@ -13269,12 +16577,12 @@ packages:
       merge2: 1.4.1
       slash: 3.0.0
 
-  /globby@13.1.3:
-    resolution: {integrity: sha512-8krCNHXvlCgHDpegPzleMq07yMYTO2sXKASmZmquEYWEmCx6J5UTRbp5RwMJkTJGtcQ44YpiUYUiN0b9mzy8Bw==}
+  /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.2.12
+      fast-glob: 3.3.2
       ignore: 5.2.4
       merge2: 1.4.1
       slash: 4.0.0
@@ -13321,6 +16629,31 @@ packages:
       - supports-color
     dev: false
 
+  /google-gax@3.6.1:
+    resolution: {integrity: sha512-g/lcUjGcB6DSw2HxgEmCDOrI/CByOwqRvsuUvNalHUK2iPPPlmAIpbMbl62u0YufGMr8zgE3JL7th6dCb1Ry+w==}
+    engines: {node: '>=12'}
+    hasBin: 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
+
   /google-p12-pem@4.0.1:
     resolution: {integrity: sha512-WPkN4yGtz05WZ5EhtlxNDWPhC4JIic6G8ePitwUWy4l+XPVYec+a0j0Ts47PDtW59y3RwAhUd9/h9ZZ63px6RQ==}
     engines: {node: '>=12.0.0'}
@@ -13341,14 +16674,16 @@ packages:
   /graceful-fs@4.2.10:
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==}
 
-  /grapheme-splitter@1.0.4:
-    resolution: {integrity: sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==}
-    dev: true
-
   /graphemer@1.4.0:
     resolution: {integrity: sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==}
     dev: true
 
+  /graphlib@2.1.8:
+    resolution: {integrity: sha512-jcLLfkpoVGmH7/InMC/1hIvOPSUh38oJtGhvrOFGzioE1DZ+0YW16RgmOJhHiuWTvGiJQ9Z1Ik43JvkRPRvE+A==}
+    dependencies:
+      lodash: 4.17.21
+    dev: false
+
   /gtoken@6.1.2:
     resolution: {integrity: sha512-4ccGpzz7YAr7lxrT2neugmXQ3hP9ho2gcaityLVkiUecAiwiy60Ii8gRbZeOsXV19fYaRjgBSshs8kXw+NKCPQ==}
     engines: {node: '>=12.0.0'}
@@ -13500,12 +16835,18 @@ packages:
     resolution: {integrity: sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==}
     engines: {node: '>= 0.4.0'}
     dependencies:
-      function-bind: 1.1.1
+      function-bind: 1.1.2
 
   /hash-sum@1.0.2:
     resolution: {integrity: sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==}
     dev: true
 
+  /hasown@2.0.0:
+    resolution: {integrity: sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      function-bind: 1.1.2
+
   /he@1.2.0:
     resolution: {integrity: sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==}
     hasBin: true
@@ -13536,12 +16877,21 @@ packages:
     resolution: {integrity: sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A==}
     dev: false
 
+  /highlight.js@11.9.0:
+    resolution: {integrity: sha512-fJ7cW7fQGCYAkgv4CPfwFHrfd/cLS4Hau96JuJ+ZTOWhjnhoeN1ub1tFmALm/+lW5z4WCAuAV9bm05AP0mS6Gw==}
+    engines: {node: '>=12.0.0'}
+    dev: false
+
   /homedir-polyfill@1.0.3:
     resolution: {integrity: sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==}
     engines: {node: '>=0.10.0'}
     dependencies:
       parse-passwd: 1.0.0
 
+  /hookable@5.5.3:
+    resolution: {integrity: sha512-Yc+BQe8SvoXH1643Qez1zqLRmbA5rCL+sSmk6TVos0LWVfNIB7PGncdlId77WzLGSIB5KaWgTaNTs2lNVEI6VQ==}
+    dev: true
+
   /hosted-git-info@2.8.9:
     resolution: {integrity: sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==}
     dev: true
@@ -13560,6 +16910,13 @@ packages:
       whatwg-encoding: 2.0.0
     dev: true
 
+  /html-encoding-sniffer@4.0.0:
+    resolution: {integrity: sha512-Y22oTqIU4uuPgEemfz7NDJz6OeKf12Lsu+QC+s3BVpda64lTiMYCyGwg5ki4vFxkMwQdeZDl2adZoqUgdFuTgQ==}
+    engines: {node: '>=18'}
+    dependencies:
+      whatwg-encoding: 3.1.1
+    dev: true
+
   /html-escaper@2.0.2:
     resolution: {integrity: sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==}
     dev: true
@@ -13570,13 +16927,24 @@ packages:
     hasBin: true
     dependencies:
       '@selderee/plugin-htmlparser2': 0.6.0
-      deepmerge: 4.2.2
+      deepmerge: 4.3.1
       he: 1.2.0
       htmlparser2: 6.1.0
       minimist: 1.2.8
       selderee: 0.6.0
     dev: false
 
+  /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
+
   /htmlparser2@6.1.0:
     resolution: {integrity: sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==}
     dependencies:
@@ -13594,6 +16962,15 @@ packages:
       domutils: 3.0.1
       entities: 4.4.0
 
+  /htmlparser2@8.0.2:
+    resolution: {integrity: sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA==}
+    dependencies:
+      domelementtype: 2.3.0
+      domhandler: 5.0.3
+      domutils: 3.0.1
+      entities: 4.4.0
+    dev: false
+
   /http-cache-semantics@4.1.1:
     resolution: {integrity: sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==}
     dev: false
@@ -13645,6 +17022,16 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
+  /http-proxy-agent@7.0.0:
+    resolution: {integrity: sha512-+ZT+iBxVUQ1asugqnD6oWoRiS25AkjNfG085dKJGtGxkdwLQrMKU5wJr2bOOFAXzKcTuqq+7fZlTMgG3SRfIYQ==}
+    engines: {node: '>= 14'}
+    dependencies:
+      agent-base: 7.1.0
+      debug: 4.3.4(supports-color@8.1.1)
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   /http-signature@1.3.6:
     resolution: {integrity: sha512-3adrsD6zqo4GsTqtO7FyrejHNv+NgiIfAfv68+jVlFmSr9OGy7zrxONceFRLKvnnZA5jbxQBX1u9PpB6Wi32Gw==}
     engines: {node: '>=0.10'}
@@ -13673,6 +17060,15 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
+  /https-proxy-agent@7.0.2:
+    resolution: {integrity: sha512-NmLNjm6ucYwtcUmL7JQC1ZQ57LmHP4lT15FQ8D61nak1rO6DH+fz5qNK2Ap5UN4ZapYICE3/0KodcLYSPsPbaA==}
+    engines: {node: '>= 14'}
+    dependencies:
+      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'}
@@ -13683,6 +17079,11 @@ packages:
     engines: {node: '>=10.17.0'}
     dev: true
 
+  /human-signals@5.0.0:
+    resolution: {integrity: sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==}
+    engines: {node: '>=16.17.0'}
+    dev: true
+
   /humanize-duration@3.27.3:
     resolution: {integrity: sha512-iimHkHPfIAQ8zCDQLgn08pRqSVioyWvnGfaQ8gond2wf7Jq2jJ+24ykmnRyiz3fIldcn4oUuQXpjqKLhSVR7lw==}
     dev: false
@@ -13728,19 +17129,6 @@ packages:
       postcss: 7.0.39
     dev: true
 
-  /icss-utils@5.1.0(postcss@8.4.27):
-    resolution: {integrity: sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==}
-    engines: {node: ^10 || ^12 || >= 14}
-    peerDependencies:
-      postcss: ^8.1.0
-    dependencies:
-      postcss: 8.4.27
-    dev: true
-
-  /ieee754@1.1.13:
-    resolution: {integrity: sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==}
-    dev: false
-
   /ieee754@1.2.1:
     resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==}
 
@@ -13752,13 +17140,6 @@ packages:
     resolution: {integrity: sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==}
     engines: {node: '>= 4'}
 
-  /image-size@0.5.5:
-    resolution: {integrity: sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ==}
-    engines: {node: '>=0.10.0'}
-    hasBin: true
-    dev: true
-    optional: true
-
   /imap-simple@4.3.0:
     resolution: {integrity: sha512-SW3LtfEJFjlJKS/h2CmpX2IKpya2RXobR3ENJJW4iMQ3QYPxWxf5oeaz1K3P4eGUwfGEndkqt7uVDKnEyG9zeQ==}
     dependencies:
@@ -13794,6 +17175,11 @@ packages:
       resolve-from: 4.0.0
     dev: true
 
+  /import-lazy@4.0.0:
+    resolution: {integrity: sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==}
+    engines: {node: '>=8'}
+    dev: true
+
   /import-local@3.1.0:
     resolution: {integrity: sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==}
     engines: {node: '>=8'}
@@ -13824,8 +17210,8 @@ packages:
   /infisical-node@1.3.0:
     resolution: {integrity: sha512-tTnnExRAO/ZyqiRdnSlBisErNToYWgtunMWh+8opClEt5qjX7l6HC/b4oGo2AuR2Pf41IR+oqo+dzkM1TCvlUA==}
     dependencies:
-      axios: 1.4.0
-      dotenv: 16.0.3
+      axios: 1.6.2(debug@3.2.7)
+      dotenv: 16.3.1
       tweetnacl: 1.0.3
       tweetnacl-util: 0.15.1
     transitivePeerDependencies:
@@ -13885,6 +17271,12 @@ packages:
     resolution: {integrity: sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==}
     engines: {node: '>= 0.10'}
 
+  /invariant@2.2.4:
+    resolution: {integrity: sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==}
+    dependencies:
+      loose-envify: 1.4.0
+    dev: true
+
   /invert-kv@1.0.0:
     resolution: {integrity: sha512-xgs2NH9AE66ucSq4cNG1nhSFghr5l6tdL15Pk+jl46bmmBapgoaY/AacXyaDznAqmGL99TiLSQgO/XazFSKYeQ==}
     engines: {node: '>=0.10.0'}
@@ -13910,7 +17302,7 @@ packages:
     resolution: {integrity: sha512-3GYo0GJtLqgNXj4YhrisLaNNvWSNwSS2wS4OELGfGxH8I69+XfNdnmV1AyN+ZqMh0i7eX+SWjrwFKDBDgfBC1A==}
     engines: {node: '>=6'}
     dependencies:
-      cluster-key-slot: 1.1.1
+      cluster-key-slot: 1.1.2
       debug: 4.3.4(supports-color@8.1.1)
       denque: 1.5.1
       lodash.defaults: 4.2.0
@@ -13941,26 +17333,6 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
-  /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.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
-    transitivePeerDependencies:
-      - supports-color
-
-  /ip@1.1.8:
-    resolution: {integrity: sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg==}
-    dev: false
-
   /ip@2.0.0:
     resolution: {integrity: sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==}
 
@@ -13995,6 +17367,10 @@ packages:
       kind-of: 6.0.3
     dev: true
 
+  /is-any-array@2.0.1:
+    resolution: {integrity: sha512-UtilS7hLRu++wb/WBAw9bNuP1Eg04Ivn1vERJck8zJthEvXCBEBpGR/33u/xLKWEQf95803oalHrVDptcAvFdQ==}
+    dev: false
+
   /is-arguments@1.1.1:
     resolution: {integrity: sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==}
     engines: {node: '>= 0.4'}
@@ -14002,13 +17378,6 @@ packages:
       call-bind: 1.0.2
       has-tostringtag: 1.0.0
 
-  /is-array-buffer@3.0.1:
-    resolution: {integrity: sha512-ASfLknmY8Xa2XtB4wmbz13Wu202baeA18cJBCeCy0wXUHZF0IPyVEXqKEcd+t2fNSLLL1vC6k7lxZEojNbISXQ==}
-    dependencies:
-      call-bind: 1.0.2
-      get-intrinsic: 1.2.1
-      is-typed-array: 1.1.10
-
   /is-array-buffer@3.0.2:
     resolution: {integrity: sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==}
     dependencies:
@@ -14063,16 +17432,10 @@ packages:
       ci-info: 3.8.0
     dev: true
 
-  /is-core-module@2.11.0:
-    resolution: {integrity: sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==}
+  /is-core-module@2.13.1:
+    resolution: {integrity: sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==}
     dependencies:
-      has: 1.0.3
-    dev: true
-
-  /is-core-module@2.12.1:
-    resolution: {integrity: sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg==}
-    dependencies:
-      has: 1.0.3
+      hasown: 2.0.0
 
   /is-data-descriptor@0.1.4:
     resolution: {integrity: sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==}
@@ -14131,6 +17494,7 @@ packages:
   /is-extendable@0.1.1:
     resolution: {integrity: sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==}
     engines: {node: '>=0.10.0'}
+    dev: true
 
   /is-extendable@1.0.1:
     resolution: {integrity: sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==}
@@ -14208,6 +17572,10 @@ packages:
   /is-map@2.0.2:
     resolution: {integrity: sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==}
 
+  /is-module@1.0.0:
+    resolution: {integrity: sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g==}
+    dev: true
+
   /is-nan@1.3.2:
     resolution: {integrity: sha512-E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w==}
     engines: {node: '>= 0.4'}
@@ -14288,6 +17656,12 @@ packages:
     resolution: {integrity: sha512-Ks/IoX00TtClbGQr4TWXemAnktAQvYB7HzcCxDGqEZU6oCmb2INHuOoKxbtR+HFkmYWBKv/dOZtGRiAjDhj92g==}
     dev: false
 
+  /is-reference@1.2.1:
+    resolution: {integrity: sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ==}
+    dependencies:
+      '@types/estree': 1.0.0
+    dev: true
+
   /is-regex@1.1.4:
     resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
     engines: {node: '>= 0.4'}
@@ -14320,6 +17694,10 @@ packages:
     dependencies:
       call-bind: 1.0.2
 
+  /is-stream-ended@0.1.4:
+    resolution: {integrity: sha512-xj0XPvmr7bQFTvirqnFr50o0hQIh6ZItDqloxt5aJrR4NQsYeSsyFQERYGCAzfindAcnKjINnwEEgLx4IqVzQw==}
+    dev: false
+
   /is-stream@1.1.0:
     resolution: {integrity: sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==}
     engines: {node: '>=0.10.0'}
@@ -14329,6 +17707,11 @@ packages:
     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
+
   /is-string@1.0.7:
     resolution: {integrity: sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==}
     engines: {node: '>= 0.4'}
@@ -14353,7 +17736,6 @@ packages:
 
   /is-typedarray@1.0.0:
     resolution: {integrity: sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==}
-    dev: true
 
   /is-unc-path@1.0.0:
     resolution: {integrity: sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==}
@@ -14390,10 +17772,6 @@ packages:
       call-bind: 1.0.2
       get-intrinsic: 1.2.1
 
-  /is-what@3.14.1:
-    resolution: {integrity: sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA==}
-    dev: true
-
   /is-windows@1.0.2:
     resolution: {integrity: sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==}
     engines: {node: '>=0.10.0'}
@@ -14454,6 +17832,11 @@ packages:
     engines: {node: '>=8'}
     dev: true
 
+  /istanbul-lib-coverage@3.2.2:
+    resolution: {integrity: sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==}
+    engines: {node: '>=8'}
+    dev: true
+
   /istanbul-lib-instrument@5.2.1:
     resolution: {integrity: sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==}
     engines: {node: '>=8'}
@@ -14476,12 +17859,21 @@ packages:
       supports-color: 7.2.0
     dev: true
 
+  /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
+
   /istanbul-lib-source-maps@4.0.1:
     resolution: {integrity: sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==}
     engines: {node: '>=10'}
     dependencies:
       debug: 4.3.4(supports-color@8.1.1)
-      istanbul-lib-coverage: 3.2.0
+      istanbul-lib-coverage: 3.2.2
       source-map: 0.6.1
     transitivePeerDependencies:
       - supports-color
@@ -14495,6 +17887,14 @@ packages:
       istanbul-lib-report: 3.0.0
     dev: true
 
+  /istanbul-reports@3.1.6:
+    resolution: {integrity: sha512-TLgnMkKg3iTDsQ9PbPTdpfAK2DzjF9mqUG7RMgcQl8oFjad8ob4laGxv5XV5U9MAfx8D6tSJiUyuAwzLicaxlg==}
+    engines: {node: '>=8'}
+    dependencies:
+      html-escaper: 2.0.2
+      istanbul-lib-report: 3.0.1
+    dev: true
+
   /jackspeak@2.2.2:
     resolution: {integrity: sha512-mgNtVv4vUuaKA97yxUHoA3+FkuhtxkjdXEWOyB/N76fjy0FjezEt34oy3epBtvCvS+7DyKwqCFWx/oJLV5+kCg==}
     engines: {node: '>=14'}
@@ -14702,25 +18102,6 @@ packages:
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     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}
-    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.10
-      jest-regex-util: 29.4.3
-      jest-util: 29.6.2
-      jest-worker: 29.5.0
-      micromatch: 4.0.5
-      walker: 1.0.8
-    optionalDependencies:
-      fsevents: 2.3.2
-    dev: true
-
   /jest-haste-map@29.6.2:
     resolution: {integrity: sha512-+51XleTDAAysvU8rT6AnS1ZJ+WHVNqhj1k6nTvN2PYP+HjU3kqlaKQ1Lnw3NYW3bm2r8vq82X0Z1nDDHZMzHVA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
@@ -14737,7 +18118,7 @@ packages:
       micromatch: 4.0.5
       walker: 1.0.8
     optionalDependencies:
-      fsevents: 2.3.2
+      fsevents: 2.3.3
     dev: true
 
   /jest-leak-detector@29.6.2:
@@ -14798,15 +18179,23 @@ packages:
       stack-utils: 2.0.6
     dev: true
 
-  /jest-mock-extended@3.0.4(jest@29.6.2)(typescript@5.2.2):
+  /jest-mock-extended@3.0.4(jest@29.6.2)(typescript@5.3.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.2.2
+      typescript: ^5.3.0
     dependencies:
       jest: 29.6.2
-      ts-essentials: 7.0.3(typescript@5.2.2)
-      typescript: 5.2.2
+      ts-essentials: 7.0.3(typescript@5.3.2)
+      typescript: 5.3.2
+    dev: true
+
+  /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:
+      '@jest/types': 27.5.1
+      '@types/node': 18.16.16
     dev: true
 
   /jest-mock@29.6.2:
@@ -14855,7 +18244,7 @@ packages:
       jest-pnp-resolver: 1.2.2(jest-resolve@29.6.2)
       jest-util: 29.6.2
       jest-validate: 29.6.2
-      resolve: 1.22.3
+      resolve: 1.22.8
       resolve.exports: 2.0.0
       slash: 3.0.0
     dev: true
@@ -15006,16 +18395,6 @@ packages:
       supports-color: 8.1.1
     dev: true
 
-  /jest-worker@29.5.0:
-    resolution: {integrity: sha512-NcrQnevGoSp4b5kg+akIpthoAFHxPBcb5P6mYPY0fUNT+sSvmtu6jlkEle3anczUKIKEbMxFimk9oTP/tpIPgA==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    dependencies:
-      '@types/node': 18.16.16
-      jest-util: 29.6.2
-      merge-stream: 2.0.0
-      supports-color: 8.1.1
-    dev: true
-
   /jest-worker@29.6.2:
     resolution: {integrity: sha512-l3ccBOabTdkng8I/ORCkADz4eSMKejTYv1vB/Z83UiubqhC1oQ5Li6dWCyqOIvSifGjUBxuvxvlm6KGK2DtuAQ==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
@@ -15047,23 +18426,27 @@ packages:
       - ts-node
     dev: true
 
-  /jiti@1.19.1:
-    resolution: {integrity: sha512-oVhqoRDaBXf7sjkll95LHVS6Myyyb1zaunVwk4Z0+WPSW4gjS0pl01zYKHScTuyEhQsFxV5L4DR5r+YqSyqyyg==}
+  /jiti@1.21.0:
+    resolution: {integrity: sha512-gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q==}
     hasBin: true
     dev: true
 
+  /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
 
-  /joi@17.7.0:
-    resolution: {integrity: sha512-1/ugc8djfn93rTE3WRKdCzGGt/EtiYKxITMO4Wiv6q5JL1gl9ePt4kBsl1S499nbosspfctIQTpYIhSmHA3WAg==}
+  /joi@17.11.0:
+    resolution: {integrity: sha512-NgB+lZLNoqISVy1rZocE9PZI36bL/77ie924Ri43yEvi9GUUMPeyVIr8KdFTMUlby1p0PBYMk9spIxEUQYqrJQ==}
     dependencies:
       '@hapi/hoek': 9.3.0
       '@hapi/topo': 5.1.0
       '@sideway/address': 4.1.4
-      '@sideway/formula': 3.0.0
+      '@sideway/formula': 3.0.1
       '@sideway/pinpoint': 2.0.0
     dev: true
 
@@ -15106,6 +18489,12 @@ packages:
     resolution: {integrity: sha512-rtS5ATOo2Q5k1G+DADISilDA6lv79zIiwFd6CcjuIxGKLFm5C+RLImRscVap9k55i+MOZwgliw+NejvkLuGD5g==}
     dev: true
 
+  /js-tiktoken@1.0.8:
+    resolution: {integrity: sha512-r7XK3E9/I+SOrbAGqb39pyO/rHAS1diAOSRAvaaLfHgXjkUSK9AiSd+r84Vn2f/GvXJYRAxKj8NHrUvqlaH5qg==}
+    dependencies:
+      base64-js: 1.5.1
+    dev: false
+
   /js-tokens@4.0.0:
     resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==}
     dev: true
@@ -15123,6 +18512,12 @@ packages:
     dependencies:
       argparse: 2.0.1
 
+  /js2xmlparser@4.0.2:
+    resolution: {integrity: sha512-6n4D8gLlLf1n5mNLQPRfViYzu9RATblzPEtm1SthMX1Pjao0r9YI9nw7ZIfRxQMERS87mcswrg+r/OYrPRX6jA==}
+    dependencies:
+      xmlcreate: 2.0.4
+    dev: false
+
   /jsbi@4.3.0:
     resolution: {integrity: sha512-SnZNcinB4RIcnEyZqFPdGPVgrg2AcnykiBy0sHVJQKHYeaLUvi3Exj+iaPpLnFVkDPZIV4U0yvgC9/R4uEAZ9g==}
     dev: false
@@ -15141,7 +18536,7 @@ packages:
       '@babel/plugin-proposal-class-properties': 7.18.6(@babel/core@7.22.9)
       '@babel/plugin-proposal-nullish-coalescing-operator': 7.18.6(@babel/core@7.22.9)
       '@babel/plugin-proposal-optional-chaining': 7.21.0(@babel/core@7.22.9)
-      '@babel/plugin-transform-modules-commonjs': 7.21.5(@babel/core@7.22.9)
+      '@babel/plugin-transform-modules-commonjs': 7.22.5(@babel/core@7.22.9)
       '@babel/preset-env': 7.22.9(@babel/core@7.22.9)
       '@babel/preset-flow': 7.18.6(@babel/core@7.22.9)
       '@babel/preset-typescript': 7.18.6(@babel/core@7.22.9)
@@ -15160,6 +18555,28 @@ packages:
       - 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.22.7
+      '@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
+
   /jsdom@20.0.2:
     resolution: {integrity: sha512-AHWa+QO/cgRg4N+DsmHg1Y7xnz+8KU3EflM0LVDTdmrYOc1WWTSkOjtpUveQH+1Bqd5rtcVnb/DuxV/UjDO4rA==}
     engines: {node: '>=14'}
@@ -15170,7 +18587,7 @@ packages:
         optional: true
     dependencies:
       abab: 2.0.6
-      acorn: 8.10.0
+      acorn: 8.11.2
       acorn-globals: 7.0.1
       cssom: 0.5.0
       cssstyle: 2.3.0
@@ -15184,7 +18601,7 @@ packages:
       https-proxy-agent: 5.0.1
       is-potential-custom-element-name: 1.0.1
       nwsapi: 2.2.2
-      parse5: 7.1.1
+      parse5: 7.1.2
       saxes: 6.0.0
       symbol-tree: 3.2.4
       tough-cookie: 4.1.3
@@ -15193,7 +18610,7 @@ packages:
       whatwg-encoding: 2.0.0
       whatwg-mimetype: 3.0.0
       whatwg-url: 11.0.0
-      ws: 8.13.0
+      ws: 8.12.0
       xml-name-validator: 4.0.0
     transitivePeerDependencies:
       - bufferutil
@@ -15201,41 +18618,36 @@ packages:
       - utf-8-validate
     dev: true
 
-  /jsdom@21.1.0:
-    resolution: {integrity: sha512-m0lzlP7qOtthD918nenK3hdItSd2I+V3W9IrBcB36sqDwG+KnUs66IF5GY7laGWUnlM9vTsD0W1QwSEBYWWcJg==}
-    engines: {node: '>=14'}
+  /jsdom@23.0.1:
+    resolution: {integrity: sha512-2i27vgvlUsGEBO9+/kJQRbtqtm+191b5zAZrU/UezVmnC2dlDAFLgDYJvAEi94T4kjsRKkezEtLQTgsNEsW2lQ==}
+    engines: {node: '>=18'}
     peerDependencies:
-      canvas: ^2.5.0
+      canvas: ^2.11.2
     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
+      cssstyle: 3.0.0
+      data-urls: 5.0.0
       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
+      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.2
-      parse5: 7.1.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: 4.0.0
+      w3c-xmlserializer: 5.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
+      whatwg-encoding: 3.1.1
+      whatwg-mimetype: 4.0.0
+      whatwg-url: 14.0.0
+      ws: 8.15.1
+      xml-name-validator: 5.0.0
     transitivePeerDependencies:
       - bufferutil
       - supports-color
@@ -15281,16 +18693,48 @@ packages:
     resolution: {integrity: sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==}
     dev: true
 
+  /json-refs@3.0.15:
+    resolution: {integrity: sha512-0vOQd9eLNBL18EGl5yYaO44GhixmImes2wiYn9Z3sag3QnehWrYWlB9AFtMxCL2Bj3fyxgDYkxGFEU/chlYssw==}
+    engines: {node: '>=0.8'}
+    hasBin: true
+    dependencies:
+      commander: 4.1.1
+      graphlib: 2.1.8
+      js-yaml: 3.14.1
+      lodash: 4.17.21
+      native-promise-only: 0.8.1
+      path-loader: 1.0.12
+      slash: 3.0.0
+      uri-js: 4.4.1
+    transitivePeerDependencies:
+      - supports-color
+    dev: false
+
   /json-schema-ref-parser@9.0.9:
     resolution: {integrity: sha512-qcP2lmGy+JUoQJ4DOQeLaZDqH9qSkeGCK3suKWxJXS82dg728Mn3j97azDMaOUmJAN4uCq91LdPx4K7E8F1a7Q==}
     engines: {node: '>=10'}
+    deprecated: Please switch to @apidevtools/json-schema-ref-parser
     dependencies:
       '@apidevtools/json-schema-ref-parser': 9.0.9
     dev: false
 
+  /json-schema-to-zod@1.2.0:
+    resolution: {integrity: sha512-fC0JgINgkh1RWHbOonzrxP+221/oGwPE014bJxWRsdK6TqC7vLtx9t4l5dlKXzFR9o35/s0v/qgb15Bfwkm2xA==}
+    hasBin: true
+    dependencies:
+      json-refs: 3.0.15
+      prettier: 3.1.0
+    transitivePeerDependencies:
+      - 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==}
+    dev: false
+
   /json-schema@0.4.0:
     resolution: {integrity: sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==}
     dev: true
@@ -15340,6 +18784,11 @@ packages:
       underscore: 1.12.1
     dev: false
 
+  /jsonpointer@5.0.1:
+    resolution: {integrity: sha512-p/nXbhSEcu3pZRdkW1OfJhpsVtW1gd4Wa1fnQc9YLiTfAjn0312eMKimbdIQzuZl9aa9xUGaRlP9T/CJE/ditQ==}
+    engines: {node: '>=0.10.0'}
+    dev: false
+
   /jsonschema@1.4.1:
     resolution: {integrity: sha512-S6cATIPVv1z0IlxdN+zUk5EPjkGCdnhN4wVSBlvoUO1tOLJootbo9CquNJmbIh4yikWHiUedhRYrNPn1arpEmQ==}
     dev: false
@@ -15368,6 +18817,10 @@ packages:
     resolution: {integrity: sha512-w9OtT4ALL+fbbwG3gw7erAO0jvS5nfvrukGPMWIAoea359B26ALXGpzy4YJSp9yGnpUvuvOw1nSjSoHDfWSr1w==}
     dev: false
 
+  /jssha@3.3.1:
+    resolution: {integrity: sha512-VCMZj12FCFMQYcFLPRm/0lOBbLi8uM2BhXPTqw3U4YAfs4AZfiApOoBLoN8cQE60Z50m1MYMTQVCfgF/KaCVhQ==}
+    dev: false
+
   /jstransformer@1.0.0:
     resolution: {integrity: sha512-C9YK3Rf8q6VAPDCCU9fnqo3mAfOH6vUGnMcP4AQAYIEpWtfGLpwOTmZ+igtdK5y+VvI2n3CyYSzy4Qh34eq24A==}
     dependencies:
@@ -15375,6 +18828,15 @@ packages:
       promise: 7.3.1
     dev: true
 
+  /jszip@3.10.1:
+    resolution: {integrity: sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g==}
+    dependencies:
+      lie: 3.3.0
+      pako: 1.0.11
+      readable-stream: 2.3.7
+      setimmediate: 1.0.5
+    dev: false
+
   /just-debounce@1.1.0:
     resolution: {integrity: sha512-qpcRocdkUmf+UTNBYx5w6dexX5J31AKK1OmPwH630a83DdVVUIngk55RSAiIGpQyoH0dlr872VHfPjnQnK1qDQ==}
     dev: true
@@ -15452,6 +18914,12 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
+  /klaw@3.0.0:
+    resolution: {integrity: sha512-0Fo5oir+O9jnXu5EefYbVK+mHMBeEVEy2cmctR1O1NECcCkPRreJKrS6Qt/j3KC2C148Dfo9i3pCmCMsdqGr0g==}
+    dependencies:
+      graceful-fs: 4.2.10
+    dev: false
+
   /kleur@3.0.3:
     resolution: {integrity: sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==}
     engines: {node: '>=6'}
@@ -15462,10 +18930,378 @@ packages:
     engines: {node: '>= 8'}
     dev: true
 
+  /kolorist@1.8.0:
+    resolution: {integrity: sha512-Y+60/zizpJ3HRH8DCss+q95yr6145JXZo46OTpFvDZWLfRCE4qChOyk1b26nMaNpfHHgxagk9dXT5OP0Tfe+dQ==}
+    dev: true
+
   /kuler@2.0.0:
     resolution: {integrity: sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A==}
     dev: false
 
+  /langchain@0.0.198(@aws-sdk/client-bedrock-runtime@3.454.0)(@aws-sdk/credential-provider-node@3.451.0)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@0.2.1)(@huggingface/inference@2.6.4)(@pinecone-database/pinecone@1.1.2)(@qdrant/js-client-rest@1.7.0)(@supabase/supabase-js@2.38.5)(@xata.io/client@0.25.3)(axios@1.6.2)(cohere-ai@6.2.2)(d3-dsv@2.0.0)(epub2@3.0.1)(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.11)(typeorm@0.3.17):
+    resolution: {integrity: sha512-YC0O1g8r61InCWyF5NmiQjdghdq6LKcgMrDZtqLbgDxAe4RoSldonm+5oNXS3yjCISG0j3s5Cty+yB7klqvUpg==}
+    engines: {node: '>=18'}
+    peerDependencies:
+      '@aws-crypto/sha256-js': ^5.0.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-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
+      '@clickhouse/client': ^0.2.5
+      '@cloudflare/ai': ^1.0.12
+      '@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
+      '@gomomento/sdk-web': ^1.51.1
+      '@google-ai/generativelanguage': ^0.2.1
+      '@google-cloud/storage': ^6.10.1
+      '@huggingface/inference': ^2.6.4
+      '@mozilla/readability': '*'
+      '@notionhq/client': ^2.2.10
+      '@opensearch-project/opensearch': '*'
+      '@pinecone-database/pinecone': ^1.1.0
+      '@planetscale/database': ^1.8.0
+      '@qdrant/js-client-rest': ^1.2.0
+      '@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
+      '@vercel/kv': ^0.2.3
+      '@vercel/postgres': ^0.5.0
+      '@writerai/writer-sdk': ^0.40.2
+      '@xata.io/client': ^0.25.1
+      '@xenova/transformers': ^2.5.4
+      '@zilliz/milvus2-sdk-node': '>=2.2.7'
+      apify-client: ^2.7.1
+      assemblyai: ^2.0.2
+      axios: '*'
+      cassandra-driver: ^4.7.2
+      cheerio: ^1.0.0-rc.12
+      chromadb: '*'
+      closevector-common: 0.1.0-alpha.1
+      closevector-node: 0.1.0-alpha.10
+      closevector-web: 0.1.0-alpha.16
+      cohere-ai: '>=6.0.0'
+      convex: ^1.3.1
+      d3-dsv: ^2.0.0
+      epub2: ^3.0.1
+      faiss-node: ^0.5.1
+      fast-xml-parser: ^4.2.7
+      firebase-admin: ^11.9.0
+      google-auth-library: ^8.9.0
+      googleapis: ^126.0.1
+      hnswlib-node: ^1.4.2
+      html-to-text: ^9.0.5
+      ignore: ^5.2.0
+      ioredis: ^5.3.2
+      jsdom: '*'
+      llmonitor: ^0.5.9
+      lodash: ^4.17.21
+      mammoth: '*'
+      mongodb: ^5.2.0
+      mysql2: ^3.3.3
+      neo4j-driver: '*'
+      node-llama-cpp: '*'
+      notion-to-md: ^3.1.0
+      officeparser: ^4.0.4
+      pdf-parse: 1.1.1
+      peggy: ^3.0.2
+      pg: ^8.11.0
+      pg-copy-streams: ^6.0.5
+      pickleparser: ^0.2.1
+      playwright: ^1.32.1
+      portkey-ai: ^0.1.11
+      puppeteer: ^19.7.2
+      pyodide: ^0.24.1
+      redis: ^4.6.4
+      replicate: ^0.18.0
+      sonix-speech-recognition: ^2.1.1
+      srt-parser-2: ^1.2.2
+      typeorm: ^0.3.12
+      typesense: ^1.5.3
+      usearch: ^1.1.1
+      vectordb: ^0.1.4
+      voy-search: 0.6.2
+      weaviate-ts-client: ^1.4.0
+      web-auth-library: ^1.0.3
+      ws: ^8.14.2
+      youtube-transcript: ^1.0.6
+      youtubei.js: ^5.8.0
+    peerDependenciesMeta:
+      '@aws-crypto/sha256-js':
+        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-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
+      '@clickhouse/client':
+        optional: true
+      '@cloudflare/ai':
+        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
+      '@gomomento/sdk-web':
+        optional: true
+      '@google-ai/generativelanguage':
+        optional: true
+      '@google-cloud/storage':
+        optional: true
+      '@huggingface/inference':
+        optional: true
+      '@mozilla/readability':
+        optional: true
+      '@notionhq/client':
+        optional: true
+      '@opensearch-project/opensearch':
+        optional: true
+      '@pinecone-database/pinecone':
+        optional: true
+      '@planetscale/database':
+        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
+      '@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
+      apify-client:
+        optional: true
+      assemblyai:
+        optional: true
+      axios:
+        optional: true
+      cassandra-driver:
+        optional: true
+      cheerio:
+        optional: true
+      chromadb:
+        optional: true
+      closevector-common:
+        optional: true
+      closevector-node:
+        optional: true
+      closevector-web:
+        optional: true
+      cohere-ai:
+        optional: true
+      convex:
+        optional: true
+      d3-dsv:
+        optional: true
+      epub2:
+        optional: true
+      faiss-node:
+        optional: true
+      fast-xml-parser:
+        optional: true
+      firebase-admin:
+        optional: true
+      google-auth-library:
+        optional: true
+      googleapis:
+        optional: true
+      hnswlib-node:
+        optional: true
+      html-to-text:
+        optional: true
+      ignore:
+        optional: true
+      ioredis:
+        optional: true
+      jsdom:
+        optional: true
+      llmonitor:
+        optional: true
+      lodash:
+        optional: true
+      mammoth:
+        optional: true
+      mongodb:
+        optional: true
+      mysql2:
+        optional: true
+      neo4j-driver:
+        optional: true
+      node-llama-cpp:
+        optional: true
+      notion-to-md:
+        optional: true
+      officeparser:
+        optional: true
+      pdf-parse:
+        optional: true
+      peggy:
+        optional: true
+      pg:
+        optional: true
+      pg-copy-streams:
+        optional: true
+      pickleparser:
+        optional: true
+      playwright:
+        optional: true
+      portkey-ai:
+        optional: true
+      puppeteer:
+        optional: true
+      pyodide:
+        optional: true
+      redis:
+        optional: true
+      replicate:
+        optional: true
+      sonix-speech-recognition:
+        optional: true
+      srt-parser-2:
+        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
+      youtube-transcript:
+        optional: true
+      youtubei.js:
+        optional: true
+    dependencies:
+      '@anthropic-ai/sdk': 0.9.1
+      '@aws-sdk/client-bedrock-runtime': 3.454.0
+      '@aws-sdk/credential-provider-node': 3.451.0
+      '@getzep/zep-js': 0.9.0
+      '@google-ai/generativelanguage': 0.2.1
+      '@huggingface/inference': 2.6.4
+      '@langchain/core': 0.1.8
+      '@pinecone-database/pinecone': 1.1.2
+      '@qdrant/js-client-rest': 1.7.0(typescript@5.3.2)
+      '@supabase/supabase-js': 2.38.5
+      '@xata.io/client': 0.25.3(typescript@5.3.2)
+      axios: 1.6.2(debug@3.2.7)
+      binary-extensions: 2.2.0
+      cohere-ai: 6.2.2
+      d3-dsv: 2.0.0
+      epub2: 3.0.1(ts-toolbelt@9.6.0)
+      expr-eval: 2.0.2
+      flat: 5.0.2
+      html-to-text: 9.0.5
+      js-tiktoken: 1.0.8
+      js-yaml: 4.1.0
+      jsonpointer: 5.0.1
+      langchainhub: 0.0.6
+      langsmith: 0.0.48
+      lodash: 4.17.21
+      mammoth: 1.6.0
+      ml-distance: 4.0.1
+      openai: 4.20.0
+      openapi-types: 12.1.3
+      p-retry: 4.6.2
+      pdf-parse: 1.1.1
+      pg: 8.11.3
+      redis: 4.6.11
+      typeorm: 0.3.17(mssql@9.1.1)(pg@8.11.3)(redis@4.6.11)(sqlite3@5.1.6)
+      uuid: 9.0.0
+      yaml: 2.3.4
+      zod: 3.22.4
+      zod-to-json-schema: 3.20.3(zod@3.22.4)
+    transitivePeerDependencies:
+      - encoding
+      - supports-color
+    dev: false
+
+  /langchainhub@0.0.6:
+    resolution: {integrity: sha512-SW6105T+YP1cTe0yMf//7kyshCgvCTyFBMTgH2H3s9rTAR4e+78DA/BBrUL/Mt4Q5eMWui7iGuAYb3pgGsdQ9w==}
+    dev: false
+
+  /langsmith@0.0.48:
+    resolution: {integrity: sha512-s0hW8iZ90Q9XLTnDK0Pgee245URV3b1cXQjPDj5OKm1+KN7iSK1pKx+4CO7RcFLz58Ixe7Mt+mVcomYqUuryxQ==}
+    hasBin: true
+    dependencies:
+      '@types/uuid': 9.0.7
+      commander: 10.0.1
+      p-queue: 6.6.2
+      p-retry: 4.6.2
+      uuid: 9.0.0
+    dev: false
+
   /last-run@1.1.1:
     resolution: {integrity: sha512-U/VxvpX4N/rFvPzr3qG5EtLKEnNI0emvIQB3/ecEwv+8GHaUKbIB8vxv1Oai5FAF0d0r7LXHhLLe5K/yChm5GQ==}
     engines: {node: '>= 0.10'}
@@ -15517,6 +19353,10 @@ packages:
       - supports-color
     dev: false
 
+  /leac@0.6.0:
+    resolution: {integrity: sha512-y+SqErxb8h7nE/fiEX07jsbuhrpO9lL8eca7/Y1nuWV2moNlXhyd59iDGcRf6moVyDMbmTNzL40SUyrFU/yDpg==}
+    dev: false
+
   /lead@1.0.0:
     resolution: {integrity: sha512-IpSVCk9AYvLHo5ctcIXxOBpMWUe+4TKN3VPWAKUbJikkmsGp0VrSM8IttVc32D6J4WUsiPE6aEFRNmIoF/gdow==}
     engines: {node: '>= 0.10'}
@@ -15524,37 +19364,6 @@ packages:
       flush-write-stream: 1.1.1
     dev: true
 
-  /less-loader@11.1.3(less@4.1.3)(webpack@5.75.0):
-    resolution: {integrity: sha512-A5b7O8dH9xpxvkosNrP0dFp2i/dISOJa9WwGF3WJflfqIERE2ybxh1BFDj5CovC2+jCE4M354mk90hN6ziXlVw==}
-    engines: {node: '>= 14.15.0'}
-    peerDependencies:
-      less: ^3.5.0 || ^4.0.0
-      webpack: ^5.0.0
-    dependencies:
-      less: 4.1.3
-      webpack: 5.75.0(esbuild@0.18.17)
-    dev: true
-
-  /less@4.1.3:
-    resolution: {integrity: sha512-w16Xk/Ta9Hhyei0Gpz9m7VS8F28nieJaL/VyShID7cYvP6IL5oHeL6p4TXSDJqZE/lNv0oJ2pGVjJsRkfwm5FA==}
-    engines: {node: '>=6'}
-    hasBin: true
-    dependencies:
-      copy-anything: 2.0.6
-      parse-node-version: 1.0.1
-      tslib: 2.6.1
-    optionalDependencies:
-      errno: 0.1.8
-      graceful-fs: 4.2.10
-      image-size: 0.5.5
-      make-dir: 2.1.0
-      mime: 1.6.0
-      needle: 3.2.0
-      source-map: 0.6.1
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
   /leven@3.1.0:
     resolution: {integrity: sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==}
     engines: {node: '>=6'}
@@ -15602,6 +19411,12 @@ packages:
       immediate: 3.0.6
     dev: false
 
+  /lie@3.3.0:
+    resolution: {integrity: sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==}
+    dependencies:
+      immediate: 3.0.6
+    dev: false
+
   /liftoff@3.1.0:
     resolution: {integrity: sha512-DlIPlJUkCV0Ips2zf2pJP0unEoT1kwYhiiPUGF3s/jtxTCjziNLoiVVh+jqWOWeFi6mmwQ5fNxvAUyPad4Dfog==}
     engines: {node: '>= 0.8'}
@@ -15613,11 +19428,16 @@ packages:
       is-plain-object: 2.0.4
       object.map: 1.0.1
       rechoir: 0.6.2
-      resolve: 1.22.3
+      resolve: 1.22.8
     transitivePeerDependencies:
       - supports-color
     dev: true
 
+  /lilconfig@3.0.0:
+    resolution: {integrity: sha512-K2U4W2Ff5ibV7j7ydLr+zLAkIg5JJ4lPn1Ltsdt+Tz/IjQ8buJ55pZAxoP34lqIiwtF9iAvtLv3JGv7CAyAg+g==}
+    engines: {node: '>=14'}
+    dev: true
+
   /limiter@1.1.5:
     resolution: {integrity: sha512-FWWMIEOxz3GwUI4Ts/IvgVy6LPvoMPgjMdQ185nN6psJyBJ4yOpzqm695/h5umdLJg2vW3GR5iG11MAkR2AzJA==}
     dev: false
@@ -15713,25 +19533,20 @@ packages:
     engines: {node: '>=14'}
     dev: true
 
+  /local-pkg@0.5.0:
+    resolution: {integrity: sha512-ok6z3qlYyCDS4ZEU27HaU6x/xZa9Whf8jD4ptH5UZTQYZVYeb9bnZ3ojVhiJNLiXK1Hfc0GNbLXcmZ5plLDDBg==}
+    engines: {node: '>=14'}
+    dependencies:
+      mlly: 1.4.2
+      pkg-types: 1.0.3
+    dev: true
+
   /localforage@1.10.0:
     resolution: {integrity: sha512-14/H1aX7hzBBmmh7sGPd+AOMkkIrHM3Z1PAyGgZigA1H1p5O5ANnMyWzvpAETtG68/dC4pC0ncy3+PPGzXZHPg==}
     dependencies:
       lie: 3.1.1
     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
-    dev: false
-
   /locate-path@3.0.0:
     resolution: {integrity: sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==}
     engines: {node: '>=6'}
@@ -15776,7 +19591,6 @@ packages:
 
   /lodash.camelcase@4.3.0:
     resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
-    dev: true
 
   /lodash.clonedeep@4.5.0:
     resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==}
@@ -15930,6 +19744,10 @@ packages:
     resolution: {integrity: sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==}
     dev: false
 
+  /long@5.2.3:
+    resolution: {integrity: sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q==}
+    dev: false
+
   /loose-envify@1.4.0:
     resolution: {integrity: sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==}
     hasBin: true
@@ -15937,14 +19755,29 @@ packages:
       js-tokens: 4.0.0
     dev: true
 
+  /lop@0.4.1:
+    resolution: {integrity: sha512-9xyho9why2A2tzm5aIcMWKvzqKsnxrf9B5I+8O30olh6lQU8PH978LqZoI4++37RBgS1Em5i54v1TFs/3wnmXQ==}
+    dependencies:
+      duck: 0.1.12
+      option: 0.2.4
+      underscore: 1.13.6
+    dev: false
+
   /lossless-json@1.0.5:
     resolution: {integrity: sha512-RicKUuLwZVNZ6ZdJHgIZnSeA05p8qWc5NW0uR96mpPIjN9WDLUg9+kj1esQU1GkPn9iLZVKatSQK5gyiaFHgJA==}
     dev: false
 
   /loupe@2.3.6:
     resolution: {integrity: sha512-RaPMZKiMy8/JruncMU5Bt6na1eftNoo++R4Y+N2FrxkDVTrGvcyzFTsaGif4QTeKESheMGegbhw6iUAq+5A8zA==}
+    deprecated: Please upgrade to 2.3.7 which fixes GHSA-4q6p-r6v2-jvc5
     dependencies:
-      get-func-name: 2.0.0
+      get-func-name: 2.0.2
+    dev: true
+
+  /loupe@2.3.7:
+    resolution: {integrity: sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA==}
+    dependencies:
+      get-func-name: 2.0.2
     dev: true
 
   /lower-case@2.0.2:
@@ -15993,9 +19826,6 @@ packages:
       lru-cache: 4.0.2
     dev: false
 
-  /lru_map@0.3.3:
-    resolution: {integrity: sha512-Pn9cox5CsMYngeDbmChANltQl+5pi6XmTrraMSzhPmMBbmgcxmqWry0U3PGapCU1yB4/LqCcom7qhHZiF/jGfQ==}
-
   /luxon@3.3.0:
     resolution: {integrity: sha512-An0UCfG/rSiqtAIiBPO0Y9/zAnHUZxAMiCpTd5h2smgsj7GGmcenvrvww2cqNA8/4A5ZrD1gJpHN2mIHZQF+Mg==}
     engines: {node: '>=12'}
@@ -16019,6 +19849,21 @@ packages:
     dependencies:
       '@jridgewell/sourcemap-codec': 1.4.15
 
+  /magic-string@0.30.5:
+    resolution: {integrity: sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA==}
+    engines: {node: '>=12'}
+    dependencies:
+      '@jridgewell/sourcemap-codec': 1.4.15
+    dev: true
+
+  /magicast@0.3.2:
+    resolution: {integrity: sha512-Fjwkl6a0syt9TFN0JSYpOybxiMCkYNEeOTnOTNRbjphirLakznZXAqrXgj/7GG3D1dvETONNwrBfinvAbpunDg==}
+    dependencies:
+      '@babel/parser': 7.23.6
+      '@babel/types': 7.23.6
+      source-map-js: 1.0.2
+    dev: true
+
   /mailparser@3.5.0:
     resolution: {integrity: sha512-mdr2DFgz8LKC0/Q6io6znA0HVnzaPFT0a4TTnLeZ7mWHlkfnm227Wxlq7mHh7AgeP32h7gOUpXvyhSfJJIEeyg==}
     dependencies:
@@ -16055,6 +19900,13 @@ packages:
     dependencies:
       semver: 7.5.4
 
+  /make-dir@4.0.0:
+    resolution: {integrity: sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==}
+    engines: {node: '>=10'}
+    dependencies:
+      semver: 7.5.4
+    dev: true
+
   /make-error@1.3.6:
     resolution: {integrity: sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==}
     dev: true
@@ -16098,6 +19950,23 @@ packages:
       tmpl: 1.0.5
     dev: true
 
+  /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
+
   /map-cache@0.2.2:
     resolution: {integrity: sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==}
     engines: {node: '>=0.10.0'}
@@ -16122,6 +19991,16 @@ packages:
     resolution: {integrity: sha512-Es99fy0E52fxmhRvCyed7WVlSyuz6ME/wOsRpSmi0GcbMEZ6y5D2GL4+qNGPCc2P270J5yw8L2zg+K4BWACcHg==}
     dev: false
 
+  /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:
+      '@types/markdown-it': 12.2.3
+      markdown-it: 12.3.2
+    dev: false
+
   /markdown-it-emoji@2.0.2:
     resolution: {integrity: sha512-zLftSaNrKuYl0kR5zm4gxXjHaOI3FAOEaloKmRA5hijmJZvSjmxcokOLlzycb/HXlUFWzXqpIEoyEMCE4i9MvQ==}
     dev: false
@@ -16156,22 +20035,28 @@ packages:
       uc.micro: 1.0.6
     dev: false
 
-  /markdown-to-jsx@7.1.9(react@17.0.2):
+  /markdown-to-jsx@7.1.9(react@18.2.0):
     resolution: {integrity: sha512-x4STVIKIJR0mGgZIZ5RyAeQD7FEZd5tS8m/htbcVGlex32J+hlSLj+ExrHCxP6nRKF1EKbcO7i6WhC1GtOpBlA==}
     engines: {node: '>= 10'}
     peerDependencies:
       react: '>= 0.14.0'
     dependencies:
-      react: 17.0.2
+      react: 18.2.0
     dev: true
 
+  /marked@4.3.0:
+    resolution: {integrity: sha512-PRsaiG84bK+AMvxziE/lCFss8juXjNaWzVbN5tXAm4XjeaS9NAHhop+PjQxz2A9h8Q4M/xGmzP8vqNwy6JeK0A==}
+    engines: {node: '>= 12'}
+    hasBin: true
+    dev: false
+
   /matchdep@2.0.0:
     resolution: {integrity: sha512-LFgVbaHIHMqCRuCZyfCtUOq9/Lnzhi7Z0KFUE2fhD54+JN2jLh3hC02RLkqauJ3U4soU6H1J3tfj/Byk7GoEjA==}
     engines: {node: '>= 0.10.0'}
     dependencies:
       findup-sync: 2.0.0
       micromatch: 3.1.10
-      resolve: 1.22.3
+      resolve: 1.22.8
       stack-trace: 0.0.10
     transitivePeerDependencies:
       - supports-color
@@ -16195,6 +20080,14 @@ packages:
     resolution: {integrity: sha512-jVU0Nr2B9X3MU4tSK7JP1CMkSvOj7X5l/GboG1tKRw52lLF1x2Ju92Ms9tNetCcbfX3hzlM73zYo2NKkWSfF/A==}
     dev: true
 
+  /mdn-data@2.0.28:
+    resolution: {integrity: sha512-aylIc7Z9y4yzHYAJNuESG3hfhC+0Ibp/MAMiaOZgNv4pmEdFyfZhhhny4MNiAfWdBQ1RQ2mfDWmM1x8SvGyp8g==}
+    dev: true
+
+  /mdn-data@2.0.30:
+    resolution: {integrity: sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==}
+    dev: true
+
   /mdurl@1.0.1:
     resolution: {integrity: sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==}
     dev: false
@@ -16296,6 +20189,11 @@ packages:
     resolution: {integrity: sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==}
     engines: {node: '>=6'}
 
+  /mimic-fn@4.0.0:
+    resolution: {integrity: sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==}
+    engines: {node: '>=12'}
+    dev: true
+
   /min-document@2.19.0:
     resolution: {integrity: sha512-9Wy1B3m3f66bPPmU5hdA4DR4PB2OfDU/+GS3yAB7IQozE3tqXaVv2zOjgla7MEGSRv95+ILmOuvhLkOK6wJtCQ==}
     dependencies:
@@ -16343,6 +20241,13 @@ packages:
       brace-expansion: 2.0.1
     dev: true
 
+  /minimatch@9.0.3:
+    resolution: {integrity: sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==}
+    engines: {node: '>=16 || 14 >=14.17'}
+    dependencies:
+      brace-expansion: 2.0.1
+    dev: true
+
   /minimist@1.2.7:
     resolution: {integrity: sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==}
 
@@ -16406,7 +20311,6 @@ packages:
   /minipass@7.0.2:
     resolution: {integrity: sha512-eL79dXrE1q9dBbDCLg7xfn/vl7MS4F1gvJAgjJrQli/jbQWdUttuVawphqpffoIYfRdq78LHx6GP4bU/EQ2ATA==}
     engines: {node: '>=16 || 14 >=14.17'}
-    dev: true
 
   /minizlib@2.1.2:
     resolution: {integrity: sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==}
@@ -16476,13 +20380,72 @@ packages:
     hasBin: true
     dev: false
 
-  /mlly@1.4.0:
-    resolution: {integrity: sha512-ua8PAThnTwpprIaU47EPeZ/bPUVp2QYBbWMphUQpVdBI3Lgqzm5KZQ45Agm3YJedHXaIHl6pBGabaLSUPPSptg==}
+  /mkdist@1.4.0(typescript@5.3.2):
+    resolution: {integrity: sha512-LzzdzWDx6cWWPd8saIoO+kT5jnbijfeDaE6jZfmCYEi3YL2aJSyF23/tCFee/mDuh/ek1UQeSYdLeSa6oesdiw==}
+    hasBin: true
+    peerDependencies:
+      sass: ^1.69.5
+      typescript: ^5.3.0
+    peerDependenciesMeta:
+      sass:
+        optional: true
+      typescript:
+        optional: true
     dependencies:
-      acorn: 8.10.0
+      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.3.2
+    dev: true
+
+  /ml-array-mean@1.1.6:
+    resolution: {integrity: sha512-MIdf7Zc8HznwIisyiJGRH9tRigg3Yf4FldW8DxKxpCCv/g5CafTw0RRu51nojVEOXuCQC7DRVVu5c7XXO/5joQ==}
+    dependencies:
+      ml-array-sum: 1.1.6
+    dev: false
+
+  /ml-array-sum@1.1.6:
+    resolution: {integrity: sha512-29mAh2GwH7ZmiRnup4UyibQZB9+ZLyMShvt4cH4eTK+cL2oEMIZFnSyB3SS8MlsTh6q/w/yh48KmqLxmovN4Dw==}
+    dependencies:
+      is-any-array: 2.0.1
+    dev: false
+
+  /ml-distance-euclidean@2.0.0:
+    resolution: {integrity: sha512-yC9/2o8QF0A3m/0IXqCTXCzz2pNEzvmcE/9HFKOZGnTjatvBbsn4lWYJkxENkA4Ug2fnYl7PXQxnPi21sgMy/Q==}
+    dev: false
+
+  /ml-distance@4.0.1:
+    resolution: {integrity: sha512-feZ5ziXs01zhyFUUUeZV5hwc0f5JW0Sh0ckU1koZe/wdVkJdGxcP06KNQuF0WBTj8FttQUzcvQcpcrOp/XrlEw==}
+    dependencies:
+      ml-array-mean: 1.1.6
+      ml-distance-euclidean: 2.0.0
+      ml-tree-similarity: 1.0.0
+    dev: false
+
+  /ml-tree-similarity@1.0.0:
+    resolution: {integrity: sha512-XJUyYqjSuUQkNQHMscr6tcjldsOoAekxADTplt40QKfwW6nd++1wHWV9AArl0Zvw/TIHgNaZZNvr8QGvE8wLRg==}
+    dependencies:
+      binary-search: 1.3.6
+      num-sort: 2.1.0
+    dev: false
+
+  /mlly@1.4.2:
+    resolution: {integrity: sha512-i/Ykufi2t1EZ6NaPLdfnZk2AX8cs0d+mTzVKuPfqPKPatxLApaBoxJQ9x1/uckXtrS/U5oisPMDkNs0yQTaBRg==}
+    dependencies:
+      acorn: 8.11.2
       pathe: 1.1.1
       pkg-types: 1.0.3
-      ufo: 1.1.2
+      ufo: 1.3.2
     dev: true
 
   /moment-timezone@0.5.37:
@@ -16562,10 +20525,6 @@ packages:
   /ms@2.0.0:
     resolution: {integrity: sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==}
 
-  /ms@2.1.1:
-    resolution: {integrity: sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==}
-    dev: true
-
   /ms@2.1.2:
     resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==}
 
@@ -16608,6 +20567,21 @@ packages:
       - supports-color
     dev: false
 
+  /mssql@9.1.1:
+    resolution: {integrity: sha512-m0yTx9xzUtTvJpWJHqknUXUDPRnJXZYOOFNygnNIXn1PBkLsC/rkXQdquObd+M0ZPlBhGC00Jg28zG0wCl7VWg==}
+    engines: {node: '>=10'}
+    hasBin: true
+    dependencies:
+      '@tediousjs/connection-string': 0.4.4
+      commander: 9.4.1
+      debug: 4.3.4(supports-color@8.1.1)
+      rfdc: 1.3.0
+      tarn: 3.0.2
+      tedious: 15.1.3
+    transitivePeerDependencies:
+      - supports-color
+    dev: false
+
   /muggle-string@0.3.1:
     resolution: {integrity: sha512-ckmWDJjphvd/FvZawgygcUeQCxzvohjFO5RxTjj4eq8kw359gFF3E1brjfI+viLMxss5JrHTDRHZvu2/tuy0Qg==}
     dev: true
@@ -16682,6 +20656,12 @@ packages:
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
     hasBin: true
 
+  /nanoid@3.3.7:
+    resolution: {integrity: sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==}
+    engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
+    hasBin: true
+    dev: true
+
   /nanomatch@1.2.13:
     resolution: {integrity: sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==}
     engines: {node: '>=0.10.0'}
@@ -16705,9 +20685,9 @@ packages:
     resolution: {integrity: sha512-E7QQoM+3jvNtlmyfqRZ0/U75VFgCls+fSkbml2MpgWkWyz3ox8Y58gNhfuziuQYGNNQAbFZJQck55LHCnCK6CA==}
     dev: false
 
-  /natural-compare-lite@1.4.0:
-    resolution: {integrity: sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==}
-    dev: true
+  /native-promise-only@0.8.1:
+    resolution: {integrity: sha512-zkVhZUA3y8mbz652WrL5x0fB0ehrBkulWT3TomAQ9iDtyXZvzKeEA6GPxAItBYeNYl5yngKRX612qHOhvMkDeg==}
+    dev: false
 
   /natural-compare@1.4.0:
     resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==}
@@ -16726,19 +20706,6 @@ packages:
       randexp: 0.4.6
     dev: false
 
-  /needle@3.2.0:
-    resolution: {integrity: sha512-oUvzXnyLiVyVGoianLijF9O/RecZUf7TkBfimjGrLM4eQhXyeJwM6GeAWccwfQ9aa4gMCZKqhAOuLaMIcQxajQ==}
-    engines: {node: '>= 4.4.x'}
-    hasBin: true
-    dependencies:
-      debug: 3.2.7(supports-color@5.5.0)
-      iconv-lite: 0.6.3
-      sax: 1.2.4
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-    optional: true
-
   /negotiator@0.6.3:
     resolution: {integrity: sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==}
     engines: {node: '>= 0.6'}
@@ -16748,7 +20715,6 @@ packages:
 
   /next-tick@1.1.0:
     resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
-    dev: true
 
   /nice-try@1.0.5:
     resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
@@ -16790,6 +20756,15 @@ packages:
       minimatch: 3.1.2
     dev: true
 
+  /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-native@1.0.1:
     resolution: {integrity: sha512-VzW+TAk2wE4X9maiKMlT+GsPU4OMmR1U9CrHSmd3DFLn2IcZ9VJ6M6BBugGfYUnPCLSYxXdZy17M0BEJyhUTwg==}
     dev: true
@@ -16805,6 +20780,18 @@ packages:
     dependencies:
       whatwg-url: 5.0.0
 
+  /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:
+      encoding: 0.1.13
+      whatwg-url: 5.0.0
+
   /node-forge@1.3.1:
     resolution: {integrity: sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==}
     engines: {node: '>= 6.13.0'}
@@ -16816,6 +20803,11 @@ packages:
     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'}
@@ -16942,7 +20934,7 @@ packages:
     resolution: {integrity: sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==}
     dependencies:
       hosted-git-info: 2.8.9
-      resolve: 1.22.3
+      resolve: 1.22.8
       semver: 7.5.4
       validate-npm-package-license: 3.0.4
     dev: true
@@ -16952,7 +20944,7 @@ packages:
     engines: {node: '>=10'}
     dependencies:
       hosted-git-info: 4.1.0
-      is-core-module: 2.12.1
+      is-core-module: 2.13.1
       semver: 7.5.4
       validate-npm-package-license: 3.0.4
     dev: true
@@ -16998,6 +20990,13 @@ packages:
       path-key: 3.1.1
     dev: true
 
+  /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:
+      path-key: 4.0.0
+    dev: true
+
   /npmlog@5.0.1:
     resolution: {integrity: sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==}
     dependencies:
@@ -17026,6 +21025,11 @@ packages:
     resolution: {integrity: sha512-dK0Ss9C34R/vV0FfYJXuqDAqHlaW9fvWVufq9MmGF2umCuDbd5GRfRD9fpi/LiM0l4ZXf8IBB+RYmZExqCrf0w==}
     dev: false
 
+  /num-sort@2.1.0:
+    resolution: {integrity: sha512-1MQz1Ed8z2yckoBeSfkQHHO9K1yDRxxtotKSJ9yvcTUUxSvfvzEq5GwBrjjHEpMlq/k5gvXdmJ1SbYxWtpNoVg==}
+    engines: {node: '>=8'}
+    dev: false
+
   /number-allocator@1.0.14:
     resolution: {integrity: sha512-OrL44UTVAvkKdOdRQZIJpLkAdjXGTRda052sN4sO77bKEzYYqWKMBjQvrJFzqygI99gL6Z4u2xctPW1tB8ErvA==}
     dependencies:
@@ -17060,6 +21064,10 @@ packages:
     resolution: {integrity: sha512-90yv+6538zuvUMnN+zCr8LuV6bPFdq50304114vJYJ8RDyK8D5O9Phpbd6SZWgI7PwzmmfN1upeOJlvybDSgCw==}
     dev: true
 
+  /nwsapi@2.2.7:
+    resolution: {integrity: sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ==}
+    dev: true
+
   /oauth-1.0a@2.2.6:
     resolution: {integrity: sha512-6bkxv3N4Gu5lty4viIcIAnq5GbxECviMBeKR3WX/q87SPQ8E8aursPZUtsXDnxCs787af09WPRBLqYrf/lwoYQ==}
     dev: false
@@ -17077,6 +21085,11 @@ packages:
       kind-of: 3.2.2
     dev: true
 
+  /object-hash@3.0.0:
+    resolution: {integrity: sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==}
+    engines: {node: '>= 6'}
+    dev: false
+
   /object-inspect@1.12.3:
     resolution: {integrity: sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==}
 
@@ -17130,27 +21143,28 @@ packages:
       es-abstract: 1.22.1
     dev: true
 
-  /object.fromentries@2.0.6:
-    resolution: {integrity: sha512-VciD13dswC4j1Xt5394WR4MzmAQmlgN72phd/riNp9vtD7tp4QQWJ0R4wvclXcafgcYK8veHRed2W6XeGBvcfg==}
+  /object.fromentries@2.0.7:
+    resolution: {integrity: sha512-UPbPHML6sL8PI/mOqPwsH4G6iyXcCGzLin8KvEPenOZN5lpCNBZZQ+V62vdjB1mQHrmqGQt5/OJzemUA+KJmEA==}
     engines: {node: '>= 0.4'}
     dependencies:
       call-bind: 1.0.2
-      define-properties: 1.1.4
-      es-abstract: 1.21.1
+      define-properties: 1.2.0
+      es-abstract: 1.22.1
     dev: true
 
-  /object.getownpropertydescriptors@2.1.4:
-    resolution: {integrity: sha512-sccv3L/pMModT6dJAYF3fzGMVcb38ysQ0tEE6ixv2yXJDtEIPph268OlAdJj5/qZMZDq2g/jqvwppt36uS/uQQ==}
+  /object.getownpropertydescriptors@2.1.7:
+    resolution: {integrity: sha512-PrJz0C2xJ58FNn11XV2lr4Jt5Gzl94qpy9Lu0JlfEj14z88sqbSBJCBEzdlNUCzY2gburhbrwOZ5BHCmuNUy0g==}
     engines: {node: '>= 0.8'}
     dependencies:
-      array.prototype.reduce: 1.0.4
+      array.prototype.reduce: 1.0.6
       call-bind: 1.0.2
       define-properties: 1.2.0
       es-abstract: 1.22.1
+      safe-array-concat: 1.0.0
     dev: false
 
-  /object.groupby@1.0.0:
-    resolution: {integrity: sha512-70MWG6NfRH9GnbZOikuhPPYzpUpof9iW2J9E4dW7FXTqPNb6rllE6u39SKwwiNh8lCwX3DDb5OgcKGiEBrTTyw==}
+  /object.groupby@1.0.1:
+    resolution: {integrity: sha512-HqaQtqLnp/8Bn4GL16cj+CUYbnpe1bh0TtEaWvybszDG4tgxCJuRpV8VGuvNaI1fAnI4lUJzDG55MXcOH4JZcQ==}
     dependencies:
       call-bind: 1.0.2
       define-properties: 1.2.0
@@ -17181,13 +21195,13 @@ packages:
       make-iterator: 1.0.1
     dev: true
 
-  /object.values@1.1.6:
-    resolution: {integrity: sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==}
+  /object.values@1.1.7:
+    resolution: {integrity: sha512-aU6xnDFYT3x17e/f0IiiwlGPTy2jzMySGfUB4fq6z7CV8l85CWHDk5ErhyhpfDHhrOMwGFhSQkhMGHaIotA6Ng==}
     engines: {node: '>= 0.4'}
     dependencies:
       call-bind: 1.0.2
-      define-properties: 1.1.4
-      es-abstract: 1.21.1
+      define-properties: 1.2.0
+      es-abstract: 1.22.1
     dev: true
 
   /on-finished@2.4.1:
@@ -17217,6 +21231,13 @@ packages:
     dependencies:
       mimic-fn: 2.1.0
 
+  /onetime@6.0.0:
+    resolution: {integrity: sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==}
+    engines: {node: '>=12'}
+    dependencies:
+      mimic-fn: 4.0.0
+    dev: true
+
   /ono@7.1.3:
     resolution: {integrity: sha512-9jnfVriq7uJM4o5ganUY54ntUm+5EK21EGaQ5NWnkWg3zz5ywbbonlBguRcnmF1/HDiIe3zxNxXcO1YPBmPcQQ==}
     dependencies:
@@ -17239,6 +21260,24 @@ packages:
       is-docker: 2.2.1
       is-wsl: 2.2.0
 
+  /openai@4.20.0:
+    resolution: {integrity: sha512-VbAYerNZFfIIeESS+OL9vgDkK8Mnri55n+jN0UN/HZeuM0ghGh6nDN6UGRZxslNgyJ7XmY/Ca9DO4YYyvrszGA==}
+    hasBin: true
+    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
+
   /openapi-types@1.3.5:
     resolution: {integrity: sha512-11oi4zYorsgvg5yBarZplAqbpev5HkuVNPlZaPTknPDzAynq+lnJdXAmruGWP0s+dNYZS7bjM+xrTpJw7184Fg==}
     dev: true
@@ -17247,10 +21286,18 @@ packages:
     resolution: {integrity: sha512-Y8xOCT2eiKGYDzMW9R4x5cmfc3vGaaI4EL2pwhDmodWw1HlK18YcZ4uJxc7Rdp7/gGzAygzH9SXr6GKYIXbRcQ==}
     dev: false
 
+  /openapi-types@12.1.3:
+    resolution: {integrity: sha512-N4YtSYJqghVu4iek2ZUvcN/0aqH1kRDuNqzcycDxhOUpg7GdvLa2F3DgS6yBNhInhv2r/6I0Flkn7CqL8+nIcw==}
+    dev: false
+
   /openurl@1.1.1:
     resolution: {integrity: sha512-d/gTkTb1i1GKz5k3XE3XFV/PxQ1k45zDqGP2OA7YhgsaLoqm6qRvARAZOFer1fcXritWlGBRCu/UgeS4HAnXAA==}
     dev: false
 
+  /option@0.2.4:
+    resolution: {integrity: sha512-pkEqbDyl8ou5cpq+VsnQbe/WlEy5qS7xPzMS1U55OCG9KPvwFD46zDbxQIj3egJSFc3D+XhYOPUzz49zQAVy7A==}
+    dev: false
+
   /optionator@0.8.3:
     resolution: {integrity: sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==}
     engines: {node: '>= 0.8.0'}
@@ -17302,15 +21349,6 @@ packages:
       lcid: 1.0.0
     dev: true
 
-  /os-name@1.0.3:
-    resolution: {integrity: sha512-f5estLO2KN8vgtTRaILIgEGBoBrMnZ3JQ7W9TMZCnOIGwHe8TRGSpcagnWDo+Dfhd/z08k9Xe75hvciJJ8Qaew==}
-    engines: {node: '>=0.10.0'}
-    hasBin: true
-    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'}
@@ -17319,14 +21357,6 @@ packages:
     resolution: {integrity: sha512-o6E5qJV5zkAbIDNhGSIlyOhScKXgQrSRMilfph0clDfM0nEnBOlKlH4sWDmG95BW/CvwNz0vmm7dJVtU2KlMiA==}
     dev: true
 
-  /osx-release@1.1.0:
-    resolution: {integrity: sha512-ixCMMwnVxyHFQLQnINhmIpWqXIfS2YOXchwQrk+OFzmo6nDjQ0E4KXAyyUh0T0MZgV4bUhkRrAbVqlE4yLVq4A==}
-    engines: {node: '>=0.10.0'}
-    hasBin: true
-    dependencies:
-      minimist: 1.2.8
-    dev: false
-
   /otpauth@9.1.1:
     resolution: {integrity: sha512-XhimxmkREwf6GJvV4svS9OVMFJ/qRGz+QBEGwtW5OMf9jZlx9yw25RZMXdrO6r7DHgfIaETJb1lucZXZtn3jgw==}
     dependencies:
@@ -17368,9 +21398,9 @@ packages:
     dependencies:
       yocto-queue: 0.1.0
 
-  /p-limit@4.0.0:
-    resolution: {integrity: sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==}
-    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+  /p-limit@5.0.0:
+    resolution: {integrity: sha512-/Eaoq+QyLSiXQ4lyYV23f14mZRQcXnxfHrN0vCai+ak9G0pp9iEQukIIZq5NccEvwRB8PUnZT0KsOoDCINS1qQ==}
+    engines: {node: '>=18'}
     dependencies:
       yocto-queue: 1.0.0
     dev: true
@@ -17407,6 +21437,22 @@ packages:
     dependencies:
       aggregate-error: 3.1.0
 
+  /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
+
+  /p-retry@4.6.2:
+    resolution: {integrity: sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ==}
+    engines: {node: '>=8'}
+    dependencies:
+      '@types/retry': 0.12.0
+      retry: 0.13.1
+    dev: false
+
   /p-timeout@3.2.0:
     resolution: {integrity: sha512-rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==}
     engines: {node: '>=8'}
@@ -17512,12 +21558,19 @@ packages:
     resolution: {integrity: sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==}
     dev: false
 
-  /parse5@7.1.1:
-    resolution: {integrity: sha512-kwpuwzB+px5WUg9pyK0IcK/shltJN5/OVhQagxhCQNtT9Y9QRZqNY2e1cmbu/paRh5LMnz/oVTVLBpjFmMZhSg==}
+  /parse5@7.1.2:
+    resolution: {integrity: sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==}
     dependencies:
       entities: 4.4.0
     dev: true
 
+  /parseley@0.12.1:
+    resolution: {integrity: sha512-e6qHKe3a9HWr0oMRVDTRhKce+bRO8VGQR3NyVwcjwrbhMmFCX9KszEV35+rn4AdilFAq9VPxP/Fe1wC9Qjd2lw==}
+    dependencies:
+      leac: 0.6.0
+      peberminta: 0.9.0
+    dev: false
+
   /parseley@0.7.0:
     resolution: {integrity: sha512-xyOytsdDu077M3/46Am+2cGXEKM9U9QclBDv7fimY7e+BBlxh2JcBp2mgNsmkyA9uvgyTjVzDi7cP1v4hcFxbw==}
     dependencies:
@@ -17547,8 +21600,8 @@ packages:
       passport-strategy: 1.0.0
     dev: false
 
-  /passport-jwt@4.0.0:
-    resolution: {integrity: sha512-BwC0n2GP/1hMVjR4QpnvqA61TxenUMlmfNjYNgK0ZAs0HK4SOQkHcSv4L328blNTLtHq7DbmvyNJiH+bn6C5Mg==}
+  /passport-jwt@4.0.1:
+    resolution: {integrity: sha512-UCKMDYhNuGOBE9/9Ycuoyh7vP6jpeTp/+sfMJl7nLff/t6dps+iaeE0hhNkKN8/HZHcJ7lCdOyDxHdDoxoSvdQ==}
     dependencies:
       jsonwebtoken: 9.0.0
       passport-strategy: 1.0.0
@@ -17574,6 +21627,10 @@ packages:
       ansi-escapes: 3.2.0
       cross-spawn: 6.0.5
 
+  /path-browserify@1.0.1:
+    resolution: {integrity: sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==}
+    dev: true
+
   /path-case@3.0.4:
     resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==}
     dependencies:
@@ -17615,6 +21672,20 @@ packages:
     engines: {node: '>=8'}
     dev: true
 
+  /path-key@4.0.0:
+    resolution: {integrity: sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==}
+    engines: {node: '>=12'}
+    dev: true
+
+  /path-loader@1.0.12:
+    resolution: {integrity: sha512-n7oDG8B+k/p818uweWrOixY9/Dsr89o2TkCm6tOTex3fpdo2+BFDgR+KpB37mGKBRsBAlR8CIJMFN0OEy/7hIQ==}
+    dependencies:
+      native-promise-only: 0.8.1
+      superagent: 7.1.6
+    transitivePeerDependencies:
+      - supports-color
+    dev: false
+
   /path-parse@1.0.7:
     resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==}
 
@@ -17636,15 +21707,6 @@ packages:
     dependencies:
       lru-cache: 9.1.2
       minipass: 7.0.2
-    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
-    dev: false
 
   /path-to-regexp@0.1.7:
     resolution: {integrity: sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==}
@@ -17678,11 +21740,22 @@ packages:
     resolution: {integrity: sha512-e3FBlXLmN/D1S+zHzanP4E/4Z60oFAa3O051qt1pxa7DEJWKAyil6upYVXCWadEnuoqa4Pkc9oUx9zsxYeRv8A==}
     dependencies:
       through: 2.3.8
+    dev: true
 
   /pause@0.0.1:
     resolution: {integrity: sha512-KG8UEiEVkR3wGEb4m5yZkVCzigAD+cVEJck2CzYZO37ZGJfctvVptVO192MwrtPhzONn6go8ylnOdMhKqi4nfg==}
     dev: false
 
+  /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:
@@ -17695,6 +21768,10 @@ packages:
       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'}
@@ -17716,10 +21793,19 @@ packages:
     resolution: {integrity: sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==}
     dev: true
 
+  /pg-cloudflare@1.1.1:
+    resolution: {integrity: sha512-xWPagP/4B6BgFO+EKz3JONXv3YDgvkbVrGw2mTo3D6tVDQRh1e7cqVGvyR3BE+eQgAvx1XhW/iEASj4/jCWl3Q==}
+    dev: false
+    optional: true
+
   /pg-connection-string@2.5.0:
     resolution: {integrity: sha512-r5o/V/ORTA6TmUnyWZR9nCj1klXCO2CEKNRlVuJptZe85QuhFayC7WeMic7ndayT5IRIR0S0xFxFi2ousartlQ==}
     dev: false
 
+  /pg-connection-string@2.6.2:
+    resolution: {integrity: sha512-ch6OwaeaPYcova4kKZ15sbJ2hKb/VP48ZD2gE7i1J+L4MspCtBMAx8nMgz7bksc7IojCIIWuEhHibSMFH8m8oA==}
+    dev: false
+
   /pg-int8@1.0.1:
     resolution: {integrity: sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==}
     engines: {node: '>=4.0.0'}
@@ -17738,6 +21824,14 @@ packages:
       pg: 8.8.0
     dev: false
 
+  /pg-pool@3.6.1(pg@8.11.3):
+    resolution: {integrity: sha512-jizsIzhkIitxCGfPRzJn1ZdcosIt3pz9Sh3V01fm1vZnbnCMgmGl5wvGGdNN2EL9Rmb0EcFoCkixH4Pu+sP9Og==}
+    peerDependencies:
+      pg: '>=8.0'
+    dependencies:
+      pg: 8.11.3
+    dev: false
+
   /pg-promise@10.12.0:
     resolution: {integrity: sha512-7uN64iEHrhtRcOaU/AT3925S20JzQJG2nWVK2IUz5SlhB1eNdkXjAYoQtei+5kLJo81mOWcFq7x9J9VRldp0ig==}
     engines: {node: '>=12.0'}
@@ -17754,6 +21848,10 @@ packages:
     resolution: {integrity: sha512-muRttij7H8TqRNu/DxrAJQITO4Ac7RmX3Klyr/9mJEOBeIpgnF8f9jAfRz5d3XwQZl5qBjF9gLsUtMPJE0vezQ==}
     dev: false
 
+  /pg-protocol@1.6.0:
+    resolution: {integrity: sha512-M+PDm637OY5WM307051+bsDia5Xej6d9IR4GwJse1qA1DIhiKlksvrneZOYQq42OM+spubpcNYEo2FcKQrDk+Q==}
+    dev: false
+
   /pg-types@2.2.0:
     resolution: {integrity: sha512-qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA==}
     engines: {node: '>=4'}
@@ -17765,6 +21863,26 @@ packages:
       postgres-interval: 1.2.0
     dev: false
 
+  /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:
+      pg-cloudflare: 1.1.1
+    dev: false
+
   /pg@8.8.0:
     resolution: {integrity: sha512-UXYN0ziKj+AeNNP7VDMwrehpACThH7LUl/p8TDFpEUuSejCUIwGSfxpHsPvtM6/WXFy6SU4E5RG4IJV/TZAGjw==}
     engines: {node: '>= 8.0.0'}
@@ -17810,11 +21928,11 @@ packages:
     engines: {node: '>=6'}
     dev: true
 
-  /pinia@2.1.6(typescript@5.2.2)(vue@3.3.4):
+  /pinia@2.1.6(typescript@5.3.2)(vue@3.3.4):
     resolution: {integrity: sha512-bIU6QuE5qZviMmct5XwCesXelb5VavdOWKWaB17ggk++NUwQWWbP5YnsONTk3b752QkW9sACiR81rorpeOMSvQ==}
     peerDependencies:
       '@vue/composition-api': ^1.4.0
-      typescript: ^5.2.2
+      typescript: ^5.3.0
       vue: ^2.6.14 || ^3.3.0
     peerDependenciesMeta:
       '@vue/composition-api':
@@ -17823,7 +21941,7 @@ packages:
         optional: true
     dependencies:
       '@vue/devtools-api': 6.5.0
-      typescript: 5.2.2
+      typescript: 5.3.2
       vue: 3.3.4
       vue-demi: 0.14.5(vue@3.3.4)
 
@@ -17847,7 +21965,7 @@ packages:
   /pkce-challenge@3.0.0(patch_hash=dypouzb3lve7vncq25i5fuanki):
     resolution: {integrity: sha512-sQ8sJJJuLhA5pFnoxayMCrFnBMNj7DDpa+TWxOXl4B24oXHlVSADi/3Bowm66QuzWkBuF6DhmaelCdlC2JKwsg==}
     dependencies:
-      crypto-js: 4.1.1
+      crypto-js: 4.2.0
     dev: false
     patched: true
 
@@ -17876,7 +21994,7 @@ packages:
     resolution: {integrity: sha512-nN7pYi0AQqJnoLPC9eHFQ8AcyaixBUOwvqc5TDnIKCMEE6I0y8P7OKA7fPexsXGCGxQDl/cmrLAp26LhcwxZ4A==}
     dependencies:
       jsonc-parser: 3.2.0
-      mlly: 1.4.0
+      mlly: 1.4.2
       pathe: 1.1.1
     dev: true
 
@@ -17903,6 +22021,77 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
+  /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:
+      postcss: 8.4.32
+      postcss-selector-parser: 6.0.13
+      postcss-value-parser: 4.2.0
+    dev: true
+
+  /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:
+      browserslist: 4.21.9
+      caniuse-api: 3.0.0
+      colord: 2.9.3
+      postcss: 8.4.32
+      postcss-value-parser: 4.2.0
+    dev: true
+
+  /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:
+      browserslist: 4.21.9
+      postcss: 8.4.32
+      postcss-value-parser: 4.2.0
+    dev: true
+
+  /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:
+      postcss: 8.4.32
+    dev: true
+
+  /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:
+      postcss: 8.4.32
+    dev: true
+
+  /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
+
+  /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:
+      postcss: 8.4.32
+    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'}
@@ -17919,18 +22108,72 @@ packages:
       webpack: 5.75.0(esbuild@0.18.17)
     dev: true
 
-  /postcss-loader@7.3.3(postcss@8.4.27)(webpack@5.75.0):
-    resolution: {integrity: sha512-YgO/yhtevGO/vJePCQmTxiaEwER94LABZN0ZMT4A0vsak9TpO+RvKRs7EmJ8peIlB9xfXCsS7M8LjqncsUZ5HA==}
-    engines: {node: '>= 14.15.0'}
+  /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: ^7.0.0 || ^8.0.1
-      webpack: ^5.0.0
+      postcss: ^8.4.31
     dependencies:
-      cosmiconfig: 8.2.0
-      jiti: 1.19.1
-      postcss: 8.4.27
-      semver: 7.5.4
-      webpack: 5.75.0(esbuild@0.18.17)
+      postcss: 8.4.32
+      postcss-value-parser: 4.2.0
+      stylehacks: 6.0.1(postcss@8.4.32)
+    dev: 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.21.9
+      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
+
+  /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:
+      postcss: 8.4.32
+      postcss-value-parser: 4.2.0
+    dev: 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:
+      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
+
+  /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:
+      browserslist: 4.21.9
+      cssnano-utils: 4.0.1(postcss@8.4.32)
+      postcss: 8.4.32
+      postcss-value-parser: 4.2.0
+    dev: true
+
+  /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:
+      postcss: 8.4.32
+      postcss-selector-parser: 6.0.13
     dev: true
 
   /postcss-modules-extract-imports@2.0.0:
@@ -17940,34 +22183,13 @@ packages:
       postcss: 7.0.39
     dev: true
 
-  /postcss-modules-extract-imports@3.0.0(postcss@8.4.27):
-    resolution: {integrity: sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==}
-    engines: {node: ^10 || ^12 || >= 14}
-    peerDependencies:
-      postcss: ^8.1.0
-    dependencies:
-      postcss: 8.4.27
-    dev: true
-
   /postcss-modules-local-by-default@3.0.3:
     resolution: {integrity: sha512-e3xDq+LotiGesympRlKNgaJ0PCzoUIdpH0dj47iWAui/kyTgh3CiAr1qP54uodmJhl6p9rN6BoNcdEDVJx9RDw==}
     engines: {node: '>= 6'}
     dependencies:
       icss-utils: 4.1.1
       postcss: 7.0.39
-      postcss-selector-parser: 6.0.11
-      postcss-value-parser: 4.2.0
-    dev: true
-
-  /postcss-modules-local-by-default@4.0.0(postcss@8.4.27):
-    resolution: {integrity: sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==}
-    engines: {node: ^10 || ^12 || >= 14}
-    peerDependencies:
-      postcss: ^8.1.0
-    dependencies:
-      icss-utils: 5.1.0(postcss@8.4.27)
-      postcss: 8.4.27
-      postcss-selector-parser: 6.0.11
+      postcss-selector-parser: 6.0.13
       postcss-value-parser: 4.2.0
     dev: true
 
@@ -17976,17 +22198,7 @@ packages:
     engines: {node: '>= 6'}
     dependencies:
       postcss: 7.0.39
-      postcss-selector-parser: 6.0.11
-    dev: true
-
-  /postcss-modules-scope@3.0.0(postcss@8.4.27):
-    resolution: {integrity: sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==}
-    engines: {node: ^10 || ^12 || >= 14}
-    peerDependencies:
-      postcss: ^8.1.0
-    dependencies:
-      postcss: 8.4.27
-      postcss-selector-parser: 6.0.11
+      postcss-selector-parser: 6.0.13
     dev: true
 
   /postcss-modules-values@3.0.0:
@@ -17996,24 +22208,167 @@ packages:
       postcss: 7.0.39
     dev: true
 
-  /postcss-modules-values@4.0.0(postcss@8.4.27):
-    resolution: {integrity: sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==}
-    engines: {node: ^10 || ^12 || >= 14}
+  /postcss-nested@6.0.1(postcss@8.4.32):
+    resolution: {integrity: sha512-mEp4xPMi5bSWiMbsgoPfcP74lsWLHkQbZc3sY+jWYd65CUwXrUaTp0fmNpa01ZcETKlIgUdFN/MpS2xZtqL9dQ==}
+    engines: {node: '>=12.0'}
     peerDependencies:
-      postcss: ^8.1.0
+      postcss: ^8.2.14
     dependencies:
-      icss-utils: 5.1.0(postcss@8.4.27)
-      postcss: 8.4.27
+      postcss: 8.4.32
+      postcss-selector-parser: 6.0.13
     dev: true
 
-  /postcss-selector-parser@6.0.11:
-    resolution: {integrity: sha512-zbARubNdogI9j7WY4nQJBiNqQf3sLS3wCP4WfOidu+p28LofJqDH1tcXypGrcmMHhDk2t9wGhCsYe/+szLTy1g==}
+  /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:
+      postcss: 8.4.32
+    dev: true
+
+  /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:
+      postcss: 8.4.32
+      postcss-value-parser: 4.2.0
+    dev: true
+
+  /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:
+      postcss: 8.4.32
+      postcss-value-parser: 4.2.0
+    dev: true
+
+  /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:
+      postcss: 8.4.32
+      postcss-value-parser: 4.2.0
+    dev: true
+
+  /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:
+      postcss: 8.4.32
+      postcss-value-parser: 4.2.0
+    dev: true
+
+  /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
+
+  /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:
+      browserslist: 4.21.9
+      postcss: 8.4.32
+      postcss-value-parser: 4.2.0
+    dev: true
+
+  /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
+
+  /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:
+      postcss: 8.4.32
+      postcss-value-parser: 4.2.0
+    dev: true
+
+  /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:
+      cssnano-utils: 4.0.1(postcss@8.4.32)
+      postcss: 8.4.32
+      postcss-value-parser: 4.2.0
+    dev: true
+
+  /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:
+      browserslist: 4.21.9
+      caniuse-api: 3.0.0
+      postcss: 8.4.32
+    dev: true
+
+  /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:
+      postcss: 8.4.32
+      postcss-value-parser: 4.2.0
+    dev: true
+
+  /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
 
+  /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
+
+  /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:
+      postcss: 8.4.32
+      postcss-selector-parser: 6.0.13
+    dev: true
+
   /postcss-value-parser@4.2.0:
     resolution: {integrity: sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==}
     dev: true
@@ -18034,11 +22389,11 @@ packages:
       picocolors: 1.0.0
       source-map-js: 1.0.2
 
-  /postcss@8.4.27:
-    resolution: {integrity: sha512-gY/ACJtJPSmUFPDCHtX78+01fHa64FaU4zaaWfuh1MhGJISufJAH4cun6k/8fwsHYeK4UQmENQK+tRLCFJE8JQ==}
+  /postcss@8.4.32:
+    resolution: {integrity: sha512-D/kj5JNu6oo2EIy+XL/26JEDTlIbB8hw85G8StOE6L74RQAVVP5rej6wxCNqyMbR4RkPfqvezVbPw81Ngd6Kcw==}
     engines: {node: ^10 || ^12 || >=14}
     dependencies:
-      nanoid: 3.3.6
+      nanoid: 3.3.7
       picocolors: 1.0.0
       source-map-js: 1.0.2
     dev: true
@@ -18065,11 +22420,12 @@ packages:
       xtend: 4.0.2
     dev: false
 
-  /posthog-node@2.2.2:
-    resolution: {integrity: sha512-aXYe/D+28kF63W8Cz53t09ypEORz+ULeDCahdAqhVrRm2scbOXFbtnn0GGhvMpYe45grepLKuwui9KxrZ2ZuMw==}
-    engines: {node: '>=14.17.0'}
+  /posthog-node@3.2.1:
+    resolution: {integrity: sha512-ofNX3TPfZPlWErVc2EDk66cIrfp9EXeKBsXFxf8ISXK57b10ANwRnKAlf5rQjxjRKqcUWmV0d3ZfOeVeYracMw==}
+    engines: {node: '>=15.0.0'}
     dependencies:
-      axios: 0.27.2(debug@4.3.4)
+      axios: 1.6.2(debug@3.2.7)
+      rusha: 0.8.14
     transitivePeerDependencies:
       - debug
     dev: false
@@ -18097,8 +22453,8 @@ packages:
       fast-diff: 1.2.0
     dev: true
 
-  /prettier@3.0.3:
-    resolution: {integrity: sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==}
+  /prettier@3.1.0:
+    resolution: {integrity: sha512-TQLvXjq5IAibjh8EpBIkNKxO749UEWABoiIZehEPiY4GNpVdhaFKqSTu+QrlU6D2dPAfubRmtJTi4K4YkQ5eXw==}
     engines: {node: '>=14'}
     hasBin: true
 
@@ -18106,6 +22462,11 @@ packages:
     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}
@@ -18133,6 +22494,15 @@ packages:
       react-is: 18.2.0
     dev: true
 
+  /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:
+      '@jest/schemas': 29.6.3
+      ansi-styles: 5.2.0
+      react-is: 18.2.0
+    dev: true
+
   /pretty-hrtime@1.0.3:
     resolution: {integrity: sha512-66hKPCr+72mlfiSjlEB1+45IjXSqvVAIy6mocupoww4tBFE9R9IhwwUGoI4G++Tc9Aq+2rxOt0RFU6gPcrte0A==}
     engines: {node: '>= 0.8'}
@@ -18190,13 +22560,15 @@ packages:
       retry: 0.12.0
     dev: false
 
-  /promise.prototype.finally@3.1.3:
-    resolution: {integrity: sha512-EXRF3fC9/0gz4qkt/f5EP5iW4kj9oFpBICNpCNOb/52+8nlHIX07FPLbi/q4qYBQ1xZqivMzTpNQSnArVASolQ==}
+  /promise.prototype.finally@3.1.7:
+    resolution: {integrity: sha512-iL9OcJRUZcCE5xn6IwhZxO+eMM0VEXjkETHy+Nk+d9q3s7kxVtPg+mBlMO+ZGxNKNMODyKmy/bOyt/yhxTnvEw==}
     engines: {node: '>= 0.4'}
     dependencies:
       call-bind: 1.0.2
-      define-properties: 1.2.0
+      define-properties: 1.2.1
       es-abstract: 1.22.1
+      get-intrinsic: 1.2.1
+      set-function-name: 2.0.1
     dev: false
 
   /promise@1.3.0:
@@ -18240,6 +22612,51 @@ packages:
     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:
+      protobufjs: 7.2.4
+    dev: false
+
+  /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:
+      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.5.4
+      tmp: 0.2.1
+      uglify-js: 3.17.4
+    dev: false
+
+  /protobufjs@7.2.4:
+    resolution: {integrity: sha512-AT+RJgD2sH8phPmCf7OUZR8xGdcJRga4+1cOaXJ64hvcSkVhNcRHOwIxUatPH15+nj59WAGTDv3LSGZPEQbJaQ==}
+    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
+
   /proxy-addr@2.0.7:
     resolution: {integrity: sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==}
     engines: {node: '>= 0.10'}
@@ -18254,11 +22671,6 @@ packages:
   /proxy-from-env@1.1.0:
     resolution: {integrity: sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==}
 
-  /prr@1.0.1:
-    resolution: {integrity: sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==}
-    dev: true
-    optional: true
-
   /ps-tree@1.2.0:
     resolution: {integrity: sha512-0VnamPPYHl4uaU/nSFeZZpR21QAWRz+sRv4iW9+v/GS/J5U5iZB5BNN6J0RMoOvdx2gWM2+ZFMIm58q24e4UYA==}
     engines: {node: '>= 0.10'}
@@ -18309,7 +22721,7 @@ packages:
       jstransformer: 1.0.0
       pug-error: 2.0.0
       pug-walk: 2.0.0
-      resolve: 1.22.3
+      resolve: 1.22.8
     dev: true
 
   /pug-lexer@5.0.1:
@@ -18380,6 +22792,7 @@ packages:
     dependencies:
       end-of-stream: 1.4.4
       once: 1.4.0
+    dev: true
 
   /pumpify@1.5.1:
     resolution: {integrity: sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==}
@@ -18389,13 +22802,14 @@ packages:
       pump: 2.0.1
     dev: true
 
-  /punycode@1.3.2:
-    resolution: {integrity: sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw==}
-    dev: false
-
   /punycode@2.2.0:
     resolution: {integrity: sha512-LN6QV1IJ9ZhxWTNdktaPClrNfp8xdSAYS0Zk2ddX7XsXZAxckMHPCBcHRo0cTcEIgYPRiGEkmji3Idkh2yFtYw==}
     engines: {node: '>=6'}
+    dev: false
+
+  /punycode@2.3.1:
+    resolution: {integrity: sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==}
+    engines: {node: '>=6'}
 
   /puppeteer-core@2.1.1:
     resolution: {integrity: sha512-n13AWriBMPYxnpbb6bnaY5YoY6rGj8vPLrz6CZF3o0qJNEwlcfJVxBzYZ0NJsQ21UbdJoijPCDrM++SUVEz7+w==}
@@ -18469,10 +22883,9 @@ packages:
       vue: 3.3.4
     dev: false
 
-  /qs@6.10.5:
-    resolution: {integrity: sha512-O5RlPh0VFtR78y79rgcgKK4wbAI0C5zGVLztOIdpWX6ep368q5Hv6XRxDvXuZ9q3C6v+e3n8UfZZJw7IIG27eQ==}
+  /qs@6.10.4:
+    resolution: {integrity: sha512-OQiU+C+Ds5qiH91qh/mg0w+8nwQuLjM4F4M/PbmhDOoYehPh+Fb0bDjtR1sOvy7YKxvj28Y/M0PhP5uVX0kB+g==}
     engines: {node: '>=0.6'}
-    deprecated: when using stringify with arrayFormat comma, `[]` is appended on single-item arrays. Upgrade to v6.11.0 or downgrade to v6.10.4 to fix.
     dependencies:
       side-channel: 1.0.4
     dev: true
@@ -18493,12 +22906,6 @@ packages:
       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.
-    dev: false
-
   /querystringify@2.2.0:
     resolution: {integrity: sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==}
 
@@ -18555,32 +22962,32 @@ packages:
       iconv-lite: 0.4.24
       unpipe: 1.0.0
 
-  /react-colorful@5.6.1(react-dom@18.2.0)(react@17.0.2):
+  /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:
-      react: 17.0.2
-      react-dom: 18.2.0(react@17.0.2)
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
     dev: true
 
-  /react-dom@18.2.0(react@17.0.2):
+  /react-dom@18.2.0(react@18.2.0):
     resolution: {integrity: sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==}
     peerDependencies:
       react: ^18.2.0
     dependencies:
       loose-envify: 1.4.0
-      react: 17.0.2
+      react: 18.2.0
       scheduler: 0.23.0
     dev: true
 
-  /react-inspector@6.0.1(react@17.0.2):
+  /react-inspector@6.0.1(react@18.2.0):
     resolution: {integrity: sha512-cxKSeFTf7jpSSVddm66sKdolG90qURAX3g1roTeaN6x0YEbtWc8JpmFN9+yIqLNH2uEkYerWLtJZIXRIFuBKrg==}
     peerDependencies:
       react: ^16.8.4 || ^17.0.0 || ^18.0.0
     dependencies:
-      react: 17.0.2
+      react: 18.2.0
     dev: true
 
   /react-is@16.13.1:
@@ -18595,23 +23002,71 @@ packages:
     resolution: {integrity: sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==}
     dev: true
 
-  /react-resize-detector@7.1.2(react-dom@18.2.0)(react@17.0.2):
+  /react-remove-scroll-bar@2.3.4(react@18.2.0):
+    resolution: {integrity: sha512-63C4YQBUt0m6ALadE9XV56hV8BgJWDmmTPY758iIJjfQKt2nYwoUrPk0LXRXcB/yIj82T1/Ixfdpdk68LwIB0A==}
+    engines: {node: '>=10'}
+    peerDependencies:
+      '@types/react': ^16.8.0 || ^17.0.0 || ^18.0.0
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+    dependencies:
+      react: 18.2.0
+      react-style-singleton: 2.2.1(react@18.2.0)
+      tslib: 2.6.1
+    dev: true
+
+  /react-remove-scroll@2.5.5(react@18.2.0):
+    resolution: {integrity: sha512-ImKhrzJJsyXJfBZ4bzu8Bwpka14c/fQt0k+cyFp/PBhTfyDnU5hjOtM4AG/0AMyy8oKzOTR0lDgJIM7pYXI0kw==}
+    engines: {node: '>=10'}
+    peerDependencies:
+      '@types/react': ^16.8.0 || ^17.0.0 || ^18.0.0
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+    dependencies:
+      react: 18.2.0
+      react-remove-scroll-bar: 2.3.4(react@18.2.0)
+      react-style-singleton: 2.2.1(react@18.2.0)
+      tslib: 2.6.1
+      use-callback-ref: 1.3.0(react@18.2.0)
+      use-sidecar: 1.1.2(react@18.2.0)
+    dev: true
+
+  /react-resize-detector@7.1.2(react-dom@18.2.0)(react@18.2.0):
     resolution: {integrity: sha512-zXnPJ2m8+6oq9Nn8zsep/orts9vQv3elrpA+R8XTcW7DVVUJ9vwDwMXaBtykAYjMnkCIaOoK9vObyR7ZgFNlOw==}
     peerDependencies:
       react: ^16.0.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.0.0 || ^17.0.0 || ^18.0.0
     dependencies:
       lodash: 4.17.21
-      react: 17.0.2
-      react-dom: 18.2.0(react@17.0.2)
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
     dev: true
 
-  /react@17.0.2:
-    resolution: {integrity: sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==}
+  /react-style-singleton@2.2.1(react@18.2.0):
+    resolution: {integrity: sha512-ZWj0fHEMyWkHzKYUr2Bs/4zU6XLmq9HsgBURm7g5pAVfyn49DgUiNgY2d4lXRlYSiCif9YBGpQleewkcqddc7g==}
+    engines: {node: '>=10'}
+    peerDependencies:
+      '@types/react': ^16.8.0 || ^17.0.0 || ^18.0.0
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+    dependencies:
+      get-nonce: 1.0.1
+      invariant: 2.2.4
+      react: 18.2.0
+      tslib: 2.6.1
+    dev: true
+
+  /react@18.2.0:
+    resolution: {integrity: sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
       loose-envify: 1.4.0
-      object-assign: 4.1.1
     dev: true
 
   /read-pkg-up@1.0.1:
@@ -18780,6 +23235,17 @@ packages:
       redis-parser: 3.0.0
     dev: false
 
+  /redis@4.6.11:
+    resolution: {integrity: sha512-kg1Lt4NZLYkAjPOj/WcyIGWfZfnyfKo1Wg9YKVSlzhFwxpFIl3LYI8BWy1Ab963LLDsTz2+OwdsesHKljB3WMQ==}
+    dependencies:
+      '@redis/bloom': 1.2.0(@redis/client@1.5.12)
+      '@redis/client': 1.5.12
+      '@redis/graph': 1.1.1(@redis/client@1.5.12)
+      '@redis/json': 1.0.6(@redis/client@1.5.12)
+      '@redis/search': 1.1.6(@redis/client@1.5.12)
+      '@redis/time-series': 1.0.5(@redis/client@1.5.12)
+    dev: false
+
   /reflect-metadata@0.1.13:
     resolution: {integrity: sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg==}
     dev: false
@@ -18798,9 +23264,8 @@ packages:
   /regenerator-runtime@0.13.11:
     resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
 
-  /regenerator-runtime@0.13.9:
-    resolution: {integrity: sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==}
-    dev: false
+  /regenerator-runtime@0.14.1:
+    resolution: {integrity: sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==}
 
   /regenerator-transform@0.15.1:
     resolution: {integrity: sha512-knzmNAcuyxV+gQCufkYcvOqX/qIIfHLv0u5x79kRxuGojfYVky1f15TzZEu2Avte8QGepvUNTnLskf8E6X6Vyg==}
@@ -18816,23 +23281,11 @@ packages:
       safe-regex: 1.1.0
     dev: true
 
-  /regex-parser@2.2.11:
-    resolution: {integrity: sha512-jbD/FT0+9MBU2XAZluI7w2OBs1RBi6p9M83nkoZayQXXU9e8Robt69FcZc7wU4eJD/YFTjn1JdCk3rbMJajz8Q==}
-    dev: true
-
   /regexp-tree@0.1.27:
     resolution: {integrity: sha512-iETxpjK6YoRWJG5o6hXLwvjYAoW+FEZn9os0PD/b6AP6xQwsa/Y7lCVgIixBbUPMfhu+i2LtdeAqVTgGlQarfA==}
     hasBin: true
     dev: true
 
-  /regexp.prototype.flags@1.4.3:
-    resolution: {integrity: sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      call-bind: 1.0.2
-      define-properties: 1.2.0
-      functions-have-names: 1.2.3
-
   /regexp.prototype.flags@1.5.0:
     resolution: {integrity: sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==}
     engines: {node: '>= 0.4'}
@@ -18841,18 +23294,6 @@ packages:
       define-properties: 1.2.0
       functions-have-names: 1.2.3
 
-  /regexpu-core@5.2.2:
-    resolution: {integrity: sha512-T0+1Zp2wjF/juXMrMxHxidqGYn8U4R+zleSJhX9tQ1PUsS8a9UtYfbsF9LdiVgNX3kiX8RNaKM42nfSgvFJjmw==}
-    engines: {node: '>=4'}
-    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
-    dev: true
-
   /regexpu-core@5.3.2:
     resolution: {integrity: sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==}
     engines: {node: '>=4'}
@@ -18865,10 +23306,6 @@ packages:
       unicode-match-property-value-ecmascript: 2.1.0
     dev: true
 
-  /regjsgen@0.7.1:
-    resolution: {integrity: sha512-RAt+8H2ZEzHeYWxZ3H2z6tF18zyyOnlcdaafLrm21Bguj7uZy6ULibiAFdXEtKQY4Sy7wDTwDiOazasMLc4KPA==}
-    dev: true
-
   /regjsparser@0.10.0:
     resolution: {integrity: sha512-qx+xQGZVsy55CH0a1hiVwHmqjLryfh7wQyF5HO07XJ9f7dQMY/gPQHhlyDkIzJKC+x2fUCpCcUODUUUFrm7SHA==}
     hasBin: true
@@ -18982,6 +23419,11 @@ packages:
     resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==}
     engines: {node: '>=0.10.0'}
 
+  /require-from-string@2.0.2:
+    resolution: {integrity: sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==}
+    engines: {node: '>=0.10.0'}
+    dev: false
+
   /require-main-filename@1.0.1:
     resolution: {integrity: sha512-IqSUtOVP4ksd1C/ej5zeEh/BIP2ajqpn8c5x+q99gvcIG/Qf0cud5raVnE/Dwd0ua9TXYDoDc0RE5hBSdz22Ug==}
     dev: true
@@ -18993,6 +23435,12 @@ packages:
   /requires-port@1.0.0:
     resolution: {integrity: sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==}
 
+  /requizzle@0.2.4:
+    resolution: {integrity: sha512-JRrFk1D4OQ4SqovXOgdav+K8EAhSB/LJZqCz8tbX0KObcdeM15Ss59ozWMBWmmINMagCwmqn4ZNryUGpBsl6Jw==}
+    dependencies:
+      lodash: 4.17.21
+    dev: false
+
   /resolve-cwd@3.0.0:
     resolution: {integrity: sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==}
     engines: {node: '>=8'}
@@ -19025,17 +23473,6 @@ packages:
       value-or-function: 3.0.0
     dev: true
 
-  /resolve-url-loader@5.0.0:
-    resolution: {integrity: sha512-uZtduh8/8srhBoMx//5bwqjQ+rfYOUq8zC9NrMUGtjBiGTtFJM42s58/36+hTqeqINcnYe08Nj3LkK9lW4N8Xg==}
-    engines: {node: '>=12'}
-    dependencies:
-      adjust-sourcemap-loader: 4.0.0
-      convert-source-map: 1.9.0
-      loader-utils: 2.0.4
-      postcss: 8.4.27
-      source-map: 0.6.1
-    dev: true
-
   /resolve-url@0.2.1:
     resolution: {integrity: sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==}
     deprecated: https://github.com/lydell/resolve-url#deprecated
@@ -19046,14 +23483,30 @@ packages:
     engines: {node: '>=10'}
     dev: true
 
+  /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
+
   /resolve@1.22.3:
     resolution: {integrity: sha512-P8ur/gp/AmbEzjr729bZnLjXK5Z+4P0zhIJgBgzqRih7hL7BOukHGtSTA3ACMY467GRFz3duQsi0bDZdR7DKdw==}
     hasBin: true
     dependencies:
-      is-core-module: 2.12.1
+      is-core-module: 2.13.1
       path-parse: 1.0.7
       supports-preserve-symlinks-flag: 1.0.0
 
+  /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
+    dev: true
+
   /restore-cursor@3.1.0:
     resolution: {integrity: sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==}
     engines: {node: '>=8'}
@@ -19111,7 +23564,6 @@ packages:
     hasBin: true
     dependencies:
       glob: 7.2.3
-    dev: true
 
   /rimraf@2.7.1:
     resolution: {integrity: sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==}
@@ -19138,18 +23590,64 @@ packages:
     resolution: {integrity: sha512-fJhQQI5tLrQvYIYFpOnFinzv9dwmR7hRnUz1XqP3OJ1jIweTNOd6aTO4jwQSgcBSFUB+/KHJxuGneime+FdzOw==}
     dev: false
 
+  /rollup-plugin-dts@6.1.0(rollup@3.29.4)(typescript@5.3.2):
+    resolution: {integrity: sha512-ijSCPICkRMDKDLBK9torss07+8dl9UpY9z1N/zTeA1cIqdzMlpkV3MOOC7zukyvQfDyxa1s3Dl2+DeiP/G6DOw==}
+    engines: {node: '>=16'}
+    peerDependencies:
+      rollup: ^3.29.4 || ^4
+      typescript: ^5.3.0
+    dependencies:
+      magic-string: 0.30.5
+      rollup: 3.29.4
+      typescript: 5.3.2
+    optionalDependencies:
+      '@babel/code-frame': 7.23.5
+    dev: true
+
   /rollup@3.26.3:
     resolution: {integrity: sha512-7Tin0C8l86TkpcMtXvQu6saWH93nhG3dGQ1/+l5V2TDMceTxO7kDiK6GzbfLWNNxqJXm591PcEZUozZm51ogwQ==}
     engines: {node: '>=14.18.0', npm: '>=8.0.0'}
     hasBin: true
     optionalDependencies:
-      fsevents: 2.3.2
+      fsevents: 2.3.3
+    dev: true
+
+  /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
+
+  /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
 
   /route-recognizer@0.3.4:
     resolution: {integrity: sha512-2+MhsfPhvauN1O8KaXpXAOfR/fwe8dnUXVM+xw7yt40lJRfPVQxV6yryZm0cgRvAj5fMF/mdRZbL2ptwbs5i2g==}
     dev: true
 
+  /rrweb-cssom@0.6.0:
+    resolution: {integrity: sha512-APM0Gt1KoXBz0iIkkdB/kfvGOwC4UuJFeG/c+yV7wSc7q96cG/kJ0HiYCnzivD9SB53cLV1MlHFNfOuPaadYSw==}
+    dev: true
+
   /rss-parser@3.12.0:
     resolution: {integrity: sha512-aqD3E8iavcCdkhVxNDIdg1nkBI17jgqF+9OqPS1orwNaOgySdpvq6B+DoONLhzjzwV8mWg37sb60e4bmLK117A==}
     dependencies:
@@ -19172,6 +23670,14 @@ packages:
     hasBin: true
     dev: true
 
+  /rusha@0.8.14:
+    resolution: {integrity: sha512-cLgakCUf6PedEu15t8kbsjnwIFFR2D4RfL+W3iWFJ4iac7z4B0ZI8fxy4R3J956kAI68HclCFGL8MPoUVC3qVA==}
+    dev: false
+
+  /rw@1.3.3:
+    resolution: {integrity: sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ==}
+    dev: false
+
   /rxjs@6.6.7:
     resolution: {integrity: sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==}
     engines: {npm: '>=2.0.0'}
@@ -19193,10 +23699,6 @@ packages:
       has-symbols: 1.0.3
       isarray: 2.0.5
 
-  /safe-buffer@5.1.1:
-    resolution: {integrity: sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==}
-    dev: true
-
   /safe-buffer@5.1.2:
     resolution: {integrity: sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==}
 
@@ -19284,12 +23786,9 @@ packages:
       source-map-js: 1.0.2
     dev: true
 
-  /sax@1.2.1:
-    resolution: {integrity: sha512-8I2a3LovHTOpm7NV5yOyO8IHqgVsfK4+UuySrXU8YXkSRX7k6hCV9b3HrkKCr3nMpgj+0bmocaJJWpvp1oc7ZA==}
-    dev: false
-
   /sax@1.2.4:
     resolution: {integrity: sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==}
+    dev: false
 
   /saxes@6.0.0:
     resolution: {integrity: sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==}
@@ -19334,10 +23833,20 @@ packages:
       ajv-keywords: 3.5.2(ajv@6.12.6)
     dev: true
 
+  /scule@1.1.1:
+    resolution: {integrity: sha512-sHtm/SsIK9BUBI3EFT/Gnp9VoKfY6QLvlkvAE6YK7454IF8FSgJEAnJpVdSC7K5/pjI5NfxhzBLW2JAfYA/shQ==}
+    dev: true
+
   /seedrandom@3.0.5:
     resolution: {integrity: sha512-8OwmbklUNzwezjGInmZ+2clQmExQPvomqjL7LFqOYqtmuxRgQYqOD3mHaU+MvZn5FLUeVxVfQjwLZW/n/JFuqg==}
     dev: true
 
+  /selderee@0.11.0:
+    resolution: {integrity: sha512-5TF+l7p4+OsnP8BCCvSyZiSPc4x4//p5uPwK8TCnVPJYRmU2aYKMpOXvw8zM5a5JvuuCGN1jmsMwuU2W02ukfA==}
+    dependencies:
+      parseley: 0.12.1
+    dev: false
+
   /selderee@0.6.0:
     resolution: {integrity: sha512-ibqWGV5aChDvfVdqNYuaJP/HnVBhlRGSRrlbttmlMpHcLuTqqbMH36QkSs9GEgj5M88JDYLI8eyP94JaQ8xRlg==}
     dependencies:
@@ -19401,17 +23910,6 @@ packages:
       randombytes: 2.1.0
     dev: true
 
-  /serve-favicon@2.5.0:
-    resolution: {integrity: sha512-FMW2RvqNr03x+C0WxTyu6sOv21oOjkq5j8tjquWccwa6ScNyGFOGJVpuS1NmTVGBAHS07xnSKotgf2ehQmf9iA==}
-    engines: {node: '>= 0.8.0'}
-    dependencies:
-      etag: 1.8.1
-      fresh: 0.5.2
-      ms: 2.1.1
-      parseurl: 1.3.3
-      safe-buffer: 5.1.1
-    dev: true
-
   /serve-static@1.15.0:
     resolution: {integrity: sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==}
     engines: {node: '>= 0.8.0'}
@@ -19426,6 +23924,15 @@ packages:
   /set-blocking@2.0.0:
     resolution: {integrity: sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==}
 
+  /set-function-name@2.0.1:
+    resolution: {integrity: sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      define-data-property: 1.1.1
+      functions-have-names: 1.2.3
+      has-property-descriptors: 1.0.0
+    dev: false
+
   /set-value@2.0.1:
     resolution: {integrity: sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==}
     engines: {node: '>=0.10.0'}
@@ -19436,6 +23943,10 @@ packages:
       split-string: 3.1.0
     dev: true
 
+  /setimmediate@1.0.5:
+    resolution: {integrity: sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==}
+    dev: false
+
   /setprototypeof@1.2.0:
     resolution: {integrity: sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==}
 
@@ -19492,7 +24003,6 @@ packages:
       glob: 7.2.3
       interpret: 1.4.0
       rechoir: 0.6.2
-    dev: false
 
   /showdown@2.1.0:
     resolution: {integrity: sha512-/6NVYu4U819R2pUIk79n67SYgJHWCce0a5xTP979WbNp0FL9MN1I1QK662IDU1b6JzKTvmhgI7T7JYIxBi3kMQ==}
@@ -19505,7 +24015,7 @@ packages:
     resolution: {integrity: sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==}
     dependencies:
       call-bind: 1.0.2
-      get-intrinsic: 1.1.3
+      get-intrinsic: 1.2.1
       object-inspect: 1.12.3
 
   /siginfo@2.0.0:
@@ -19515,8 +24025,8 @@ packages:
   /signal-exit@3.0.7:
     resolution: {integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==}
 
-  /signal-exit@4.0.2:
-    resolution: {integrity: sha512-MY2/qGx4enyjprQnFaZsHib3Yadh3IXyV2C321GY0pjGfVBu4un0uDJkwgdxqO+Rdx8JMT8IfJIRwbYVz3Ob3Q==}
+  /signal-exit@4.1.0:
+    resolution: {integrity: sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==}
     engines: {node: '>=14'}
     dev: true
 
@@ -19540,13 +24050,6 @@ packages:
       is-arrayish: 0.3.2
     dev: false
 
-  /simple-update-notifier@1.0.7:
-    resolution: {integrity: sha512-BBKgR84BJQJm6WjWFMHgLVuo61FBDSj1z/xSFUIozqO6wO7ii0JxCqlIud7Enr/+LhlbNI0whErq96P2qHNWew==}
-    engines: {node: '>=8.10.0'}
-    dependencies:
-      semver: 7.5.4
-    dev: true
-
   /simple-update-notifier@2.0.0:
     resolution: {integrity: sha512-a2B9Y0KlNXl9u/vsW6sTIu9vGEpfKu2wRV6l1H3XEas/0gUIzGzBoP/IouTcUQbm9JWZLH3COxyn03TYlFax6w==}
     engines: {node: '>=10'}
@@ -19629,19 +24132,22 @@ packages:
       - supports-color
     dev: true
 
-  /snowflake-sdk@1.8.0(asn1.js@5.4.1):
-    resolution: {integrity: sha512-zdU1c+ytIZclF4K6D4XPPHa5II6l6cOQdsLdvKP95IwSdTYJz324ESA7fPcg/rwYV7vUKnIZJ9OCjB1mE7D2IQ==}
+  /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.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
-      aws-sdk: 2.1231.0
-      axios: 0.27.2(debug@3.2.7)
+      axios: 1.6.2(debug@3.2.7)
       big-integer: 1.6.51
-      bignumber.js: 2.4.0
+      bignumber.js: 9.1.2
       binascii: 0.0.2
       bn.js: 5.2.1
       browser-request: 0.3.3
@@ -19649,9 +24155,10 @@ packages:
       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: 7.2.3
-      https-proxy-agent: 5.0.1
+      glob: 9.3.2
+      https-proxy-agent: 7.0.2
       jsonwebtoken: 9.0.0
       mime-types: 2.1.35
       mkdirp: 1.0.4
@@ -19660,15 +24167,12 @@ packages:
       open: 7.4.2
       python-struct: 1.1.3
       simple-lru-cache: 0.0.2
-      string-similarity: 4.0.4
       tmp: 0.2.1
-      urllib: 2.41.0
-      uuid: 3.4.0
+      uuid: 8.3.2
       winston: 3.8.2
     transitivePeerDependencies:
-      - asn1.js
+      - aws-crt
       - encoding
-      - proxy-agent
       - supports-color
     dev: false
 
@@ -19904,9 +24408,9 @@ packages:
   /standard-as-callback@2.1.0:
     resolution: {integrity: sha512-qoRRSyROncaz1z0mvYqIE4lCd9p2R90i6GxW3uZv5ucSu8tU7B5HXUP1gG8pVZsYNVaXjk8ClXHPttLyxAL48A==}
 
-  /start-server-and-test@2.0.0:
-    resolution: {integrity: sha512-UqKLw0mJbfrsG1jcRLTUlvuRi9sjNuUiDOLI42r7R5fA9dsFoywAy9DoLXNYys9B886E4RCKb+qM1Gzu96h7DQ==}
-    engines: {node: '>=6'}
+  /start-server-and-test@2.0.3:
+    resolution: {integrity: sha512-QsVObjfjFZKJE6CS6bSKNwWZCKBG6975/jKRPPGFfFh+yOQglSeGXiNWjzgQNXdphcBI9nXbyso9tPfX4YAUhg==}
+    engines: {node: '>=16'}
     hasBin: true
     dependencies:
       arg: 5.0.2
@@ -19916,7 +24420,7 @@ packages:
       execa: 5.1.1
       lazy-ass: 1.6.0
       ps-tree: 1.2.0
-      wait-on: 7.0.1(debug@4.3.4)
+      wait-on: 7.2.0(debug@4.3.4)
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -19935,17 +24439,12 @@ packages:
       object-copy: 0.1.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'}
 
-  /std-env@3.3.3:
-    resolution: {integrity: sha512-Rz6yejtVyWnVjC1RFvNmYL10kgjC49EOghxWn0RFqlCHGFpQx+Xe7yW3I4ceK1SGrWIGMjD5Kbue8W/udkbMJg==}
+  /std-env@3.6.0:
+    resolution: {integrity: sha512-aFZ19IgVmhdB2uX599ve2kE6BIE3YMnQ6Gp6BURhW/oIzpXGKr878TQfAQZn1+i0Flcc/UKUy1gOlcfaUBCryg==}
     dev: true
 
   /stop-iteration-iterator@1.0.0:
@@ -19963,7 +24462,7 @@ packages:
     resolution: {integrity: sha512-siT1RiqlfQnGqgT/YzXVUNsom9S0H1OX+dpdGN1xkyYATo4I6sep5NmsRD/40s3IIOvlCq6akxkqG82urIZW1w==}
     dev: true
 
-  /storybook-addon-themes@6.1.0(react-dom@18.2.0)(react@17.0.2)(vue@3.3.4):
+  /storybook-addon-themes@6.1.0(react-dom@18.2.0)(react@18.2.0)(vue@3.3.4):
     resolution: {integrity: sha512-ZT8aNgrwFVNEOmOPBLNS0WBacjvMFo/bZ83P8MmsJ3Ewqt0AbmPioghTZccARUn/EQ+LrDxyh2D0QgmLaKo07Q==}
     peerDependencies:
       react: '*'
@@ -19977,21 +24476,21 @@ packages:
       vue:
         optional: true
     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/addons': 6.5.15(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/api': 6.5.15(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/components': 6.5.15(react-dom@18.2.0)(react@18.2.0)
       '@storybook/core-events': 6.5.15
-      '@storybook/theming': 6.5.15(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/theming': 6.5.15(react-dom@18.2.0)(react@18.2.0)
       core-js: 3.31.0
       global: 4.4.0
       memoizerific: 1.11.3
-      react: 17.0.2
+      react: 18.2.0
       vue: 3.3.4
     transitivePeerDependencies:
       - react-dom
     dev: true
 
-  /storybook-dark-mode@3.0.1(react-dom@18.2.0)(react@17.0.2):
+  /storybook-dark-mode@3.0.1(react-dom@18.2.0)(react@18.2.0):
     resolution: {integrity: sha512-3V6XBhkUq63BF6KzyDBbfV5/8sYtF4UtVccH1tK+Lrd4p0tF8k7yHOvVDhFL9hexnKXcLEnbC+42YDTPvjpK+A==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -20002,23 +24501,23 @@ packages:
       react-dom:
         optional: true
     dependencies:
-      '@storybook/addons': 7.0.7(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/api': 7.1.1(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/components': 7.1.1(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/addons': 7.0.7(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/api': 7.1.1(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/components': 7.1.1(react-dom@18.2.0)(react@18.2.0)
       '@storybook/core-events': 7.1.1
       '@storybook/global': 5.0.0
-      '@storybook/theming': 7.1.1(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/theming': 7.1.1(react-dom@18.2.0)(react@18.2.0)
       fast-deep-equal: 3.1.3
       memoizerific: 1.11.3
-      react: 17.0.2
-      react-dom: 18.2.0(react@17.0.2)
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
     dev: true
 
-  /storybook@7.1.1:
-    resolution: {integrity: sha512-5/FIgiD574uwwDGtyyMuqXSOw4kzpEiPbMy1jMWmc8lI2g6vynwbyWqqXmVqtKpJa1vVCM4+KjFqZCmyXFJiZQ==}
+  /storybook@7.5.2:
+    resolution: {integrity: sha512-wuB5VdmI6teU2z5iiBEZ2ziNeP6g6Da/dGM7+tWQVUl8bmfOmpEgzgEyS1/XqdOfm+HoZplspwM0XMHOLo/Now==}
     hasBin: true
     dependencies:
-      '@storybook/cli': 7.1.1
+      '@storybook/cli': 7.5.2
     transitivePeerDependencies:
       - bufferutil
       - encoding
@@ -20079,11 +24578,6 @@ packages:
       strip-ansi: 6.0.1
     dev: true
 
-  /string-similarity@4.0.4:
-    resolution: {integrity: sha512-/q/8Q4Bl4ZKAPjj8WerIBJWALKkaPRfrvhfF8k/B23i4nzrlRj2/go1m90In7nG/3XDSbOo0+pu6RvCTM9RGMQ==}
-    deprecated: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.
-    dev: false
-
   /string-width@1.0.2:
     resolution: {integrity: sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==}
     engines: {node: '>=0.10.0'}
@@ -20200,6 +24694,11 @@ packages:
     engines: {node: '>=6'}
     dev: true
 
+  /strip-final-newline@3.0.0:
+    resolution: {integrity: sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==}
+    engines: {node: '>=12'}
+    dev: true
+
   /strip-indent@3.0.0:
     resolution: {integrity: sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==}
     engines: {node: '>=8'}
@@ -20210,12 +24709,11 @@ packages:
   /strip-json-comments@3.1.1:
     resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==}
     engines: {node: '>=8'}
-    dev: true
 
-  /strip-literal@1.0.1:
-    resolution: {integrity: sha512-QZTsipNpa2Ppr6v1AmJHESqJ3Uz247MUS0OjrnnZjFAvEoWqxuyFuXn2xLgMtRnijJShAa1HL0gtJyUs7u7n3Q==}
+  /strip-literal@1.3.0:
+    resolution: {integrity: sha512-PugKzOsyXpArk0yWmUwqOZecSO0GH0bPoctLcqNDH9J04pVW3lflYE0ujElBGTloevcxF5MofAOZ7C5l2b+wLg==}
     dependencies:
-      acorn: 8.10.0
+      acorn: 8.11.2
     dev: true
 
   /strnum@1.0.5:
@@ -20245,19 +24743,45 @@ packages:
       webpack: 5.75.0(esbuild@0.18.17)
     dev: true
 
-  /style-loader@3.3.3(webpack@5.75.0):
-    resolution: {integrity: sha512-53BiGLXAcll9maCYtZi2RCQZKa8NQQai5C4horqKyRmHj9H7QmcUyucrH+4KW/gBQbXM2AsB0axoEcFZPlfPcw==}
-    engines: {node: '>= 12.13.0'}
-    peerDependencies:
-      webpack: ^5.0.0
-    dependencies:
-      webpack: 5.75.0(esbuild@0.18.17)
-    dev: true
-
   /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
+
+  /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.21.9
+      postcss: 8.4.32
+      postcss-selector-parser: 6.0.13
+    dev: true
+
+  /superagent@7.1.6:
+    resolution: {integrity: sha512-gZkVCQR1gy/oUXr+kxJMLDjla434KmSOKbx5iGD30Ql+AkJQ/YlPKECJy2nhqOsHLjGHzoDTXNSjhnvWhzKk7g==}
+    engines: {node: '>=6.4.0 <13 || >=14'}
+    deprecated: Please downgrade to v7.1.5 if you need IE/ActiveXObject support OR upgrade to v8.0.0 as we no longer support IE and published an incorrect patch version (see https://github.com/visionmedia/superagent/issues/1731)
+    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
+      readable-stream: 3.6.0
+      semver: 7.5.4
+    transitivePeerDependencies:
+      - supports-color
+    dev: false
+
   /superagent@8.0.9:
     resolution: {integrity: sha512-4C7Bh5pyHTvU33KpZgwrNKh/VQnvgtCSqPRfJAUdmrtSYePVzVg4E4OzsrbkhJj9O7SO6Bnv75K/F8XVZT8YHA==}
     engines: {node: '>=6.4.0 <13 || >=14'}
@@ -20322,6 +24846,20 @@ packages:
       es6-symbol: 3.1.3
     dev: true
 
+  /svgo@3.1.0:
+    resolution: {integrity: sha512-R5SnNA89w1dYgNv570591F66v34b3eQShpIBcQtZtM5trJwm1VvxbIoMpRYY3ybTAutcKTLEmTsdnaknOHbiQA==}
+    engines: {node: '>=14.0.0'}
+    hasBin: true
+    dependencies:
+      '@trysound/sax': 0.2.0
+      commander: 7.2.0
+      css-select: 5.1.0
+      css-tree: 2.3.1
+      css-what: 6.1.0
+      csso: 5.0.5
+      picocolors: 1.0.0
+    dev: true
+
   /swagger-ui-dist@4.14.3:
     resolution: {integrity: sha512-Y7Sta24I9r+G6dX3ZTIq9Psr55cDC3myCB0E00ZnVkB0Wn3cO77NdLXSM0f90WZh9VpgTetKpMPR3n2VqKr+lQ==}
     dev: false
@@ -20424,13 +24962,33 @@ packages:
       - supports-color
     dev: false
 
+  /tedious@15.1.3:
+    resolution: {integrity: sha512-166EpRm5qknwhEisjZqz/mF7k14fXKJYHRg6XiAXVovd/YkyHJ3SG4Ppy89caPaNFfRr7PVYe+s4dAvKaCMFvw==}
+    engines: {node: '>=14'}
+    dependencies:
+      '@azure/identity': 2.1.0
+      '@azure/keyvault-keys': 4.6.0
+      '@js-joda/core': 5.4.1
+      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.3.1
+      sprintf-js: 1.1.2
+    transitivePeerDependencies:
+      - supports-color
+    dev: false
+
   /teeny-request@8.0.3:
     resolution: {integrity: sha512-jJZpA5He2y52yUhA7pyAGZlgQpcB+xLjcN0eUFxr9c8hP/H7uOXbBNVo/O0C/xVfJLJs680jvkFgVJEEvk9+ww==}
     engines: {node: '>=12'}
     dependencies:
       http-proxy-agent: 5.0.0
       https-proxy-agent: 5.0.1
-      node-fetch: 2.6.8
+      node-fetch: 2.7.0(encoding@0.1.13)
       stream-events: 1.0.5
       uuid: 9.0.0
     transitivePeerDependencies:
@@ -20451,8 +25009,8 @@ packages:
       memoizerific: 1.11.3
     dev: true
 
-  /telejson@7.0.4:
-    resolution: {integrity: sha512-J4QEuCnYGXAI9KSN7RXK0a0cOW2ONpjc4IQbInGZ6c3stvplLAYyZjTnScrRd8deXVjNCFV1wXcLC7SObDuQYA==}
+  /telejson@7.2.0:
+    resolution: {integrity: sha512-1QTEcJkJEhc8OnStBx/ILRu5J2p0GjvWsBx56bmZRqnrkdBMUe+nX92jxV+p3dB4CP6PZCdJMQJwCggkNBMzkQ==}
     dependencies:
       memoizerific: 1.11.3
     dev: true
@@ -20469,6 +25027,14 @@ packages:
       rimraf: 2.6.3
     dev: true
 
+  /temp@0.9.4:
+    resolution: {integrity: sha512-yYrrsWnrXMcdsnu/7YMYAofM1ktpL5By7vZhf15CrXijWWrEYZks5AXBudalfSWJLlnen/QUJUB5aoB0kqZUGA==}
+    engines: {node: '>=6.0.0'}
+    dependencies:
+      mkdirp: 0.5.6
+      rimraf: 2.6.3
+    dev: false
+
   /tempy@1.0.1:
     resolution: {integrity: sha512-biM9brNqxSc04Ee71hzFbryD11nX7VPhQQY32AdDmjFvodsRFz/3ufeoTZ6uYkRFfGo188tENcASNs3vTdsM0w==}
     engines: {node: '>=10'}
@@ -20511,7 +25077,7 @@ packages:
     hasBin: true
     dependencies:
       '@jridgewell/source-map': 0.3.2
-      acorn: 8.10.0
+      acorn: 8.11.2
       commander: 2.20.3
       source-map-support: 0.5.21
     dev: true
@@ -20592,17 +25158,17 @@ packages:
     resolution: {integrity: sha512-AD5ih2NlSssTCwsMznbvwMZpJ1cbhkGd2uueNxzv2jDlEeZdU04JQfRnggJQ8DrcVBGjAsCKwFBbDlVNtEMlzw==}
     dev: true
 
-  /tinybench@2.5.0:
-    resolution: {integrity: sha512-kRwSG8Zx4tjF9ZiyH4bhaebu+EDz1BOx9hOigYHlUW4xxI/wKIUQUqo018UlU4ar6ATPBsaMrdbKZ+tmPdohFA==}
+  /tinybench@2.5.1:
+    resolution: {integrity: sha512-65NKvSuAVDP/n4CqH+a9w2kTlLReS9vhsAP06MWx+/89nMinJyB2icyl58RIcqCmIggpojIGeuJGhjU1aGMBSg==}
     dev: true
 
-  /tinypool@0.6.0:
-    resolution: {integrity: sha512-FdswUUo5SxRizcBc6b1GSuLpLjisa8N8qMyYoP3rl+bym+QauhtJP5bvZY1ytt8krKGmMLYIRl36HBZfeAoqhQ==}
+  /tinypool@0.8.1:
+    resolution: {integrity: sha512-zBTCK0cCgRROxvs9c0CGK838sPkeokNGdQVUUwHAbynHFlmyJYj825f/oRs528HaIJ97lo0pLIlDUzwN+IorWg==}
     engines: {node: '>=14.0.0'}
     dev: true
 
-  /tinyspy@2.1.1:
-    resolution: {integrity: sha512-XPJL2uSzcOyBMky6OFrusqWlzfFrXtE0hPuMgW8A2HmaqrPo4ZQHRN/V0QXN3FSjKxpsbRrFc5LI7KOwBsT1/w==}
+  /tinyspy@2.2.0:
+    resolution: {integrity: sha512-d2eda04AN/cPOR89F7Xv5bK/jrQEhmcLFe6HFldoeO9AJtps+fqEnh486vnT/8y4bw38pSyxDcTCAq+Ks2aJTg==}
     engines: {node: '>=14.0.0'}
     dev: true
 
@@ -20699,10 +25265,6 @@ packages:
     resolution: {integrity: sha512-vXk8htr8mIl3hc2s2mDkaPTBfqmqZA2o0x7eXbxUibdrpEIPdpM0L9hH/RvEvlgSM+ZTgS34sGipk5+VrLJCLA==}
     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'}
@@ -20735,7 +25297,7 @@ packages:
     engines: {node: '>=6'}
     dependencies:
       psl: 1.9.0
-      punycode: 2.2.0
+      punycode: 2.3.1
       universalify: 0.2.0
       url-parse: 1.5.10
 
@@ -20746,14 +25308,21 @@ packages:
     resolution: {integrity: sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==}
     engines: {node: '>=12'}
     dependencies:
-      punycode: 2.2.0
+      punycode: 2.3.1
+
+  /tr46@5.0.0:
+    resolution: {integrity: sha512-tk2G5R2KRwBd+ZN0zaEXpmzdKyOYksXwywulIX95MBODjSzMIuQnQ3m8JxgbhnL1LeVo7lqQKsYa1O3Htl7K5g==}
+    engines: {node: '>=18'}
+    dependencies:
+      punycode: 2.3.1
+    dev: true
 
   /transliteration@2.3.5:
     resolution: {integrity: sha512-HAGI4Lq4Q9dZ3Utu2phaWgtm3vB6PkLUFqWAScg/UW+1eZ/Tg6Exo4oC0/3VUol/w4BlefLhUUSVBr/9/ZGQOw==}
     engines: {node: '>=6.0.0'}
     hasBin: true
     dependencies:
-      yargs: 17.6.0
+      yargs: 17.7.2
     dev: false
 
   /tree-kill@1.2.2:
@@ -20765,13 +25334,13 @@ packages:
     resolution: {integrity: sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw==}
     dev: false
 
-  /ts-api-utils@1.0.1(typescript@5.2.2):
+  /ts-api-utils@1.0.1(typescript@5.3.2):
     resolution: {integrity: sha512-lC/RGlPmwdrIBFTX59wwNzqh7aR2otPNPR/5brHZm/XKFYKsfqxihXUe9pU3JI+3vGkl+vyCoNNnPhJn3aLK1A==}
     engines: {node: '>=16.13.0'}
     peerDependencies:
-      typescript: ^5.2.2
+      typescript: ^5.3.0
     dependencies:
-      typescript: 5.2.2
+      typescript: 5.3.2
     dev: true
 
   /ts-dedent@2.2.0:
@@ -20779,15 +25348,28 @@ packages:
     engines: {node: '>=6.10'}
     dev: true
 
-  /ts-essentials@7.0.3(typescript@5.2.2):
+  /ts-essentials@7.0.3(typescript@5.3.2):
     resolution: {integrity: sha512-8+gr5+lqO3G84KdiTSMRLtuyJ+nTBVRKuCrK4lidMPdVeEp0uqC875uE5NMcaA7YYMN7XsNiFQuMvasF8HT/xQ==}
     peerDependencies:
-      typescript: ^5.2.2
+      typescript: ^5.3.0
     dependencies:
-      typescript: 5.2.2
+      typescript: 5.3.2
     dev: true
 
-  /ts-jest@29.1.1(@babel/core@7.22.9)(jest@29.6.2)(typescript@5.2.2):
+  /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
+
+  /ts-jest@29.1.1(@babel/core@7.22.9)(jest@29.6.2)(typescript@5.3.2):
     resolution: {integrity: sha512-D6xjnnbP17cC85nliwGiL+tpoKN0StpgE0TeOjXQTU6MVCfsB4v7aW05CgQ/1OywGb0x/oy9hHFnN+sczTiRaA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     hasBin: true
@@ -20797,7 +25379,7 @@ packages:
       babel-jest: ^29.0.0
       esbuild: '*'
       jest: ^29.0.0
-      typescript: ^5.2.2
+      typescript: ^5.3.0
     peerDependenciesMeta:
       '@babel/core':
         optional: true
@@ -20817,7 +25399,7 @@ packages:
       lodash.memoize: 4.1.2
       make-error: 1.3.6
       semver: 7.5.4
-      typescript: 5.2.2
+      typescript: 5.3.2
       yargs-parser: 21.1.1
     dev: true
 
@@ -20825,6 +25407,21 @@ packages:
     resolution: {integrity: sha512-vDWbsl26LIcPGmDpoVzjEP6+hvHZkBkLW7JpvwbCv/5IYPJlsbzCVXY3wsCeAxAUeTclNOUZxnLdGh3VBD/J6w==}
     dev: true
 
+  /ts-toolbelt@9.6.0:
+    resolution: {integrity: sha512-nsZd8ZeNUzukXPlJmTBwUAuABDe/9qtVDelJeT/qW0ow3ZS3BsQJtNkan1802aM9Uf68/Y8ljw86Hu0h5IUW3w==}
+    dev: false
+
+  /ts-type@3.0.1(ts-toolbelt@9.6.0):
+    resolution: {integrity: sha512-cleRydCkBGBFQ4KAvLH0ARIkciduS745prkGVVxPGvcRGhMMoSJUB7gNR1ByKhFTEYrYRg2CsMRGYnqp+6op+g==}
+    peerDependencies:
+      ts-toolbelt: ^9.6.0
+    dependencies:
+      '@types/node': 18.16.16
+      ts-toolbelt: 9.6.0
+      tslib: 2.6.1
+      typedarray-dts: 1.0.0
+    dev: false
+
   /tsc-alias@1.8.7:
     resolution: {integrity: sha512-59Q/zUQa3miTf99mLbSqaW0hi1jt4WoG8Uhe5hSZJHQpSoFW9eEwvW7jlKMHXWvT+zrzy3SN9PE/YBhQ+WVydA==}
     hasBin: true
@@ -20837,18 +25434,18 @@ packages:
       plimit-lit: 1.4.1
     dev: true
 
-  /tsc-watch@6.0.4(typescript@5.2.2):
+  /tsc-watch@6.0.4(typescript@5.3.2):
     resolution: {integrity: sha512-cHvbvhjO86w2aGlaHgSCeQRl+Aqw6X6XN4sQMPZKF88GoP30O+oTuh5lRIJr5pgFWrRpF1AgXnJJ2DoFEIPHyg==}
     engines: {node: '>=12.12.0'}
     hasBin: true
     peerDependencies:
-      typescript: ^5.2.2
+      typescript: ^5.3.0
     dependencies:
       cross-spawn: 7.0.3
       node-cleanup: 2.1.2
       ps-tree: 1.2.0
       string-argv: 0.3.1
-      typescript: 5.2.2
+      typescript: 5.3.2
     dev: true
 
   /tsconfig-paths@4.2.0:
@@ -20868,16 +25465,6 @@ packages:
     engines: {node: '>=0.6.x'}
     dev: false
 
-  /tsutils@3.21.0(typescript@5.2.2):
-    resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
-    engines: {node: '>= 6'}
-    peerDependencies:
-      typescript: ^5.2.2
-    dependencies:
-      tslib: 2.6.1
-      typescript: 5.2.2
-    dev: true
-
   /tunnel-agent@0.6.0:
     resolution: {integrity: sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==}
     dependencies:
@@ -20970,7 +25557,6 @@ packages:
   /type-detect@4.0.8:
     resolution: {integrity: sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==}
     engines: {node: '>=4'}
-    dev: true
 
   /type-fest@0.16.0:
     resolution: {integrity: sha512-eaBzG6MxNzEn9kiwvtre90cXaNLkmadMWa1zQMs3XORCXNbsH/OewwbxC5ia9dCxIxnTAsSxXJaa/p5y8DlvJg==}
@@ -21001,11 +25587,6 @@ packages:
     engines: {node: '>=12.20'}
     dev: true
 
-  /type-fest@3.13.1:
-    resolution: {integrity: sha512-tLq3bSNx+xSpwvAJnzrK0Ep5CLNWjvFTOp71URMaAEWBfRb9nnJiBoUe0tF8bI4ZFO3omgBR6NvnbzVUT3Ly4g==}
-    engines: {node: '>=14.16'}
-    dev: true
-
   /type-is@1.6.18:
     resolution: {integrity: sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==}
     engines: {node: '>= 0.6'}
@@ -21015,11 +25596,9 @@ packages:
 
   /type@1.2.0:
     resolution: {integrity: sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==}
-    dev: true
 
   /type@2.7.2:
     resolution: {integrity: sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==}
-    dev: true
 
   /typed-array-buffer@1.0.0:
     resolution: {integrity: sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==}
@@ -21055,16 +25634,19 @@ packages:
       for-each: 0.3.3
       is-typed-array: 1.1.10
 
+  /typedarray-dts@1.0.0:
+    resolution: {integrity: sha512-Ka0DBegjuV9IPYFT1h0Qqk5U4pccebNIJCGl8C5uU7xtOs+jpJvKGAY4fHGK25hTmXZOEUl9Cnsg5cS6K/b5DA==}
+    dev: false
+
   /typedarray-to-buffer@3.1.5:
     resolution: {integrity: sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==}
     dependencies:
       is-typedarray: 1.0.0
-    dev: true
 
   /typedarray@0.0.6:
     resolution: {integrity: sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==}
 
-  /typedi@0.10.0(patch_hash=62r6bc2crgimafeyruodhqlgo4):
+  /typedi@0.10.0(patch_hash=sk6omkefrosihg7lmqbzh7vfxe):
     resolution: {integrity: sha512-v3UJF8xm68BBj6AF4oQML3ikrfK2c9EmZUyLOfShpJuItAqVBHWP/KtpGinkSsIiP6EZyyb6Z3NXyW9dgS9X1w==}
     dev: false
     patched: true
@@ -21150,8 +25732,89 @@ packages:
       - supports-color
     dev: false
 
-  /typescript@5.2.2:
-    resolution: {integrity: sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==}
+  /typeorm@0.3.17(mssql@9.1.1)(pg@8.11.3)(redis@4.6.11)(sqlite3@5.1.6):
+    resolution: {integrity: sha512-UDjUEwIQalO9tWw9O2A4GU+sT3oyoUXheHJy4ft+RFdnRdQctdQ34L9SqE2p7LdwzafHx1maxT+bqXON+Qnmig==}
+    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: ^5.2.0
+      mssql: ^9.1.1
+      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.9.1
+      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
+    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.30.0
+      debug: 4.3.4(supports-color@8.1.1)
+      dotenv: 16.3.1
+      glob: 8.1.0
+      mkdirp: 2.1.3
+      mssql: 9.1.1
+      pg: 8.11.3
+      redis: 4.6.11
+      reflect-metadata: 0.1.13
+      sha.js: 2.4.11
+      sqlite3: 5.1.6
+      tslib: 2.6.1
+      uuid: 9.0.0
+      yargs: 17.7.2
+    transitivePeerDependencies:
+      - supports-color
+    dev: false
+
+  /typescript@5.3.2:
+    resolution: {integrity: sha512-6l+RyNy7oAHDfxC4FzSJcz9vnjTKxrLpDG5M2Vu4SHRVNg6xzqZp6LYSR9zjqQTu8DU/f5xwxUdADOkbrIX2gQ==}
     engines: {node: '>=14.17'}
     hasBin: true
 
@@ -21159,15 +25822,14 @@ packages:
     resolution: {integrity: sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==}
     dev: false
 
-  /ufo@1.1.2:
-    resolution: {integrity: sha512-TrY6DsjTQQgyS3E3dBaOXf0TpPD8u9FVrVYmKVegJuFw51n/YB9XPt+U6ydzFG5ZIN7+DIjPbNmXoBj9esYhgQ==}
+  /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
-    optional: true
 
   /uid-safe@2.1.5:
     resolution: {integrity: sha512-KPHm4VL5dDXKz01UuEd88Df+KzynaohSL9fBh096KWAxSKZQDI2uBrVqtvRM4rwrIrRRKsdLNML/lnaaVSRioA==}
@@ -21184,6 +25846,45 @@ packages:
       has-symbols: 1.0.3
       which-boxed-primitive: 1.0.2
 
+  /unbuild@2.0.0(typescript@5.3.2):
+    resolution: {integrity: sha512-JWCUYx3Oxdzvw2J9kTAp+DKE8df/BnH/JTSj6JyA4SH40ECdFu7FoJJcrm8G92B7TjofQ6GZGjJs50TRxoH6Wg==}
+    hasBin: true
+    peerDependencies:
+      typescript: ^5.3.0
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+    dependencies:
+      '@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.3.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.3.2)
+      scule: 1.1.1
+      typescript: 5.3.2
+      untyped: 1.4.0
+    transitivePeerDependencies:
+      - sass
+      - supports-color
+    dev: true
+
   /unc-path-regex@0.1.2:
     resolution: {integrity: sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg==}
     engines: {node: '>=0.10.0'}
@@ -21197,6 +25898,10 @@ packages:
     resolution: {integrity: sha512-hEQt0+ZLDVUMhebKxL4x1BTtDY7bavVofhZ9KZ4aI26X9SRaE+Y3m83XUL1UP2jn8ynjndwCCpEHdUG+9pP1Tw==}
     dev: false
 
+  /underscore@1.13.6:
+    resolution: {integrity: sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A==}
+    dev: false
+
   /undertaker-registry@1.0.1:
     resolution: {integrity: sha512-UR1khWeAjugW3548EfQmL9Z7pGMlBgXteQpr1IZeZBtnkCJQJIJ1Scj0mb9wQaPvUZ9Q17XqW6TIaPchJkyfqw==}
     engines: {node: '>= 0.10'}
@@ -21225,13 +25930,6 @@ packages:
       '@fastify/busboy': 2.0.0
     dev: false
 
-  /unescape@1.0.1:
-    resolution: {integrity: sha512-O0+af1Gs50lyH1nUu3ZyYS1cRh01Q/kUKatTOkSs7jukXE6/NebucDVxyiDsA9AQ4JC1V1jUH9EO8JX2nMDgGQ==}
-    engines: {node: '>=0.10.0'}
-    dependencies:
-      extend-shallow: 2.0.1
-    dev: false
-
   /unicode-canonical-property-names-ecmascript@2.0.0:
     resolution: {integrity: sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==}
     engines: {node: '>=4'}
@@ -21328,10 +26026,41 @@ packages:
     resolution: {integrity: sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==}
     engines: {node: '>= 0.8'}
 
+  /unplugin-icons@0.17.4:
+    resolution: {integrity: sha512-PHLxjBx3ZV8RUBvfMafFl8uWH88jHeZgOijcRpkwgne7y2Ovx7WI0Ltzzw3fjZQ7dGaDhB8udyKVdm9N2S6BIw==}
+    peerDependencies:
+      '@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:
+      '@svgr/core':
+        optional: true
+      '@svgx/core':
+        optional: true
+      '@vue/compiler-sfc':
+        optional: true
+      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
+
   /unplugin@1.0.1:
     resolution: {integrity: sha512-aqrHaVBWW1JVKBHmGo33T5TxeL0qWzfvjWokObHA9bYmN7eNDkwOxmLjhioHl9878qDFMAaT51XNroRyuz7WxA==}
     dependencies:
-      acorn: 8.10.0
+      acorn: 8.11.2
       chokidar: 3.5.2
       webpack-sources: 3.2.3
       webpack-virtual-modules: 0.5.0
@@ -21340,12 +26069,21 @@ packages:
   /unplugin@1.4.0:
     resolution: {integrity: sha512-5x4eIEL6WgbzqGtF9UV8VEC/ehKptPXDS6L2b0mv4FRMkJxRtjaJfOWDd6a8+kYbqsjklix7yWP0N3SUepjXcg==}
     dependencies:
-      acorn: 8.10.0
+      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
+
   /unset-value@1.0.0:
     resolution: {integrity: sha512-PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ==}
     engines: {node: '>=0.10.0'}
@@ -21359,6 +26097,21 @@ packages:
     engines: {node: '>=8'}
     dev: true
 
+  /untyped@1.4.0:
+    resolution: {integrity: sha512-Egkr/s4zcMTEuulcIb7dgURS6QpN7DyqQYdf+jBtiaJvQ+eRsrtWUoX84SbvQWuLkXsOjM+8sJC9u6KoMK/U7Q==}
+    hasBin: true
+    dependencies:
+      '@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
+
   /update-browserslist-db@1.0.11(browserslist@4.21.9):
     resolution: {integrity: sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==}
     hasBin: true
@@ -21384,7 +26137,7 @@ packages:
   /uri-js@4.4.1:
     resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==}
     dependencies:
-      punycode: 2.2.0
+      punycode: 2.3.1
 
   /urix@0.1.0:
     resolution: {integrity: sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg==}
@@ -21402,49 +26155,44 @@ packages:
     engines: {node: '>=6.0.0'}
     dev: false
 
-  /url@0.10.3:
-    resolution: {integrity: sha512-hzSUW2q06EqL1gKM/a+obYHLIO6ct2hwPuviqTTOcfFVc61UbfJ2Q32+uGL/HCPxKqrdGB5QUwIe7UqlDgwsOQ==}
-    dependencies:
-      punycode: 1.3.2
-      querystring: 0.2.0
-    dev: false
-
-  /urllib@2.41.0:
-    resolution: {integrity: sha512-pNXdxEv52L67jahLT+/7QE+Fup1y2Gc6EdmrAhQ6OpQIC2rl14oWwv9hvk1GXOZqEnJNwRXHABuwgPOs1CtL7g==}
-    engines: {node: '>= 0.10.0'}
+  /use-callback-ref@1.3.0(react@18.2.0):
+    resolution: {integrity: sha512-3FT9PRuRdbB9HfXhEq35u4oZkvpJ5kuYbpqhCfmiZyReuRgpnhDlbr2ZEnnuS0RrJAPn6l23xjFg9kpDM+Ms7w==}
+    engines: {node: '>=10'}
     peerDependencies:
-      proxy-agent: ^5.0.0
+      '@types/react': ^16.8.0 || ^17.0.0 || ^18.0.0
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0
     peerDependenciesMeta:
-      proxy-agent:
+      '@types/react':
         optional: true
     dependencies:
-      any-promise: 1.3.0
-      content-type: 1.0.4
-      debug: 2.6.9
-      default-user-agent: 1.0.0
-      digest-header: 1.1.0
-      ee-first: 1.1.1
-      formstream: 1.1.1
-      humanize-ms: 1.2.1
-      iconv-lite: 0.4.24
-      ip: 1.1.8
-      pump: 3.0.0
-      qs: 6.11.0
-      statuses: 1.5.0
-      utility: 1.17.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: false
+      react: 18.2.0
+      tslib: 2.6.1
+    dev: true
 
-  /use-resize-observer@9.1.0(react-dom@18.2.0)(react@17.0.2):
+  /use-resize-observer@9.1.0(react-dom@18.2.0)(react@18.2.0):
     resolution: {integrity: sha512-R25VqO9Wb3asSD4eqtcxk8sJalvIOYBqS8MNZlpDSQ4l4xMQxC/J7Id9HoTqPq8FwULIn0PVW+OAqF2dyYbjow==}
     peerDependencies:
       react: 16.8.0 - 18
       react-dom: 16.8.0 - 18
     dependencies:
       '@juggle/resize-observer': 3.4.0
-      react: 17.0.2
-      react-dom: 18.2.0(react@17.0.2)
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
+    dev: true
+
+  /use-sidecar@1.1.2(react@18.2.0):
+    resolution: {integrity: sha512-epTbsLuzZ7lPClpz2TyryBfztm7m+28DlEv2ZCQ3MDr5ssiwyOwGH/e5F9CkfWjJ1t4clvI58yF822/GUkjjhw==}
+    engines: {node: '>=10'}
+    peerDependencies:
+      '@types/react': ^16.9.0 || ^17.0.0 || ^18.0.0
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+    dependencies:
+      detect-node-es: 1.1.0
+      react: 18.2.0
+      tslib: 2.6.1
     dev: true
 
   /use@3.1.1:
@@ -21452,6 +26200,13 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
+  /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
+
   /utf7@1.0.2:
     resolution: {integrity: sha512-qQrPtYLLLl12NF4DrM9CvfkxkYI97xOb5dsnGZHE3teFr0tWiEZ9UdgMPczv24vl708cYMpe6mGXGHrotIp3Bw==}
     dependencies:
@@ -21465,14 +26220,16 @@ packages:
   /util-deprecate@1.0.2:
     resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==}
 
-  /util.promisify@1.1.1:
-    resolution: {integrity: sha512-/s3UsZUrIfa6xDhr7zZhnE9SLQ5RIXyYfiVnMMyMDzOc8WhWN4Nbh36H842OyurKbCDAesZOJaVyvmSl6fhGQw==}
+  /util.promisify@1.1.2:
+    resolution: {integrity: sha512-PBdZ03m1kBnQ5cjjO0ZvJMJS+QsbyIcFwi4hY4U76OQsCO9JrOYjbCFgIF76ccFg9xnJo7ZHPkqyj1GqmdS7MA==}
     dependencies:
       call-bind: 1.0.2
       define-properties: 1.2.0
       for-each: 0.3.3
+      has-proto: 1.0.1
       has-symbols: 1.0.3
-      object.getownpropertydescriptors: 2.1.4
+      object.getownpropertydescriptors: 2.1.7
+      safe-array-concat: 1.0.0
     dev: false
 
   /util@0.12.5:
@@ -21484,17 +26241,6 @@ packages:
       is-typed-array: 1.1.10
       which-typed-array: 1.1.11
 
-  /utility@1.17.0:
-    resolution: {integrity: sha512-KdVkF9An/0239BJ4+dqOa7NPrPIOeQE9AGfx0XS16O9DBiHNHRJMoeU5nL6pRGAkgJOqdOu8R4gBRcXnAocJKw==}
-    engines: {node: '>= 0.12.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'}
@@ -21503,17 +26249,6 @@ packages:
     resolution: {integrity: sha512-yEEhCuCi5wRV7Z5ZVf9iV2gWMvUZqKJhAs1ecFdKJ0qzbyaVelmsE3QjYAamehfp9FKLiZbKldd+jklG3O0LfA==}
     dev: false
 
-  /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
-
   /uuid@8.3.2:
     resolution: {integrity: sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==}
     hasBin: true
@@ -21530,11 +26265,20 @@ packages:
     resolution: {integrity: sha512-6z3GW9x8G1gd+JIIgQQQxXuiJtCXeAjp6RaPEPLv62mH3iPHPxV6W3robxtCzNErRo6ZwTmzWhsbNvjyEBKzKA==}
     engines: {node: '>=10.12.0'}
     dependencies:
-      '@jridgewell/trace-mapping': 0.3.17
+      '@jridgewell/trace-mapping': 0.3.18
       '@types/istanbul-lib-coverage': 2.0.4
       convert-source-map: 1.9.0
     dev: true
 
+  /v8-to-istanbul@9.2.0:
+    resolution: {integrity: sha512-/EH/sDgxU2eGxajKdwLCDmQ4FWq+kpi3uCmBGpw1xJtnAxEjlD8j8PEiGWpCIMIs3ciNAgH0d3TTJiUkYzyZjA==}
+    engines: {node: '>=10.12.0'}
+    dependencies:
+      '@jridgewell/trace-mapping': 0.3.18
+      '@types/istanbul-lib-coverage': 2.0.4
+      convert-source-map: 2.0.0
+    dev: true
+
   /v8flags@3.2.0:
     resolution: {integrity: sha512-mH8etigqMfiGWdeXpaaqGfs6BndypxusHHcv2qSHyZkGEznCd/qAXCWWRzeowtL54147cktFOC4P5y+kl8d8Jg==}
     engines: {node: '>= 0.10'}
@@ -21619,17 +26363,16 @@ packages:
       replace-ext: 1.0.1
     dev: true
 
-  /vite-node@0.33.0(@types/node@18.16.16):
-    resolution: {integrity: sha512-19FpHYbwWWxDr73ruNahC+vtEdza52kA90Qb3La98yZ0xULqV8A5JLNPUff0f5zID4984tW7l3DH2przTJUZSw==}
-    engines: {node: '>=v14.18.0'}
+  /vite-node@1.1.0:
+    resolution: {integrity: sha512-jV48DDUxGLEBdHCQvxL1mEh7+naVy+nhUUUaPAZLd3FJgXuxQiewHcfeZebbJ6onDqNGkP4r3MhQ342PRlG81Q==}
+    engines: {node: ^18.0.0 || >=20.0.0}
     hasBin: true
     dependencies:
       cac: 6.7.14
       debug: 4.3.4(supports-color@8.1.1)
-      mlly: 1.4.0
       pathe: 1.1.1
       picocolors: 1.0.0
-      vite: 4.4.7(@types/node@18.16.16)
+      vite: 5.0.10(sass@1.64.1)
     transitivePeerDependencies:
       - '@types/node'
       - less
@@ -21641,45 +26384,33 @@ packages:
       - terser
     dev: true
 
-  /vite@4.4.7(@types/node@18.16.16):
-    resolution: {integrity: sha512-6pYf9QJ1mHylfVh39HpuSfMPojPSKVxZvnclX1K1FyZ1PXDOcLBibdq5t1qxJSnL63ca8Wf4zts6mD8u8oc9Fw==}
+  /vite-plugin-dts@3.6.4(rollup@3.29.4)(typescript@5.3.2)(vite@5.0.10):
+    resolution: {integrity: sha512-yOVhUI/kQhtS6lCXRYYLv2UUf9bftcwQK9ROxCX2ul17poLQs02ctWX7+vXB8GPRzH8VCK3jebEFtPqqijXx6w==}
     engines: {node: ^14.18.0 || >=16.0.0}
-    hasBin: true
     peerDependencies:
-      '@types/node': ^18.16.16
-      less: '*'
-      lightningcss: ^1.21.0
-      sass: '*'
-      stylus: '*'
-      sugarss: '*'
-      terser: ^5.4.0
+      typescript: ^5.3.0
+      vite: '*'
     peerDependenciesMeta:
-      '@types/node':
-        optional: true
-      less:
-        optional: true
-      lightningcss:
-        optional: true
-      sass:
-        optional: true
-      stylus:
-        optional: true
-      sugarss:
-        optional: true
-      terser:
+      vite:
         optional: true
     dependencies:
-      '@types/node': 18.16.16
-      esbuild: 0.18.17
-      postcss: 8.4.27
-      rollup: 3.26.3
-    optionalDependencies:
-      fsevents: 2.3.2
+      '@microsoft/api-extractor': 7.38.3
+      '@rollup/pluginutils': 5.0.5(rollup@3.29.4)
+      '@vue/language-core': 1.8.22(typescript@5.3.2)
+      debug: 4.3.4(supports-color@8.1.1)
+      kolorist: 1.8.0
+      typescript: 5.3.2
+      vite: 5.0.10(sass@1.64.1)
+      vue-tsc: 1.8.25(typescript@5.3.2)
+    transitivePeerDependencies:
+      - '@types/node'
+      - rollup
+      - supports-color
     dev: true
 
-  /vite@4.4.7(less@4.1.3)(sass@1.64.1):
-    resolution: {integrity: sha512-6pYf9QJ1mHylfVh39HpuSfMPojPSKVxZvnclX1K1FyZ1PXDOcLBibdq5t1qxJSnL63ca8Wf4zts6mD8u8oc9Fw==}
-    engines: {node: ^14.18.0 || >=16.0.0}
+  /vite@5.0.10(sass@1.64.1):
+    resolution: {integrity: sha512-2P8J7WWgmc355HUMlFrwofacvr98DAjoE52BfdbwQtyLH06XKwaL/FMnmKM2crF0iX4MpmMKoDlNCB1ok7zHCw==}
+    engines: {node: ^18.0.0 || >=20.0.0}
     hasBin: true
     peerDependencies:
       '@types/node': ^18.16.16
@@ -21705,31 +26436,30 @@ packages:
       terser:
         optional: true
     dependencies:
-      esbuild: 0.18.17
-      less: 4.1.3
-      postcss: 8.4.27
-      rollup: 3.26.3
+      esbuild: 0.19.8
+      postcss: 8.4.32
+      rollup: 4.6.0
       sass: 1.64.1
     optionalDependencies:
-      fsevents: 2.3.2
+      fsevents: 2.3.3
     dev: true
 
-  /vitest@0.33.0:
-    resolution: {integrity: sha512-1CxaugJ50xskkQ0e969R/hW47za4YXDUfWJDxip1hwbnhUjYolpfUn2AMOulqG/Dtd9WYAtkHmM/m3yKVrEejQ==}
-    engines: {node: '>=v14.18.0'}
+  /vitest@1.1.0:
+    resolution: {integrity: sha512-oDFiCrw7dd3Jf06HoMtSRARivvyjHJaTxikFxuqJjO76U436PqlVw1uLn7a8OSPrhSfMGVaRakKpA2lePdw79A==}
+    engines: {node: ^18.0.0 || >=20.0.0}
     hasBin: true
     peerDependencies:
       '@edge-runtime/vm': '*'
-      '@vitest/browser': '*'
-      '@vitest/ui': '*'
+      '@types/node': ^18.16.16
+      '@vitest/browser': ^1.0.0
+      '@vitest/ui': ^1.0.0
       happy-dom: '*'
       jsdom: '*'
-      playwright: '*'
-      safaridriver: '*'
-      webdriverio: '*'
     peerDependenciesMeta:
       '@edge-runtime/vm':
         optional: true
+      '@types/node':
+        optional: true
       '@vitest/browser':
         optional: true
       '@vitest/ui':
@@ -21738,36 +26468,27 @@ packages:
         optional: true
       jsdom:
         optional: true
-      playwright:
-        optional: true
-      safaridriver:
-        optional: true
-      webdriverio:
-        optional: true
     dependencies:
-      '@types/chai': 4.3.5
-      '@types/chai-subset': 1.3.3
-      '@types/node': 18.16.16
-      '@vitest/expect': 0.33.0
-      '@vitest/runner': 0.33.0
-      '@vitest/snapshot': 0.33.0
-      '@vitest/spy': 0.33.0
-      '@vitest/utils': 0.33.0
-      acorn: 8.10.0
-      acorn-walk: 8.2.0
+      '@vitest/expect': 1.1.0
+      '@vitest/runner': 1.1.0
+      '@vitest/snapshot': 1.1.0
+      '@vitest/spy': 1.1.0
+      '@vitest/utils': 1.1.0
+      acorn-walk: 8.3.1
       cac: 6.7.14
-      chai: 4.3.7
+      chai: 4.3.10
       debug: 4.3.4(supports-color@8.1.1)
-      local-pkg: 0.4.3
-      magic-string: 0.30.1
+      execa: 8.0.1
+      local-pkg: 0.5.0
+      magic-string: 0.30.5
       pathe: 1.1.1
       picocolors: 1.0.0
-      std-env: 3.3.3
-      strip-literal: 1.0.1
-      tinybench: 2.5.0
-      tinypool: 0.6.0
-      vite: 4.4.7(@types/node@18.16.16)
-      vite-node: 0.33.0(@types/node@18.16.16)
+      std-env: 3.6.0
+      strip-literal: 1.3.0
+      tinybench: 2.5.1
+      tinypool: 0.8.1
+      vite: 5.0.10(sass@1.64.1)
+      vite-node: 1.1.0
       why-is-node-running: 2.2.2
     transitivePeerDependencies:
       - less
@@ -21799,12 +26520,22 @@ packages:
       vue: 3.3.4
     dev: false
 
-  /vue-component-type-helpers@1.8.19:
-    resolution: {integrity: sha512-1OANGSZK4pzHF4uc86usWi+o5Y0zgoDtqWkPg6Am6ot+jHSAmpOah59V/4N82So5xRgivgCxGgK09lBy1XNUfQ==}
+  /vue-chartjs@5.2.0(chart.js@4.4.0)(vue@3.3.4):
+    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.3.4
+    dev: false
+
+  /vue-component-type-helpers@1.8.25:
+    resolution: {integrity: sha512-NCA6sekiJIMnMs4DdORxATXD+/NRkQpS32UC+I1KQJUasx+Z7MZUb3Y+MsKsFmX+PgyTYSteb73JW77AibaCCw==}
     dev: true
 
-  /vue-component-type-helpers@1.8.4:
-    resolution: {integrity: sha512-6bnLkn8O0JJyiFSIF0EfCogzeqNXpnjJ0vW/SZzNHfe6sPx30lTtTXlE5TFs2qhJlAtDFybStVNpL73cPe3OMQ==}
+  /vue-component-type-helpers@1.8.27:
+    resolution: {integrity: sha512-0vOfAtI67UjeO1G6UiX5Kd76CqaQ67wrRZiOe7UAb9Jm6GzlUr/fC7CV90XfwapJRjpCMaZFhv1V0ajWRmE9Dg==}
     dev: true
 
   /vue-demi@0.14.5(vue@3.3.4):
@@ -21820,11 +26551,25 @@ packages:
     dependencies:
       vue: 3.3.4
 
+  /vue-demi@0.14.6(vue@3.3.4):
+    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:
+      vue: 3.3.4
+    dev: false
+
   /vue-docgen-api@4.56.4(vue@3.3.4):
     resolution: {integrity: sha512-Z59qNUYZNHMZL0QITNbqobGKJgmqyOs4OiAdzr1Ug7ys1gkFBGewiuwPURTsoM2zi4GWZWy2eW4B5FevwT7gpA==}
     dependencies:
       '@babel/parser': 7.22.7
-      '@babel/types': 7.21.5
+      '@babel/types': 7.22.5
       '@vue/compiler-dom': 3.3.4
       '@vue/compiler-sfc': 3.3.4
       ast-types: 0.14.2
@@ -21838,17 +26583,17 @@ packages:
       - vue
     dev: true
 
-  /vue-eslint-parser@9.3.1(eslint@8.45.0):
-    resolution: {integrity: sha512-Clr85iD2XFZ3lJ52/ppmUDG/spxQu6+MAeHXjjyI4I1NUYZ9xmenQp4N0oaHJhrA8OOxltCVxMRfANGa70vU0g==}
+  /vue-eslint-parser@9.3.2(eslint@8.54.0):
+    resolution: {integrity: sha512-q7tWyCVaV9f8iQyIA5Mkj/S6AoJ9KBN8IeUSf3XEmBrOtxOZnfTg5s4KClbZBCK3GtnT/+RyCLZyDHuZwTuBjg==}
     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.45.0
-      eslint-scope: 7.2.0
-      eslint-visitor-keys: 3.4.0
-      espree: 9.5.1
+      eslint: 8.54.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.5.4
@@ -21909,16 +26654,16 @@ packages:
       he: 1.2.0
     dev: true
 
-  /vue-tsc@1.8.8(typescript@5.2.2):
-    resolution: {integrity: sha512-bSydNFQsF7AMvwWsRXD7cBIXaNs/KSjvzWLymq/UtKE36697sboX4EccSHFVxvgdBlI1frYPc/VMKJNB7DFeDQ==}
+  /vue-tsc@1.8.25(typescript@5.3.2):
+    resolution: {integrity: sha512-lHsRhDc/Y7LINvYhZ3pv4elflFADoEOo67vfClAfF2heVHpHmVquLSjojgCSIwzA4F0Pc4vowT/psXCYcfk+iQ==}
     hasBin: true
     peerDependencies:
-      typescript: ^5.2.2
+      typescript: ^5.3.0
     dependencies:
-      '@vue/language-core': 1.8.8(typescript@5.2.2)
-      '@vue/typescript': 1.8.8(typescript@5.2.2)
+      '@volar/typescript': 1.11.1
+      '@vue/language-core': 1.8.25(typescript@5.3.2)
       semver: 7.5.4
-      typescript: 5.2.2
+      typescript: 5.3.2
     dev: true
 
   /vue3-touch-events@4.1.3:
@@ -21945,20 +26690,20 @@ packages:
       xml-name-validator: 4.0.0
     dev: true
 
-  /w3c-xmlserializer@4.0.0:
-    resolution: {integrity: sha512-d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw==}
-    engines: {node: '>=14'}
+  /w3c-xmlserializer@5.0.0:
+    resolution: {integrity: sha512-o8qghlI8NZHU1lLPrpi2+Uq7abh4GGPpYANlalzWxyWteJOCsr/P+oPBA49TOLu5FTZO4d3F9MnWJfiMo4BkmA==}
+    engines: {node: '>=18'}
     dependencies:
-      xml-name-validator: 4.0.0
+      xml-name-validator: 5.0.0
     dev: true
 
-  /wait-on@7.0.1(debug@4.3.4):
-    resolution: {integrity: sha512-9AnJE9qTjRQOlTZIldAaf/da2eW0eSRSgcqq85mXQja/DW3MriHxkpODDSUEg+Gri/rKEcXUZHe+cevvYItaog==}
+  /wait-on@7.2.0(debug@4.3.4):
+    resolution: {integrity: sha512-wCQcHkRazgjG5XoAq9jbTMLpNIjoSlZslrJ2+N9MxDsGEv1HnFoVjOCexL0ESva7Y9cu350j+DWADdk54s4AFQ==}
     engines: {node: '>=12.0.0'}
     hasBin: true
     dependencies:
-      axios: 0.27.2(debug@4.3.4)
-      joi: 17.7.0
+      axios: 1.6.2(debug@4.3.4)
+      joi: 17.11.0
       lodash: 4.17.21
       minimist: 1.2.8
       rxjs: 7.8.1
@@ -21991,6 +26736,11 @@ packages:
     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==}
 
@@ -22007,6 +26757,10 @@ packages:
     resolution: {integrity: sha512-kyDivFZ7ZM0BVOUteVbDFhlRt7Ah/CSPwJdi8hBpkK7QLumUqdLtVfm/PX/hkcnrvr0i77fO5+TjZ94Pe+C9iw==}
     dev: true
 
+  /webpack-virtual-modules@0.6.1:
+    resolution: {integrity: sha512-poXpCylU7ExuvZK8z+On3kX+S8o/2dQ/SVYueKA0D4WEMXROXgY8Ez50/bQEUmvoSMMrWcrJqCHuhAbsiwg7Dg==}
+    dev: true
+
   /webpack@5.75.0(esbuild@0.18.17):
     resolution: {integrity: sha512-piaIaoVJlqMsPtX/+3KTTO6jfvrSYgauFVdt8cr9LTHKmcq/AMd4mhzsiP7ZF/PGRNPGA8336jldh9l2Kt2ogQ==}
     engines: {node: '>=10.13.0'}
@@ -22022,8 +26776,8 @@ packages:
       '@webassemblyjs/ast': 1.11.1
       '@webassemblyjs/wasm-edit': 1.11.1
       '@webassemblyjs/wasm-parser': 1.11.1
-      acorn: 8.10.0
-      acorn-import-assertions: 1.8.0(acorn@8.10.0)
+      acorn: 8.11.2
+      acorn-import-assertions: 1.8.0(acorn@8.11.2)
       browserslist: 4.21.9
       chrome-trace-event: 1.0.3
       enhanced-resolve: 5.13.0
@@ -22047,6 +26801,20 @@ packages:
       - uglify-js
     dev: true
 
+  /websocket@1.0.34:
+    resolution: {integrity: sha512-PRDso2sGwF6kM75QykIesBijKSVceR6jL2G8NGYyq2XrItNC2P5/qL5XeR056GhA+Ly7JMFvJb9I312mJfmqnQ==}
+    engines: {node: '>=4.0.0'}
+    dependencies:
+      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: false
+
   /whatwg-encoding@2.0.0:
     resolution: {integrity: sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==}
     engines: {node: '>=12'}
@@ -22054,11 +26822,23 @@ packages:
       iconv-lite: 0.6.3
     dev: true
 
+  /whatwg-encoding@3.1.1:
+    resolution: {integrity: sha512-6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ==}
+    engines: {node: '>=18'}
+    dependencies:
+      iconv-lite: 0.6.3
+    dev: true
+
   /whatwg-mimetype@3.0.0:
     resolution: {integrity: sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==}
     engines: {node: '>=12'}
     dev: true
 
+  /whatwg-mimetype@4.0.0:
+    resolution: {integrity: sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg==}
+    engines: {node: '>=18'}
+    dev: true
+
   /whatwg-url@11.0.0:
     resolution: {integrity: sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==}
     engines: {node: '>=12'}
@@ -22066,6 +26846,14 @@ packages:
       tr46: 3.0.0
       webidl-conversions: 7.0.0
 
+  /whatwg-url@14.0.0:
+    resolution: {integrity: sha512-1lfMEm2IEr7RIV+f4lUNPOqfFL+pO+Xw3fJSqmjX9AbXcXcYOkCe1P6+9VBZB6n94af16NfZf+sSk0JCBZC9aw==}
+    engines: {node: '>=18'}
+    dependencies:
+      tr46: 5.0.0
+      webidl-conversions: 7.0.0
+    dev: true
+
   /whatwg-url@5.0.0:
     resolution: {integrity: sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==}
     dependencies:
@@ -22107,17 +26895,6 @@ packages:
       gopd: 1.0.1
       has-tostringtag: 1.0.0
 
-  /which-typed-array@1.1.9:
-    resolution: {integrity: sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==}
-    engines: {node: '>= 0.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-typed-array: 1.1.10
-
   /which@1.3.1:
     resolution: {integrity: sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==}
     hasBin: true
@@ -22151,13 +26928,6 @@ packages:
     dependencies:
       string-width: 4.2.3
 
-  /win-release@1.1.1:
-    resolution: {integrity: sha512-iCRnKVvGxOQdsKhcQId2PXV1vV3J/sDPXKA4Oe9+Eti2nb2ESEsYHRYls/UjoUW3bIc5ZDO8dTH50A/5iVN+bw==}
-    engines: {node: '>=0.10.0'}
-    dependencies:
-      semver: 7.5.4
-    dev: false
-
   /winston-transport@4.5.0:
     resolution: {integrity: sha512-YpZzcUzBedhlTAfJg6vJDlyEai/IFMIVcaEZZyl3UXIl4gmqRpU7AE89AHLkbzLUsv0NVmw7ts+iztqKxxPW1Q==}
     engines: {node: '>= 6.4.0'}
@@ -22311,6 +27081,20 @@ packages:
         optional: true
       utf-8-validate:
         optional: true
+    dev: false
+
+  /ws@8.15.1:
+    resolution: {integrity: sha512-W5OZiCjXEmk0yZ66ZN82beM5Sz7l7coYxpRkzS+p9PP+ToQry8szKh+61eNktr7EA9DOwvFGhfC605jDHbP6QQ==}
+    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
+    dev: true
 
   /xml-crypto@3.0.1:
     resolution: {integrity: sha512-7XrwB3ujd95KCO6+u9fidb8ajvRJvIfGNWD0XLJoTWlBKz+tFpUzEYxsN+Il/6/gHtEs1RgRh2RH+TzhcWBZUw==}
@@ -22325,6 +27109,11 @@ packages:
     engines: {node: '>=12'}
     dev: true
 
+  /xml-name-validator@5.0.0:
+    resolution: {integrity: sha512-EvGK8EJ3DhaHfbRlETOWAS5pO9MZITeauHKJyb8wyajUfQUenkIg2MvLDTZ4T/TgIcm3HU0TFBgWWboAZ30UHg==}
+    engines: {node: '>=18'}
+    dev: true
+
   /xml2js@0.5.0:
     resolution: {integrity: sha512-drPFnkQJik/O+uPKpqSgr22mpuFHqKdbS835iAQrUC73L2F5WkboIRd63ai/2Yg6I1jzifPFKH2NTK+cfglkIA==}
     engines: {node: '>=4.0.0'}
@@ -22337,6 +27126,11 @@ packages:
     resolution: {integrity: sha512-huCv9IH9Tcf95zuYCsQraZtWnJvBtLVE0QHMOs8bWyZAFZNDcYjsPq1nEx8jKA9y+Beo9v+7OBPRisQTjinQMw==}
     dev: false
 
+  /xmlbuilder@10.1.1:
+    resolution: {integrity: sha512-OyzrcFLL/nb6fMGHbiRDuPup9ljBycsdCypwuyg5AAHvyWzGfChJpCXMG88AGTIMFhGZ9RccFN1e6lhg3hkwKg==}
+    engines: {node: '>=4.0'}
+    dev: false
+
   /xmlbuilder@11.0.1:
     resolution: {integrity: sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==}
     engines: {node: '>=4.0'}
@@ -22346,6 +27140,10 @@ packages:
     resolution: {integrity: sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==}
     dev: true
 
+  /xmlcreate@2.0.4:
+    resolution: {integrity: sha512-nquOebG4sngPmGPICTS5EnxqhKbCmz5Ox5hsszI2T6U5qdrJizBc+0ilYSEjTSzU0yZcmvppztXe/5Al5fUwdg==}
+    dev: false
+
   /xmllint-wasm@3.0.1:
     resolution: {integrity: sha512-t+aKQXJQNAt9/qLgCjhHUmCnPXAyqBKiyh8oV0ZwBMar/uB+5F40tqOJZ97JwLADcqQr5WB2bjCxLKrm+DHz1g==}
     engines: {node: '>=10.5.0'}
@@ -22385,6 +27183,11 @@ packages:
     resolution: {integrity: sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==}
     engines: {node: '>=10'}
 
+  /yaeti@0.0.6:
+    resolution: {integrity: sha512-MvQa//+KcZCUkBTIC9blM+CU9J2GzuTytsOUwf2lidtvkx/6gnEp1QvJv34t9vdjhFmha/mUiNDbN0D0mJWdug==}
+    engines: {node: '>=0.10.32'}
+    dev: false
+
   /yallist@2.1.2:
     resolution: {integrity: sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==}
 
@@ -22400,6 +27203,11 @@ packages:
     engines: {node: '>= 6'}
     dev: true
 
+  /yaml@2.3.4:
+    resolution: {integrity: sha512-8aAvwVUSHpfEqTQ4w/KMlf3HcRdt50E5ODIQJBw1fQ5RL34xabzxtUlzTXVqc4rkZsPbvrXKWnABCD7kWSmocA==}
+    engines: {node: '>= 14'}
+    dev: false
+
   /yamljs@0.3.0:
     resolution: {integrity: sha512-C/FsVVhht4iPQYXOInoxUM/1ELSf9EsgKH34FofQOp6hwCPrW4vG4w5++TED3xRUo8gD7l0P1J1dLlDYzODsTQ==}
     hasBin: true
@@ -22462,19 +27270,6 @@ packages:
       yargs-parser: 20.2.9
     dev: false
 
-  /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
-    dev: false
-
   /yargs@17.6.0:
     resolution: {integrity: sha512-8H/wTDqlSwoSnScvV2N/JHfLWOKuh5MVla9hqLjK3nsfyy6Y4kDSYSvkU5YCUEPOSnRXfIyx3Sq+B/IWudTo4g==}
     engines: {node: '>=12'}
@@ -22559,6 +27354,38 @@ packages:
       commander: 2.20.3
     dev: true
 
+  /z-schema@5.0.5:
+    resolution: {integrity: sha512-D7eujBWkLa3p2sIpJA0d1pr7es+a7m0vFAnZLlCEKq/Ij2k0MLi9Br2UPxoxdYystm5K1yeBGzub0FlYUEWj2Q==}
+    engines: {node: '>=8.0.0'}
+    hasBin: true
+    dependencies:
+      lodash.get: 4.4.2
+      lodash.isequal: 4.5.0
+      validator: 13.7.0
+    optionalDependencies:
+      commander: 9.4.1
+    dev: true
+
+  /zod-to-json-schema@3.20.3(zod@3.22.4):
+    resolution: {integrity: sha512-/Q3wnyxAfCt94ZcrGiXXoiAfRqasxl9CX64LZ9fj+4dKH68zulUtU0uk1WMxQPfAxQ0ZI70dKzcoW7hHj+DwSQ==}
+    peerDependencies:
+      zod: ^3.20.0
+    dependencies:
+      zod: 3.22.4
+    dev: false
+
+  /zod-to-json-schema@3.22.0(zod@3.22.4):
+    resolution: {integrity: sha512-XQr8EwxPMzJGhoR+d/nRFWdi15VaZ+R5Uhssm+Xx5yS30xCpuutfKRm4rerE0SK9j2dWB5Z3FvDD0w8WMVGzkA==}
+    peerDependencies:
+      zod: ^3.22.4
+    dependencies:
+      zod: 3.22.4
+    dev: false
+
+  /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
diff --git a/scripts/run-e2e.js b/scripts/run-e2e.js
new file mode 100755
index 0000000000..a5d75c5f4b
--- /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
index b593352352..611cb2ec3c 100644
--- a/scripts/trim-fe-packageJson.js
+++ b/scripts/trim-fe-packageJson.js
@@ -1,12 +1,15 @@
-const { writeFileSync } = require('fs')
+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);
+	const { scripts, peerDependencies, devDependencies, dependencies, ...packageJson } = require(
+		filePath,
+	);
 	writeFileSync(filePath, JSON.stringify(packageJson, null, 2) + '\n', 'utf-8');
-}
+};
 
-trimPackageJson('design-system')
-trimPackageJson('editor-ui')
+trimPackageJson('@n8n/chat');
+trimPackageJson('design-system');
+trimPackageJson('editor-ui');
diff --git a/test-results.json b/test-results.json
new file mode 100644
index 0000000000..a58e83e37b
--- /dev/null
+++ b/test-results.json
@@ -0,0 +1,2387 @@
+{
+  "totalWorkflows": 124,
+  "slackMessage": "",
+  "summary": {
+    "failedExecutions": 103,
+    "warningExecutions": 20,
+    "successfulExecutions": 1,
+    "errors": [
+      {
+        "workflowId": "113",
+        "error": "Workflow failed to execute: There is no active execution with id \"7\"."
+      },
+      {
+        "workflowId": "115",
+        "error": "Workflow failed to execute: There is no active execution with id \"8\"."
+      },
+      {
+        "workflowId": "117",
+        "error": "Workflow failed to execute: There is no active execution with id \"10\"."
+      },
+      {
+        "workflowId": "116",
+        "error": "Workflow failed to execute: There is no active execution with id \"9\"."
+      },
+      {
+        "workflowId": "106",
+        "error": "Workflow failed to execute: There is no active execution with id \"14\"."
+      },
+      {
+        "workflowId": "10",
+        "error": "Workflow failed to execute: There is no active execution with id \"15\"."
+      },
+      {
+        "workflowId": "114",
+        "error": "Workflow failed to execute: There is no active execution with id \"13\"."
+      },
+      {
+        "workflowId": "112",
+        "error": "Workflow failed to execute: There is no active execution with id \"5\"."
+      },
+      {
+        "workflowId": "11",
+        "error": "Workflow failed to execute: There is no active execution with id \"3\"."
+      },
+      {
+        "workflowId": "130",
+        "error": "Workflow failed to execute: There is no active execution with id \"26\"."
+      },
+      {
+        "workflowId": "131",
+        "error": "Workflow failed to execute: There is no active execution with id \"27\"."
+      },
+      {
+        "workflowId": "132",
+        "error": "Workflow failed to execute: There is no active execution with id \"28\"."
+      },
+      {
+        "workflowId": "133",
+        "error": "Workflow failed to execute: There is no active execution with id \"29\"."
+      },
+      {
+        "workflowId": "123",
+        "error": "Workflow failed to execute: There is no active execution with id \"19\"."
+      },
+      {
+        "workflowId": "121",
+        "error": "Workflow failed to execute: There is no active execution with id \"18\"."
+      },
+      {
+        "workflowId": "120",
+        "error": "Workflow failed to execute: There is no active execution with id \"17\"."
+      },
+      {
+        "workflowId": "126",
+        "error": "Workflow failed to execute: There is no active execution with id \"21\"."
+      },
+      {
+        "workflowId": "118",
+        "error": "Workflow failed to execute: There is no active execution with id \"22\"."
+      },
+      {
+        "workflowId": "127",
+        "error": "Workflow failed to execute: There is no active execution with id \"23\"."
+      },
+      {
+        "workflowId": "128",
+        "error": "Workflow failed to execute: There is no active execution with id \"24\"."
+      },
+      {
+        "workflowId": "129",
+        "error": "Workflow failed to execute: There is no active execution with id \"25\"."
+      },
+      {
+        "workflowId": "137",
+        "error": "Workflow failed to execute: There is no active execution with id \"30\"."
+      },
+      {
+        "workflowId": "140",
+        "error": "Workflow failed to execute: There is no active execution with id \"32\"."
+      },
+      {
+        "workflowId": "138",
+        "error": "Workflow failed to execute: There is no active execution with id \"31\"."
+      },
+      {
+        "workflowId": "142",
+        "error": "Workflow failed to execute: There is no active execution with id \"34\"."
+      },
+      {
+        "workflowId": "154",
+        "error": "Workflow failed to execute: There is no active execution with id \"43\"."
+      },
+      {
+        "workflowId": "153",
+        "error": "Workflow failed to execute: There is no active execution with id \"42\"."
+      },
+      {
+        "workflowId": "151",
+        "error": "Workflow failed to execute: There is no active execution with id \"40\"."
+      },
+      {
+        "workflowId": "145",
+        "error": "Workflow failed to execute: There is no active execution with id \"36\"."
+      },
+      {
+        "workflowId": "146",
+        "error": "Workflow failed to execute: There is no active execution with id \"37\"."
+      },
+      {
+        "workflowId": "141",
+        "error": "Workflow failed to execute: There is no active execution with id \"33\"."
+      },
+      {
+        "workflowId": "143",
+        "error": "Workflow failed to execute: There is no active execution with id \"35\"."
+      },
+      {
+        "workflowId": "15",
+        "error": "Workflow failed to execute: There is no active execution with id \"38\"."
+      },
+      {
+        "workflowId": "150",
+        "error": "Workflow failed to execute: There is no active execution with id \"39\"."
+      },
+      {
+        "workflowId": "152",
+        "error": "Workflow failed to execute: There is no active execution with id \"41\"."
+      },
+      {
+        "workflowId": "156",
+        "error": "Workflow failed to execute: There is no active execution with id \"45\"."
+      },
+      {
+        "workflowId": "161",
+        "error": "Workflow failed to execute: There is no active execution with id \"46\"."
+      },
+      {
+        "workflowId": "16",
+        "error": "Workflow failed to execute: There is no active execution with id \"47\"."
+      },
+      {
+        "workflowId": "182",
+        "error": "Workflow failed to execute: There is no active execution with id \"54\"."
+      },
+      {
+        "workflowId": "163",
+        "error": "Workflow failed to execute: There is no active execution with id \"55\"."
+      },
+      {
+        "workflowId": "162",
+        "error": "Workflow failed to execute: There is no active execution with id \"56\"."
+      },
+      {
+        "workflowId": "187",
+        "error": "Workflow failed to execute: There is no active execution with id \"57\"."
+      },
+      {
+        "workflowId": "190",
+        "error": "Workflow failed to execute: There is no active execution with id \"58\"."
+      },
+      {
+        "workflowId": "170",
+        "error": "Workflow failed to execute: There is no active execution with id \"50\"."
+      },
+      {
+        "workflowId": "166",
+        "error": "Workflow failed to execute: There is no active execution with id \"48\"."
+      },
+      {
+        "workflowId": "172",
+        "error": "Workflow failed to execute: There is no active execution with id \"51\"."
+      },
+      {
+        "workflowId": "174",
+        "error": "Workflow failed to execute: There is no active execution with id \"52\"."
+      },
+      {
+        "workflowId": "177",
+        "error": "Workflow failed to execute: There is no active execution with id \"53\"."
+      },
+      {
+        "workflowId": "191",
+        "error": "Workflow failed to execute: There is no active execution with id \"59\"."
+      },
+      {
+        "workflowId": "194",
+        "error": "Workflow failed to execute: There is no active execution with id \"60\"."
+      },
+      {
+        "workflowId": "195",
+        "error": "Workflow failed to execute: There is no active execution with id \"62\"."
+      },
+      {
+        "workflowId": "196",
+        "error": "Workflow failed to execute: There is no active execution with id \"61\"."
+      },
+      {
+        "workflowId": "208",
+        "error": "Workflow failed to execute: There is no active execution with id \"72\"."
+      },
+      {
+        "workflowId": "206",
+        "error": "Workflow failed to execute: There is no active execution with id \"70\"."
+      },
+      {
+        "workflowId": "202",
+        "error": "Workflow failed to execute: There is no active execution with id \"66\"."
+      },
+      {
+        "workflowId": "199",
+        "error": "Workflow failed to execute: There is no active execution with id \"65\"."
+      },
+      {
+        "workflowId": "198",
+        "error": "Workflow failed to execute: There is no active execution with id \"64\"."
+      },
+      {
+        "workflowId": "204",
+        "error": "Workflow failed to execute: There is no active execution with id \"68\"."
+      },
+      {
+        "workflowId": "197",
+        "error": "Workflow failed to execute: There is no active execution with id \"63\"."
+      },
+      {
+        "workflowId": "203",
+        "error": "Workflow failed to execute: There is no active execution with id \"67\"."
+      },
+      {
+        "workflowId": "205",
+        "error": "Workflow failed to execute: There is no active execution with id \"69\"."
+      },
+      {
+        "workflowId": "207",
+        "error": "Workflow failed to execute: There is no active execution with id \"71\"."
+      },
+      {
+        "workflowId": "209",
+        "error": "Workflow failed to execute: There is no active execution with id \"73\"."
+      },
+      {
+        "workflowId": "223",
+        "error": "Workflow failed to execute: There is no active execution with id \"75\"."
+      },
+      {
+        "workflowId": "35",
+        "error": "Workflow failed to execute: There is no active execution with id \"81\"."
+      },
+      {
+        "workflowId": "36",
+        "error": "Workflow failed to execute: There is no active execution with id \"82\"."
+      },
+      {
+        "workflowId": "37",
+        "error": "Workflow failed to execute: There is no active execution with id \"83\"."
+      },
+      {
+        "workflowId": "40",
+        "error": "Workflow failed to execute: There is no active execution with id \"84\"."
+      },
+      {
+        "workflowId": "29",
+        "error": "Workflow failed to execute: There is no active execution with id \"79\"."
+      },
+      {
+        "workflowId": "41",
+        "error": "Workflow failed to execute: There is no active execution with id \"85\"."
+      },
+      {
+        "workflowId": "32",
+        "error": "Workflow failed to execute: There is no active execution with id \"80\"."
+      },
+      {
+        "workflowId": "26",
+        "error": "Workflow failed to execute: There is no active execution with id \"78\"."
+      },
+      {
+        "workflowId": "42",
+        "error": "Workflow failed to execute: There is no active execution with id \"87\"."
+      },
+      {
+        "workflowId": "43",
+        "error": "Workflow failed to execute: There is no active execution with id \"88\"."
+      },
+      {
+        "workflowId": "44",
+        "error": "Workflow failed to execute: There is no active execution with id \"89\"."
+      },
+      {
+        "workflowId": "45",
+        "error": "Workflow failed to execute: There is no active execution with id \"90\"."
+      },
+      {
+        "workflowId": "55",
+        "error": "Workflow failed to execute: There is no active execution with id \"96\"."
+      },
+      {
+        "workflowId": "46",
+        "error": "Workflow failed to execute: There is no active execution with id \"97\"."
+      },
+      {
+        "workflowId": "50",
+        "error": "Workflow failed to execute: There is no active execution with id \"92\"."
+      },
+      {
+        "workflowId": "51",
+        "error": "Workflow failed to execute: There is no active execution with id \"93\"."
+      },
+      {
+        "workflowId": "58",
+        "error": "Workflow failed to execute: There is no active execution with id \"98\"."
+      },
+      {
+        "workflowId": "53",
+        "error": "Workflow failed to execute: There is no active execution with id \"95\"."
+      },
+      {
+        "workflowId": "48",
+        "error": "Workflow failed to execute: There is no active execution with id \"91\"."
+      },
+      {
+        "workflowId": "52",
+        "error": "Workflow failed to execute: There is no active execution with id \"94\"."
+      },
+      {
+        "workflowId": "60",
+        "error": "Workflow failed to execute: There is no active execution with id \"100\"."
+      },
+      {
+        "workflowId": "61",
+        "error": "Workflow failed to execute: There is no active execution with id \"101\"."
+      },
+      {
+        "workflowId": "62",
+        "error": "Workflow failed to execute: There is no active execution with id \"102\"."
+      },
+      {
+        "workflowId": "67",
+        "error": "Workflow failed to execute: There is no active execution with id \"104\"."
+      },
+      {
+        "workflowId": "73",
+        "error": "Workflow failed to execute: There is no active execution with id \"107\"."
+      },
+      {
+        "workflowId": "71",
+        "error": "Workflow failed to execute: There is no active execution with id \"106\"."
+      },
+      {
+        "workflowId": "70",
+        "error": "Workflow failed to execute: There is no active execution with id \"105\"."
+      },
+      {
+        "workflowId": "75",
+        "error": "Workflow failed to execute: There is no active execution with id \"108\"."
+      },
+      {
+        "workflowId": "77",
+        "error": "Workflow failed to execute: There is no active execution with id \"109\"."
+      },
+      {
+        "workflowId": "63",
+        "error": "Workflow failed to execute: There is no active execution with id \"103\"."
+      },
+      {
+        "workflowId": "76",
+        "error": "Workflow failed to execute: There is no active execution with id \"110\"."
+      },
+      {
+        "workflowId": "81",
+        "error": "Workflow failed to execute: There is no active execution with id \"111\"."
+      },
+      {
+        "workflowId": "82",
+        "error": "Workflow failed to execute: There is no active execution with id \"112\"."
+      },
+      {
+        "workflowId": "84",
+        "error": "Workflow failed to execute: There is no active execution with id \"114\"."
+      },
+      {
+        "workflowId": "88",
+        "error": "Workflow failed to execute: There is no active execution with id \"115\"."
+      },
+      {
+        "workflowId": "87",
+        "error": "Workflow failed to execute: There is no active execution with id \"117\"."
+      },
+      {
+        "workflowId": "86",
+        "error": "Workflow failed to execute: There is no active execution with id \"118\"."
+      },
+      {
+        "workflowId": "96",
+        "error": "Workflow failed to execute: There is no active execution with id \"122\"."
+      },
+      {
+        "workflowId": "98",
+        "error": "Workflow failed to execute: There is no active execution with id \"124\"."
+      }
+    ],
+    "warnings": [
+      {
+        "workflowId": "101",
+        "error": "Workflow contains new data that previously did not exist."
+      },
+      {
+        "workflowId": "111",
+        "error": "Workflow contains new data that previously did not exist."
+      },
+      {
+        "workflowId": "108",
+        "error": "Workflow contains new data that previously did not exist."
+      },
+      {
+        "workflowId": "107",
+        "error": "Workflow contains new data that previously did not exist."
+      },
+      {
+        "workflowId": "104",
+        "error": "Workflow contains new data that previously did not exist."
+      },
+      {
+        "workflowId": "105",
+        "error": "Workflow contains new data that previously did not exist."
+      },
+      {
+        "workflowId": "103",
+        "error": "Workflow contains new data that previously did not exist."
+      },
+      {
+        "workflowId": "125",
+        "error": "connect ECONNREFUSED 157.90.159.163:5432 on node Postgres"
+      },
+      {
+        "workflowId": "216",
+        "error": "Workflow contains new data that previously did not exist."
+      },
+      {
+        "workflowId": "17",
+        "error": "Workflow contains new data that previously did not exist."
+      },
+      {
+        "workflowId": "6",
+        "error": "Workflow contains new data that previously did not exist."
+      },
+      {
+        "workflowId": "91",
+        "error": "Workflow contains new data that previously did not exist."
+      },
+      {
+        "workflowId": "90",
+        "error": "Workflow contains new data that previously did not exist."
+      },
+      {
+        "workflowId": "95",
+        "error": "Workflow contains new data that previously did not exist."
+      },
+      {
+        "workflowId": "93",
+        "error": "Workflow contains new data that previously did not exist."
+      },
+      {
+        "workflowId": "97",
+        "error": "Workflow contains new data that previously did not exist."
+      },
+      {
+        "workflowId": "83",
+        "error": "Workflow contains new data that previously did not exist."
+      },
+      {
+        "workflowId": "212",
+        "error": "Workflow contains new data that previously did not exist."
+      },
+      {
+        "workflowId": "155",
+        "error": "Workflow contains new data that previously did not exist."
+      },
+      {
+        "workflowId": "229",
+        "error": "Workflow contains new data that previously did not exist."
+      }
+    ]
+  },
+  "coveredNodes": {
+    "n8n-nodes-base.manualTrigger": 1,
+    "n8n-nodes-base.httpRequest": 1
+  },
+  "executions": [
+    {
+      "workflowId": "101",
+      "workflowName": "RenameKeys",
+      "executionTime": 0,
+      "finished": true,
+      "executionStatus": "warning",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.renameKeys": 1,
+        "n8n-nodes-base.set": 1,
+        "n8n-nodes-base.function": 1
+      },
+      "error": "Workflow contains new data that previously did not exist.",
+      "changes": {
+        "data": {
+          "executionData": {
+            "metadata__added": {}
+          }
+        }
+      }
+    },
+    {
+      "workflowId": "113",
+      "workflowName": "AMQP",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.amqp": 1,
+        "n8n-nodes-base.set": 1
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"7\"."
+    },
+    {
+      "workflowId": "111",
+      "workflowName": "Spreadsheet File",
+      "executionTime": 0,
+      "finished": true,
+      "executionStatus": "warning",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.spreadsheetFile": 2,
+        "n8n-nodes-base.function": 3
+      },
+      "error": "Workflow contains new data that previously did not exist.",
+      "changes": {
+        "data": {
+          "executionData": {
+            "metadata__added": {}
+          }
+        }
+      }
+    },
+    {
+      "workflowId": "115",
+      "workflowName": "Cockpit:Collection:createEntry updateEntry getAllEntries:Singleton:get:Form:submit",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.cockpit": 5
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"8\"."
+    },
+    {
+      "workflowId": "117",
+      "workflowName": "Gotify:Message:create getAll delete",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.gotify": 3
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"10\"."
+    },
+    {
+      "workflowId": "116",
+      "workflowName": "Ghost:Post(Admin API):create update get getAll delete:Post(Content API):getAll get",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.ghost": 7
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"9\"."
+    },
+    {
+      "workflowId": "106",
+      "workflowName": "Box:Folder:create search get delete:File:upload get download copy search delete",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.box": 11,
+        "n8n-nodes-base.readBinaryFile": 1
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"14\"."
+    },
+    {
+      "workflowId": "10",
+      "workflowName": "PagerDuty:incident:create get update getAll:incidentNote:create getAll:User:get:LogEntry:getAll get",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.pagerDuty": 9,
+        "n8n-nodes-base.function": 1
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"15\"."
+    },
+    {
+      "workflowId": "114",
+      "workflowName": "Monday:Board:create get getAll archive:BoardColumn:create getAll:BoardGroup:create delete getAll:BoardItem:create addUpdate changeColumnValue get getAll getByColumnValue move delete",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.mondayCom": 17,
+        "n8n-nodes-base.merge": 1
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"13\"."
+    },
+    {
+      "workflowId": "108",
+      "workflowName": "Merge:append keepKeyMatches mergeByIndex(leftjoin,innerjoin,outerjoin) mergeByKey(ifBlank,always,ifMissing) Multiplex passThrough removeKeyMatches",
+      "executionTime": 0,
+      "finished": true,
+      "executionStatus": "warning",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.merge": 11,
+        "n8n-nodes-base.set": 12,
+        "n8n-nodes-base.function": 13
+      },
+      "error": "Workflow contains new data that previously did not exist.",
+      "changes": {
+        "data": {
+          "executionData": {
+            "metadata__added": {}
+          }
+        }
+      }
+    },
+    {
+      "workflowId": "107",
+      "workflowName": "ReadBinaryFiles",
+      "executionTime": 0,
+      "finished": true,
+      "executionStatus": "warning",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.function": 1,
+        "n8n-nodes-base.readBinaryFiles": 1
+      },
+      "error": "Workflow contains new data that previously did not exist.",
+      "changes": {
+        "data": {
+          "executionData": {
+            "metadata__added": {}
+          }
+        }
+      }
+    },
+    {
+      "workflowId": "112",
+      "workflowName": "Rabbitmq:queue:exchange",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.rabbitmq": 5
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"5\"."
+    },
+    {
+      "workflowId": "11",
+      "workflowName": "Mailchimp:Member:getall get create update delete:Member Tag:create delete:ListGroup:getAll:Campaign:getAll get replicate delete",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.mailchimp": 12,
+        "n8n-nodes-base.function": 1
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"3\"."
+    },
+    {
+      "workflowId": "104",
+      "workflowName": "ReadPDF",
+      "executionTime": 1,
+      "finished": true,
+      "executionStatus": "warning",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.readPDF": 1,
+        "n8n-nodes-base.readBinaryFile": 1
+      },
+      "error": "Workflow contains new data that previously did not exist.",
+      "changes": {
+        "data": {
+          "resultData": {
+            "runData": {
+              "Read Binary File": [
+                [
+                  "~",
+                  {
+                    "data": {
+                      "main": [
+                        [
+                          "~",
+                          [
+                            [
+                              "~",
+                              {
+                                "binary": {
+                                  "data": {
+                                    "fileType__added": "pdf"
+                                  }
+                                }
+                              }
+                            ]
+                          ]
+                        ]
+                      ]
+                    }
+                  }
+                ]
+              ],
+              "Read PDF": [
+                [
+                  "~",
+                  {
+                    "data": {
+                      "main": [
+                        [
+                          "~",
+                          [
+                            [
+                              "~",
+                              {
+                                "binary": {
+                                  "data": {
+                                    "fileType__added": "pdf"
+                                  }
+                                }
+                              }
+                            ]
+                          ]
+                        ]
+                      ]
+                    }
+                  }
+                ]
+              ]
+            }
+          },
+          "executionData": {
+            "metadata__added": {}
+          }
+        }
+      }
+    },
+    {
+      "workflowId": "105",
+      "workflowName": "WriteBinaryFile",
+      "executionTime": 1,
+      "finished": true,
+      "executionStatus": "warning",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.writeBinaryFile": 1,
+        "n8n-nodes-base.readBinaryFile": 1,
+        "n8n-nodes-base.function": 2
+      },
+      "error": "Workflow contains new data that previously did not exist.",
+      "changes": {
+        "data": {
+          "executionData": {
+            "metadata__added": {}
+          }
+        }
+      }
+    },
+    {
+      "workflowId": "103",
+      "workflowName": "ExecuteCommand",
+      "executionTime": 1,
+      "finished": true,
+      "executionStatus": "warning",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.executeCommand": 2,
+        "n8n-nodes-base.readBinaryFile": 1,
+        "n8n-nodes-base.set": 1,
+        "n8n-nodes-base.function": 1
+      },
+      "error": "Workflow contains new data that previously did not exist.",
+      "changes": {
+        "data": {
+          "executionData": {
+            "metadata__added": {}
+          }
+        }
+      }
+    },
+    {
+      "workflowId": "130",
+      "workflowName": "Wekan:Board:create get getAll delete:List:create get getAll delete:Card:create update get getAll delete:CardComment:create get getAll delete:CheckList:create get getAll delete:CheckListItem:get update delete",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.wekan": 24,
+        "n8n-nodes-base.merge": 1
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"26\"."
+    },
+    {
+      "workflowId": "131",
+      "workflowName": "Line:Notification:send",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.line": 1
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"27\"."
+    },
+    {
+      "workflowId": "132",
+      "workflowName": "Mandrill:Message:sendTemplate sendHTML",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.mandrill": 2
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"28\"."
+    },
+    {
+      "workflowId": "133",
+      "workflowName": "Twilio:SMS:send",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.twilio": 1
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"29\"."
+    },
+    {
+      "workflowId": "123",
+      "workflowName": "MongoDB:insert find update delete",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.mongoDb": 4,
+        "n8n-nodes-base.set": 2
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"19\"."
+    },
+    {
+      "workflowId": "121",
+      "workflowName": "Mautic:Company:create update get getAll delete:Contact:create update get getAll delete:ContactCompany:add remove",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.mautic": 12,
+        "n8n-nodes-base.merge": 1
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"18\"."
+    },
+    {
+      "workflowId": "120",
+      "workflowName": "MySQL:insert update executeQuery",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.set": 2,
+        "n8n-nodes-base.mySql": 4
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"17\"."
+    },
+    {
+      "workflowId": "126",
+      "workflowName": "Kafka",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.kafka": 1,
+        "n8n-nodes-base.set": 1
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"21\"."
+    },
+    {
+      "workflowId": "118",
+      "workflowName": "Redis:info set keys get delete",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.redis": 5,
+        "n8n-nodes-base.set": 1,
+        "n8n-nodes-base.function": 1
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"22\"."
+    },
+    {
+      "workflowId": "127",
+      "workflowName": "Rundeck:Job:execute getMetadata",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.rundeck": 2
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"23\"."
+    },
+    {
+      "workflowId": "128",
+      "workflowName": "Yourls:Url:shorten stats expand",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.yourls": 3
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"24\"."
+    },
+    {
+      "workflowId": "129",
+      "workflowName": "NextCloud:NextCloud:Folder:create move copy delete list:File:upload move copy download delete",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.nextCloud": 16,
+        "n8n-nodes-base.set": 2,
+        "n8n-nodes-base.readBinaryFile": 1,
+        "n8n-nodes-base.function": 8
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"25\"."
+    },
+    {
+      "workflowId": "137",
+      "workflowName": "TheHive[v3]:Alert:create update get getAll promote merge:Case:create update get getAll:Observable:create update get search getAll:Task:create update get search getAll:Log:create get getAll",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.theHive": 31,
+        "n8n-nodes-base.function": 9
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"30\"."
+    },
+    {
+      "workflowId": "140",
+      "workflowName": "Mailgun",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.mailgun": 1
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"32\"."
+    },
+    {
+      "workflowId": "138",
+      "workflowName": "TheHive[v4]:Alert:create update get getAll promote merge:Case:create update get getAll:Observable:create update get search getAll:Task:create update get search getAll:Log:create get getAll",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.theHive": 35,
+        "n8n-nodes-base.function": 10
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"31\"."
+    },
+    {
+      "workflowId": "142",
+      "workflowName": "MicrosoftOutlook:Folder:create get getAll getChildren delete:Message send getAll get getMime update delete:FolderMessage:getAll:Draft:create update get delete send:MessageAttachment:add getAll get download",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.microsoftOutlook": 24,
+        "n8n-nodes-base.moveBinaryData": 1,
+        "n8n-nodes-base.set": 1,
+        "n8n-nodes-base.function": 11
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"34\"."
+    },
+    {
+      "workflowId": "154",
+      "workflowName": "AWSRekognition:Image:analyze",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.awsRekognition": 1,
+        "n8n-nodes-base.function": 1
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"43\"."
+    },
+    {
+      "workflowId": "153",
+      "workflowName": "AWSLambda:invoke",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.awsLambda": 2
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"42\"."
+    },
+    {
+      "workflowId": "151",
+      "workflowName": "Wise:Account:getStatement getBalances getCurrencies:ExchangeRate:get:Profile:get getAll:Recipient:getAll:Quote:create get:Transfer:create get getAll execute delete",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.wise": 16
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"40\"."
+    },
+    {
+      "workflowId": "145",
+      "workflowName": "Peekalink:isAvailable preview",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.peekalink": 2
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"36\"."
+    },
+    {
+      "workflowId": "146",
+      "workflowName": "TimescaleDB:insert update executeQuery",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.timescaleDb": 4,
+        "n8n-nodes-base.set": 2
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"37\"."
+    },
+    {
+      "workflowId": "141",
+      "workflowName": "MicrosoftExcel:Table:lookup getRows getColumns addRow:Workbook:addWorksheet getAll:Worksheet:getAll getContent",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.microsoftExcel": 8,
+        "n8n-nodes-base.set": 1,
+        "n8n-nodes-base.function": 4
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"33\"."
+    },
+    {
+      "workflowId": "143",
+      "workflowName": "Clearbit:Company:enrich autocomplete:Person:enrich",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.clearbit": 3
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"35\"."
+    },
+    {
+      "workflowId": "15",
+      "workflowName": "DropBox:File: upload move copy download delete",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.dropbox": 10,
+        "n8n-nodes-base.readBinaryFile": 1,
+        "n8n-nodes-base.function": 7
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"38\"."
+    },
+    {
+      "workflowId": "150",
+      "workflowName": "PostHog:Event:create:Identity:create:Alias:create:Track:page screen",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.postHog": 5
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"39\"."
+    },
+    {
+      "workflowId": "152",
+      "workflowName": "AWSComprehend:Text:detectDominantLanguage detectSentiment detectEntities",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.awsComprehend": 3
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"41\"."
+    },
+    {
+      "workflowId": "125",
+      "workflowName": "Postgres: insert update executeQuery",
+      "executionTime": 1,
+      "finished": false,
+      "executionStatus": "warning",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.postgres": 4,
+        "n8n-nodes-base.set": 2
+      },
+      "error": "connect ECONNREFUSED 157.90.159.163:5432 on node Postgres"
+    },
+    {
+      "workflowId": "156",
+      "workflowName": "AWSSNS:publish",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.awsSns": 1
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"45\"."
+    },
+    {
+      "workflowId": "161",
+      "workflowName": "Vonage:SMS:send",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.vonage": 1
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"46\"."
+    },
+    {
+      "workflowId": "16",
+      "workflowName": "OpenWeatherMap:: current-weather 5-day-forecast",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.openWeatherMap": 2
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"47\"."
+    },
+    {
+      "workflowId": "182",
+      "workflowName": "Webflow:Item:create get update delete getAll",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.webflow": 5
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"54\"."
+    },
+    {
+      "workflowId": "163",
+      "workflowName": "GoogleSlides:Presentation:create get getSlides replaceText:Page:get getThumbnail",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.googleSlides": 7
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"55\"."
+    },
+    {
+      "workflowId": "162",
+      "workflowName": "AWSSQS:sendMessage",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.awsSqs": 2
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"56\"."
+    },
+    {
+      "workflowId": "187",
+      "workflowName": "Strapi:Entry:create get getAll update delete",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.strapi": 5,
+        "n8n-nodes-base.set": 2
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"57\"."
+    },
+    {
+      "workflowId": "190",
+      "workflowName": "Discourse:User:create get getAll:Category:create update getAll:Group:create update get getAll:UserGroup:add remove:Post:create update get getAll",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.discourse": 16,
+        "n8n-nodes-base.set": 1
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"58\"."
+    },
+    {
+      "workflowId": "170",
+      "workflowName": "Xero:Contact:create get getAll update:Invoice:create get getAll update",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.xero": 8
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"50\"."
+    },
+    {
+      "workflowId": "166",
+      "workflowName": "Intercom:Company:create get getAll update users:Lead:create get getAll update delete:User:create get getAll update delete",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.intercom": 15
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"48\"."
+    },
+    {
+      "workflowId": "172",
+      "workflowName": "Paypal:Payout:create get:PayoutItem:get",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.payPal": 4
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"51\"."
+    },
+    {
+      "workflowId": "174",
+      "workflowName": "Vero:User:create alias addTags removeTags unsubscribe resubscribe delete:Event:track",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.vero": 8,
+        "n8n-nodes-base.set": 1
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"52\"."
+    },
+    {
+      "workflowId": "177",
+      "workflowName": "uProc:Finance:*;",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.uproc": 24
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"53\"."
+    },
+    {
+      "workflowId": "191",
+      "workflowName": "Mailerlite:Subscriber:create get update getAll",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.mailerLite": 4
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"59\"."
+    },
+    {
+      "workflowId": "194",
+      "workflowName": "Mailjet:Email:send sendTemplate",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.mailjet": 3
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"60\"."
+    },
+    {
+      "workflowId": "195",
+      "workflowName": "Kitemaker:Organization:get:Space:getAll:User:getAll:WorkItem:create get getAll update",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.kitemaker": 7
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"62\"."
+    },
+    {
+      "workflowId": "196",
+      "workflowName": "QuickBooks:Bill:create get update getAll delete:Item:getAll:get:Vendor:create get getAll update:Employee:create get update getAll:Customer:create get update getAll:Estimate:create get update getAll send delete:Invoice:create get update getAll send delete:Payment:create get update getAll send delete",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.quickbooks": 37
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"61\"."
+    },
+    {
+      "workflowId": "208",
+      "workflowName": "RocketChat:Chat:postMessage",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.rocketchat": 1
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"72\"."
+    },
+    {
+      "workflowId": "206",
+      "workflowName": "Keap:Company:create getAll:Contact:upsert get getAll delete:ContactNote:create get update getAll delete:ContactTag:create getAll delete",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.keap": 14
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"70\"."
+    },
+    {
+      "workflowId": "202",
+      "workflowName": "Beeminder:Datapoint:create getAll update delete",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.beeminder": 5
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"66\"."
+    },
+    {
+      "workflowId": "199",
+      "workflowName": "MailCheck:Email:check",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.mailcheck": 1
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"65\"."
+    },
+    {
+      "workflowId": "198",
+      "workflowName": "GoogleCloudFirestore:Document:create get upset getAll query delete:Collection:getAll",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.googleFirebaseCloudFirestore": 7,
+        "n8n-nodes-base.set": 2
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"64\"."
+    },
+    {
+      "workflowId": "204",
+      "workflowName": "HelpScout:Mailbox:getAll get:Customer:create get update getAll properties:Conversation:create get getAll delete:Thread:create getAll",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.helpScout": 13
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"68\"."
+    },
+    {
+      "workflowId": "197",
+      "workflowName": "MQTT:sendMessage",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.mqtt": 3,
+        "n8n-nodes-base.function": 1
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"63\"."
+    },
+    {
+      "workflowId": "203",
+      "workflowName": "Paddle:Payment:getAll reschedule:Plan:getAll get:Product:getAll:Coupon:create update getAll:User:getAll",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.paddle": 9,
+        "n8n-nodes-base.dateTime": 1
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"67\"."
+    },
+    {
+      "workflowId": "205",
+      "workflowName": "Pushover:Message:push",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.pushover": 1
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"69\"."
+    },
+    {
+      "workflowId": "207",
+      "workflowName": "Keap:EcommerceOrder:create get getAll delete:EcommerceProduct:create get getAll delete:Email:createRecord getAll:File:upload getAll delete",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.keap": 15
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"71\"."
+    },
+    {
+      "workflowId": "209",
+      "workflowName": "AWS Transcribe:TranscriptionJob:create get getAll delete",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.awsTranscribe": 4,
+        "n8n-nodes-base.set": 1,
+        "n8n-nodes-base.function": 1
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"73\"."
+    },
+    {
+      "workflowId": "223",
+      "workflowName": "LingvaNex:Translate",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.lingvaNex": 1
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"75\"."
+    },
+    {
+      "workflowId": "216",
+      "workflowName": "FunctionItem:JSON,Binary and Static data",
+      "executionTime": 0,
+      "finished": true,
+      "executionStatus": "warning",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.functionItem": 3
+      },
+      "error": "Workflow contains new data that previously did not exist.",
+      "changes": {
+        "data": {
+          "executionData": {
+            "metadata__added": {}
+          }
+        }
+      }
+    },
+    {
+      "workflowId": "17",
+      "workflowName": "OpenThesaurus:: Get Synonyms",
+      "executionTime": 1,
+      "finished": true,
+      "executionStatus": "warning",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.openThesaurus": 1
+      },
+      "error": "Workflow contains new data that previously did not exist.",
+      "changes": {
+        "data": {
+          "executionData": {
+            "metadata__added": {}
+          }
+        }
+      }
+    },
+    {
+      "workflowId": "35",
+      "workflowName": "Slack:User:getPresence info:UserProfile:get update:Message:post getPermalink update postEphermera l delete:Reaction:add get remove",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.slack": 12
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"81\"."
+    },
+    {
+      "workflowId": "36",
+      "workflowName": "Slack:File:upload getAll get:Star:add getAll delete:Channgel:create update setPurpose setTopic ge t invite leave join getAll history replies member archive unarchive",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.slack": 22
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"82\"."
+    },
+    {
+      "workflowId": "37",
+      "workflowName": "GitLab:Repository:get getIssues:Issue:create createComment edit get lock:Release:create get getAll update delete:User:getRepositories",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.gitlab": 13
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"83\"."
+    },
+    {
+      "workflowId": "40",
+      "workflowName": "Gmail:Draft:create getAll get delete:Label:create getAll get delete:Message:send getAll get reply delete:MessageLabel:add remove",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.gmail": 16,
+        "n8n-nodes-base.function": 2
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"84\"."
+    },
+    {
+      "workflowId": "29",
+      "workflowName": "ClickUp:Comment:create update getAll delete",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.clickUp": 8,
+        "n8n-nodes-base.function": 7
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"79\"."
+    },
+    {
+      "workflowId": "41",
+      "workflowName": "GoogleCalendar:Event:create getAll get update delete:Calendar:availability",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.googleCalendar": 6
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"85\"."
+    },
+    {
+      "workflowId": "32",
+      "workflowName": "Drif:Contact:create update get delete",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.drift": 4
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"80\"."
+    },
+    {
+      "workflowId": "26",
+      "workflowName": "ClickUp:Folder:create update getAll get delete:Goal:create update getAll get delete:GoalKeyResult:create update delete",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.clickUp": 13,
+        "n8n-nodes-base.function": 11
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"78\"."
+    },
+    {
+      "workflowId": "42",
+      "workflowName": "GoogleTask:create update getAll get delete",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.googleTasks": 5
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"87\"."
+    },
+    {
+      "workflowId": "43",
+      "workflowName": "GoogleContacts:create update getAll get delete",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.googleContacts": 5,
+        "n8n-nodes-base.function": 1
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"88\"."
+    },
+    {
+      "workflowId": "44",
+      "workflowName": "GoogleDrive:Folder:create share delete:File:upload share list download copy delete",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.googleDrive": 11
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"89\"."
+    },
+    {
+      "workflowId": "45",
+      "workflowName": "GoogleSheets:SpreadSheet:create:Sheet:create append read lookup update delete clean remove",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.googleSheets": 9,
+        "n8n-nodes-base.set": 1,
+        "n8n-nodes-base.function": 1
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"90\"."
+    },
+    {
+      "workflowId": "55",
+      "workflowName": "Hunter: domainSearch emailFinder emailVerifier",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.hunter": 3
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"96\"."
+    },
+    {
+      "workflowId": "46",
+      "workflowName": "GoogleBooks:Volume:getAll get:BookShelf:getAll get:BookShelfVolume:add move getAll remove clear",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.googleBooks": 9
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"97\"."
+    },
+    {
+      "workflowId": "50",
+      "workflowName": "Brandfetch:color company font logo industry",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.Brandfetch": 5
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"92\"."
+    },
+    {
+      "workflowId": "51",
+      "workflowName": "Clockify:Project:create update get getAll:Tag:create update getAll delete:TimeEntry:create update get delete",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.clockify": 13,
+        "n8n-nodes-base.function": 1
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"93\"."
+    },
+    {
+      "workflowId": "58",
+      "workflowName": "Todoist:Task:create get close reopen getAll delete",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.todoist": 6
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"98\"."
+    },
+    {
+      "workflowId": "53",
+      "workflowName": "ConvertKit:CustomField:create getAll update delete:Form:getAll addSubscriber getSubscriptions:Tag:create getAll:TagSubscriber:add getAll delete",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.convertKit": 12
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"95\"."
+    },
+    {
+      "workflowId": "48",
+      "workflowName": "Asana:Project:getAll get:Task:create update move getAll get delete:TaskComment:add remove:TaskTag:add remove:TaskProject:add remov e:SubTask:create getAll:User:get getAll",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.asana": 18
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"91\"."
+    },
+    {
+      "workflowId": "52",
+      "workflowName": "Coda:Table:getAllColumns getColumn getAllRows getRow createRow pushButton deleteRow:View:getAll get getAllViewColumns getAllViewRows updateViewRow pushViewButto n:Formula:get getAll:Control:get getAll",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.coda": 17,
+        "n8n-nodes-base.set": 2
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"94\"."
+    },
+    {
+      "workflowId": "60",
+      "workflowName": "Taiga:Issue:create update get getAll delete",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.taiga": 5
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"100\"."
+    },
+    {
+      "workflowId": "61",
+      "workflowName": "Spotify:Artist:get getAlbums getRelatedArtists getTopTracks:Album:get getNewReleases getTracks:Track:get getAudioFeatures:Playlist:create getUserPlaylists get add getTracks delete:Player:recentylPlayed currentlyPlaying:Library:getLikedTracks",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.spotify": 18
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"101\"."
+    },
+    {
+      "workflowId": "62",
+      "workflowName": "ProfitWell:Company:getSetting:Metric:getMontly getDaily",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.profitWell": 3
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"102\"."
+    },
+    {
+      "workflowId": "67",
+      "workflowName": " Twist:Channel:create update get getAll archive unarchive delete:MessageConversation:create get getAll update delete:Thread:create get update getAll delete:Comment:create get update getAll delete",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.twist": 23
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"104\"."
+    },
+    {
+      "workflowId": "73",
+      "workflowName": "Youtube:Channel:get getAll update:Playlist:create update getAll get delete:PlaylistItem:add getAll get delete:videoCategory:getAll:Video:rate get upload update delete",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.youTube": 18,
+        "n8n-nodes-base.httpRequest": 1,
+        "n8n-nodes-base.readBinaryFile": 1,
+        "n8n-nodes-base.function": 7
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"107\"."
+    },
+    {
+      "workflowId": "71",
+      "workflowName": "Contentful-preview-api:locale:getAll:entry:getAll:ContentType:get:Asset:getAll get:Space:get",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.contentful": 7
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"106\"."
+    },
+    {
+      "workflowId": "70",
+      "workflowName": "Contentful-delivery-api:locale:getAll:entry:getAll:ContentType:get:Asset:getAll get:Space:get",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.contentful": 7
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"105\"."
+    },
+    {
+      "workflowId": "75",
+      "workflowName": "Harvest:Client:create update getAll get delete:Invoice:create update getAll get delete:Contact:create update get getAll delete:Company:get",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.harvest": 16
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"108\"."
+    },
+    {
+      "workflowId": "77",
+      "workflowName": "Harvest:Expense:create update get getAll delete:Estimate:create update get getAll delete",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.harvest": 12
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"109\"."
+    },
+    {
+      "workflowId": "63",
+      "workflowName": "Segment:Identify:create:Track:event page",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.segment": 4
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"103\"."
+    },
+    {
+      "workflowId": "76",
+      "workflowName": "Harvest:Project:create update getAll get delete:Task:getAll get:TimeEntry:createByDuration createByStartEnd update getAll restartTime stopTime delete:User:me get getAll update",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.harvest": 24
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"110\"."
+    },
+    {
+      "workflowId": "6",
+      "workflowName": "Static files workflow",
+      "executionTime": 0,
+      "finished": true,
+      "executionStatus": "warning",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.writeBinaryFile": 1,
+        "n8n-nodes-base.function": 1
+      },
+      "error": "Workflow contains new data that previously did not exist.",
+      "changes": {
+        "data": {
+          "executionData": {
+            "metadata__added": {}
+          }
+        }
+      }
+    },
+    {
+      "workflowId": "81",
+      "workflowName": "PhantomBuster:getAll get launch getOutput",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.phantombuster": 4
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"111\"."
+    },
+    {
+      "workflowId": "82",
+      "workflowName": "Microsoft OneDrive:Folder:create getChildren share search delete:File:upload get share download copy delete search",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.microsoftOneDrive": 12,
+        "n8n-nodes-base.function": 6
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"112\"."
+    },
+    {
+      "workflowId": "84",
+      "workflowName": "Matrix:Room:create invite kick leave:RoomMember:getAll:Message:create getAll:Account:me:Media:upload:Event:get",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.matrix": 10,
+        "n8n-nodes-base.readBinaryFile": 1,
+        "n8n-nodes-base.merge": 1
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"114\"."
+    },
+    {
+      "workflowId": "91",
+      "workflowName": "HTML Extract:json binary",
+      "executionTime": 0,
+      "finished": true,
+      "executionStatus": "warning",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.functionItem": 1,
+        "n8n-nodes-base.htmlExtract": 2,
+        "n8n-nodes-base.function": 2,
+        "n8n-nodes-base.moveBinaryData": 1
+      },
+      "error": "Workflow contains new data that previously did not exist.",
+      "changes": {
+        "data": {
+          "resultData": {
+            "runData": {
+              "Move Binary Data": [
+                [
+                  "~",
+                  {
+                    "data": {
+                      "main": [
+                        [
+                          "~",
+                          [
+                            [
+                              "~",
+                              {
+                                "binary": {
+                                  "data": {
+                                    "fileExtension__added": "json"
+                                  }
+                                }
+                              }
+                            ]
+                          ]
+                        ]
+                      ]
+                    }
+                  }
+                ]
+              ]
+            }
+          },
+          "executionData": {
+            "metadata__added": {}
+          }
+        }
+      }
+    },
+    {
+      "workflowId": "88",
+      "workflowName": "ActiveCampaign:EcommerceCustomer:create update get getAll delete:EcommerceOrder:create update get getAll delete:EcommerceOrderProduct:getByProductId getByOrderId getAll",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.activeCampaign": 17
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"115\"."
+    },
+    {
+      "workflowId": "87",
+      "workflowName": "ActiveCampaign:Deal:create update get createNote updateNote getAll delete:Tag:create update get getAll delete:Connection:create update get getAll delete:List:getAll",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.activeCampaign": 20
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"117\"."
+    },
+    {
+      "workflowId": "86",
+      "workflowName": "ActiveCampaign:Contact:create update get getAll delete:Account:create update get getAll delete:AccountContact:create update delete:ContactTag:add remove:ContactList:add remove",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.activeCampaign": 17,
+        "n8n-nodes-base.merge": 1
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"118\"."
+    },
+    {
+      "workflowId": "90",
+      "workflowName": "Date&Time:formatDate",
+      "executionTime": 0,
+      "finished": true,
+      "executionStatus": "warning",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.dateTime": 6,
+        "n8n-nodes-base.function": 1
+      },
+      "error": "Workflow contains new data that previously did not exist.",
+      "changes": {
+        "data": {
+          "executionData": {
+            "metadata__added": {}
+          }
+        }
+      }
+    },
+    {
+      "workflowId": "95",
+      "workflowName": "Set",
+      "executionTime": 0,
+      "finished": true,
+      "executionStatus": "warning",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.set": 1,
+        "n8n-nodes-base.function": 1
+      },
+      "error": "Workflow contains new data that previously did not exist.",
+      "changes": {
+        "data": {
+          "executionData": {
+            "metadata__added": {}
+          }
+        }
+      }
+    },
+    {
+      "workflowId": "93",
+      "workflowName": "Move Binary Data:toJSON:toBinary",
+      "executionTime": 0,
+      "finished": true,
+      "executionStatus": "warning",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.moveBinaryData": 2,
+        "n8n-nodes-base.functionItem": 1,
+        "n8n-nodes-base.function": 1
+      },
+      "error": "Workflow contains new data that previously did not exist.",
+      "changes": {
+        "data": {
+          "resultData": {
+            "runData": {
+              "Move Binary Data": [
+                [
+                  "~",
+                  {
+                    "data": {
+                      "main": [
+                        [
+                          "~",
+                          [
+                            [
+                              "~",
+                              {
+                                "binary": {
+                                  "data": {
+                                    "fileExtension__added": "json"
+                                  }
+                                }
+                              }
+                            ]
+                          ]
+                        ]
+                      ]
+                    }
+                  }
+                ]
+              ]
+            }
+          },
+          "executionData": {
+            "metadata__added": {}
+          }
+        }
+      }
+    },
+    {
+      "workflowId": "96",
+      "workflowName": "MessageBird:Sms:send:Balance:get",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.messageBird": 2
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"122\"."
+    },
+    {
+      "workflowId": "97",
+      "workflowName": "Crypto",
+      "executionTime": 0,
+      "finished": true,
+      "executionStatus": "warning",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.crypto": 15,
+        "n8n-nodes-base.function": 3
+      },
+      "error": "Workflow contains new data that previously did not exist.",
+      "changes": {
+        "data": {
+          "executionData": {
+            "metadata__added": {}
+          }
+        }
+      }
+    },
+    {
+      "workflowId": "230",
+      "workflowName": "CredentialOnlyNodes",
+      "executionTime": 1,
+      "finished": true,
+      "executionStatus": "success",
+      "coveredNodes": {
+        "n8n-nodes-base.manualTrigger": 1,
+        "n8n-nodes-base.httpRequest": 1
+      }
+    },
+    {
+      "workflowId": "98",
+      "workflowName": "Disqus:Forum:get getCategories getThreads getPosts",
+      "executionTime": 0,
+      "finished": false,
+      "executionStatus": "error",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.disqus": 4
+      },
+      "error": "Workflow failed to execute: There is no active execution with id \"124\"."
+    },
+    {
+      "workflowId": "83",
+      "workflowName": "RSS Feed",
+      "executionTime": 1,
+      "finished": true,
+      "executionStatus": "warning",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.rssFeedRead": 1,
+        "n8n-nodes-base.function": 1
+      },
+      "error": "Workflow contains new data that previously did not exist.",
+      "changes": {
+        "data": {
+          "executionData": {
+            "metadata__added": {}
+          }
+        }
+      }
+    },
+    {
+      "workflowId": "212",
+      "workflowName": "Git:*",
+      "executionTime": 3,
+      "finished": true,
+      "executionStatus": "warning",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.git": 14,
+        "n8n-nodes-base.executeCommand": 2
+      },
+      "error": "Workflow contains new data that previously did not exist.",
+      "changes": {
+        "data": {
+          "resultData": {
+            "runData": {
+              "Git2": [
+                [
+                  "~",
+                  {
+                    "data": {
+                      "main": [
+                        [
+                          "~",
+                          [
+                            [
+                              " "
+                            ],
+                            [
+                              "-",
+                              {
+                                "json": {
+                                  "success": true
+                                },
+                                "pairedItem": {
+                                  "item": 1
+                                }
+                              }
+                            ]
+                          ]
+                        ]
+                      ]
+                    }
+                  }
+                ]
+              ],
+              "Git7": [
+                [
+                  "~",
+                  {
+                    "data": {
+                      "main": [
+                        [
+                          "~",
+                          [
+                            [
+                              " "
+                            ],
+                            [
+                              "-",
+                              {
+                                "json": {
+                                  "success": true
+                                },
+                                "pairedItem": {
+                                  "item": 1
+                                }
+                              }
+                            ]
+                          ]
+                        ]
+                      ]
+                    }
+                  }
+                ]
+              ]
+            }
+          },
+          "executionData": {
+            "metadata__added": {}
+          }
+        }
+      }
+    },
+    {
+      "workflowId": "155",
+      "workflowName": "AWSS3:Bucket:create getAll search:File:upload getAll download delete:Folder:create getAll delete",
+      "executionTime": 16,
+      "finished": true,
+      "executionStatus": "warning",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.awsS3": 12,
+        "n8n-nodes-base.set": 2,
+        "n8n-nodes-base.function": 1
+      },
+      "error": "Workflow contains new data that previously did not exist.",
+      "changes": {
+        "data": {
+          "executionData": {
+            "metadata__added": {}
+          }
+        }
+      }
+    },
+    {
+      "workflowId": "229",
+      "workflowName": "GoogleDrive:Folder:create share delete:File:upload share list download copy delete copy (RL)",
+      "executionTime": 23,
+      "finished": true,
+      "executionStatus": "warning",
+      "coveredNodes": {
+        "n8n-nodes-base.start": 1,
+        "n8n-nodes-base.googleDrive": 20,
+        "n8n-nodes-base.stickyNote": 2
+      },
+      "error": "Workflow contains new data that previously did not exist.",
+      "changes": {
+        "data": {
+          "executionData": {
+            "metadata__added": {}
+          }
+        }
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/tsconfig.json b/tsconfig.json
index d1a4a4d263..f37b693003 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -20,6 +20,6 @@
 		"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 9155075d9a..f0b0521623 100644
--- a/turbo.json
+++ b/turbo.json
@@ -13,9 +13,13 @@
 		"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 0000000000..ec031654d2
--- /dev/null
+++ b/vitest.workspace.ts
@@ -0,0 +1 @@
+export default ['packages/{design-system,editor-ui}'];