diff --git a/.github/workflows/engine-changed-files.yml b/.github/workflows/engine-changed-files.yml
new file mode 100644
index 000000000000..e35c43956d66
--- /dev/null
+++ b/.github/workflows/engine-changed-files.yml
@@ -0,0 +1,55 @@
+# This file is not auto-generated. Feel free to edit it.
+
+name: Engine Changed Files
+
+on:
+  workflow_call:
+    outputs:
+      all_changed_files:
+        description: "Returns all changed files"
+        value: ${{ jobs.engine-changed-files.outputs.all_changed_files }}
+      any_changed:
+        description: "Returns `true` when any of the filenames have changed"
+        value: ${{ jobs.engine-changed-files.outputs.any_changed }}
+
+jobs:
+  engine-changed-files:
+    runs-on: ubuntu-latest
+    name: Changed Files
+    outputs:
+      all_changed_files: ${{ steps.engine-changed-files.outputs.all_changed_files }}
+      any_changed: ${{ steps.engine-changed-files.outputs.any_changed }}
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 2
+      - name: Get changed files
+        id: engine-changed-files
+        uses: tj-actions/changed-files@v45
+        with:
+          files: |
+            distribution/**
+            engine/**
+            lib/**
+            project/**
+            std-bits/**
+            test/**
+            build.sbt
+            .cargo/**
+            Cargo.lock
+            Cargo.toml
+            rust-toolchain.toml
+            .github/workflows/engine-changed-files.yml
+            .github/workflows/engine-checks-optional.yml
+            .github/workflows/engine-checks.yml
+            .github/workflows/engine-pull-request.yml
+      - name: List all changed files
+        env:
+          ALL_CHANGED_FILES: ${{ steps.engine-changed-files.outputs.all_changed_files }}
+        run: |
+          if [[ "${{ steps.engine-changed-files.outputs.any_changed }}" == "true" ]]; then
+            echo "Files changed:"
+          fi
+          for file in ${ALL_CHANGED_FILES}; do
+            echo "$file"
+          done
diff --git a/.github/workflows/engine-nightly.yml b/.github/workflows/engine-checks-nightly.yml
similarity index 100%
rename from .github/workflows/engine-nightly.yml
rename to .github/workflows/engine-checks-nightly.yml
diff --git a/.github/workflows/engine-checks-optional.yml b/.github/workflows/engine-checks-optional.yml
new file mode 100644
index 000000000000..ad1d1eb8ea7a
--- /dev/null
+++ b/.github/workflows/engine-checks-optional.yml
@@ -0,0 +1,179 @@
+# This file is auto-generated. Do not edit it manually!
+# Edit the enso_build::ci_gen module instead and run `cargo run --package enso-build-ci-gen`.
+
+name: Engine Checks (Optional)
+on:
+  workflow_dispatch:
+    inputs:
+      clean_build_required:
+        description: Clean before and after the run.
+        required: false
+        type: boolean
+        default: false
+  workflow_call: {}
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}-engine-checks-optional
+  cancel-in-progress: ${{ github.ref != 'refs/heads/develop' }}
+jobs:
+  enso-build-ci-gen-job-ci-check-backend-graal-vm-ce-macos-amd64:
+    name: Engine (GraalVM CE) (macos, amd64)
+    runs-on:
+      - macos-13
+    continue-on-error: true
+    steps:
+      - if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent')
+        name: Installing wasm-pack
+        uses: jetli/wasm-pack-action@v0.4.0
+        with:
+          version: v0.12.1
+      - name: Expose Artifact API and context information.
+        uses: actions/github-script@v7
+        with:
+          script: "\n    core.exportVariable(\"ACTIONS_RUNTIME_TOKEN\", process.env[\"ACTIONS_RUNTIME_TOKEN\"])\n    core.exportVariable(\"ACTIONS_RUNTIME_URL\", process.env[\"ACTIONS_RUNTIME_URL\"])\n    core.exportVariable(\"GITHUB_RETENTION_DAYS\", process.env[\"GITHUB_RETENTION_DAYS\"])\n    console.log(context)\n    "
+      - name: Checking out the repository
+        uses: actions/checkout@v4
+        with:
+          clean: false
+          submodules: recursive
+      - name: Build Script Setup
+        run: ./run --help || (git clean -ffdx && ./run --help)
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - if: "(contains(github.event.pull_request.labels.*.name, 'CI: Clean build required') || inputs.clean_build_required)"
+        name: Clean before
+        run: ./run git-clean
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - run: ./run backend ci-check
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - if: failure() && runner.os == 'Windows'
+        name: List files if failed (Windows)
+        run: Get-ChildItem -Force -Recurse
+      - if: failure() && runner.os != 'Windows'
+        name: List files if failed (non-Windows)
+        run: ls -lAR
+      - if: "(always()) && (contains(github.event.pull_request.labels.*.name, 'CI: Clean build required') || inputs.clean_build_required)"
+        name: Clean after
+        run: ./run git-clean
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    env:
+      GRAAL_EDITION: GraalVM CE
+  enso-build-ci-gen-job-jvm-tests-graal-vm-ce-macos-amd64:
+    name: JVM Tests (GraalVM CE) (macos, amd64)
+    runs-on:
+      - macos-13
+    continue-on-error: true
+    steps:
+      - if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent')
+        name: Installing wasm-pack
+        uses: jetli/wasm-pack-action@v0.4.0
+        with:
+          version: v0.12.1
+      - name: Expose Artifact API and context information.
+        uses: actions/github-script@v7
+        with:
+          script: "\n    core.exportVariable(\"ACTIONS_RUNTIME_TOKEN\", process.env[\"ACTIONS_RUNTIME_TOKEN\"])\n    core.exportVariable(\"ACTIONS_RUNTIME_URL\", process.env[\"ACTIONS_RUNTIME_URL\"])\n    core.exportVariable(\"GITHUB_RETENTION_DAYS\", process.env[\"GITHUB_RETENTION_DAYS\"])\n    console.log(context)\n    "
+      - name: Checking out the repository
+        uses: actions/checkout@v4
+        with:
+          clean: false
+          submodules: recursive
+      - name: Build Script Setup
+        run: ./run --help || (git clean -ffdx && ./run --help)
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - if: "(contains(github.event.pull_request.labels.*.name, 'CI: Clean build required') || inputs.clean_build_required)"
+        name: Clean before
+        run: ./run git-clean
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - run: ./run backend test jvm
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - if: (success() || failure()) && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository)
+        name: Engine Test Reporter
+        uses: dorny/test-reporter@v1
+        with:
+          max-annotations: 50
+          name: Engine Tests Report (GraalVM CE, macos, amd64)
+          path: ${{ env.ENSO_TEST_JUNIT_DIR }}/*.xml
+          path-replace-backslashes: true
+          reporter: java-junit
+      - if: failure() && runner.os == 'Windows'
+        name: List files if failed (Windows)
+        run: Get-ChildItem -Force -Recurse
+      - if: failure() && runner.os != 'Windows'
+        name: List files if failed (non-Windows)
+        run: ls -lAR
+      - if: "(always()) && (contains(github.event.pull_request.labels.*.name, 'CI: Clean build required') || inputs.clean_build_required)"
+        name: Clean after
+        run: ./run git-clean
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    env:
+      GRAAL_EDITION: GraalVM CE
+    permissions:
+      checks: write
+  enso-build-ci-gen-job-standard-library-tests-graal-vm-ce-macos-amd64:
+    name: Standard Library Tests (GraalVM CE) (macos, amd64)
+    runs-on:
+      - macos-13
+    continue-on-error: true
+    steps:
+      - if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent')
+        name: Installing wasm-pack
+        uses: jetli/wasm-pack-action@v0.4.0
+        with:
+          version: v0.12.1
+      - name: Expose Artifact API and context information.
+        uses: actions/github-script@v7
+        with:
+          script: "\n    core.exportVariable(\"ACTIONS_RUNTIME_TOKEN\", process.env[\"ACTIONS_RUNTIME_TOKEN\"])\n    core.exportVariable(\"ACTIONS_RUNTIME_URL\", process.env[\"ACTIONS_RUNTIME_URL\"])\n    core.exportVariable(\"GITHUB_RETENTION_DAYS\", process.env[\"GITHUB_RETENTION_DAYS\"])\n    console.log(context)\n    "
+      - name: Checking out the repository
+        uses: actions/checkout@v4
+        with:
+          clean: false
+          submodules: recursive
+      - name: Build Script Setup
+        run: ./run --help || (git clean -ffdx && ./run --help)
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - if: "(contains(github.event.pull_request.labels.*.name, 'CI: Clean build required') || inputs.clean_build_required)"
+        name: Clean before
+        run: ./run git-clean
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - run: ./run backend test standard-library
+        env:
+          ENSO_LIB_S3_AWS_ACCESS_KEY_ID: ${{ secrets.ENSO_LIB_S3_AWS_ACCESS_KEY_ID }}
+          ENSO_LIB_S3_AWS_REGION: ${{ secrets.ENSO_LIB_S3_AWS_REGION }}
+          ENSO_LIB_S3_AWS_SECRET_ACCESS_KEY: ${{ secrets.ENSO_LIB_S3_AWS_SECRET_ACCESS_KEY }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - if: (success() || failure()) && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository)
+        name: Standard Library Test Reporter
+        uses: dorny/test-reporter@v1
+        with:
+          max-annotations: 50
+          name: Standard Library Tests Report (GraalVM CE, macos, amd64)
+          path: ${{ env.ENSO_TEST_JUNIT_DIR }}/*/*.xml
+          path-replace-backslashes: true
+          reporter: java-junit
+      - if: failure() && runner.os == 'Windows'
+        name: List files if failed (Windows)
+        run: Get-ChildItem -Force -Recurse
+      - if: failure() && runner.os != 'Windows'
+        name: List files if failed (non-Windows)
+        run: ls -lAR
+      - if: "(always()) && (contains(github.event.pull_request.labels.*.name, 'CI: Clean build required') || inputs.clean_build_required)"
+        name: Clean after
+        run: ./run git-clean
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    env:
+      GRAAL_EDITION: GraalVM CE
+    permissions:
+      checks: write
+env:
+  ENSO_BUILD_SKIP_VERSION_CHECK: "true"
diff --git a/.github/workflows/scala-new.yml b/.github/workflows/engine-checks.yml
similarity index 69%
rename from .github/workflows/scala-new.yml
rename to .github/workflows/engine-checks.yml
index 0615bdee35f0..80b81ed41535 100644
--- a/.github/workflows/scala-new.yml
+++ b/.github/workflows/engine-checks.yml
@@ -1,12 +1,8 @@
 # This file is auto-generated. Do not edit it manually!
 # Edit the enso_build::ci_gen module instead and run `cargo run --package enso-build-ci-gen`.
 
-name: Engine CI
+name: Engine Checks
 on:
-  push:
-    branches:
-      - develop
-  pull_request: {}
   workflow_dispatch:
     inputs:
       clean_build_required:
@@ -14,8 +10,9 @@ on:
         required: false
         type: boolean
         default: false
+  workflow_call: {}
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.ref }}-engine-checks
   cancel-in-progress: ${{ github.ref != 'refs/heads/develop' }}
 jobs:
   enso-build-ci-gen-job-ci-check-backend-graal-vm-ce-linux-amd64:
@@ -63,50 +60,6 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     env:
       GRAAL_EDITION: GraalVM CE
-  enso-build-ci-gen-job-ci-check-backend-graal-vm-ce-macos-amd64:
-    name: Engine (GraalVM CE) (macos, amd64)
-    runs-on:
-      - macos-13
-    steps:
-      - if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent')
-        name: Installing wasm-pack
-        uses: jetli/wasm-pack-action@v0.4.0
-        with:
-          version: v0.12.1
-      - name: Expose Artifact API and context information.
-        uses: actions/github-script@v7
-        with:
-          script: "\n    core.exportVariable(\"ACTIONS_RUNTIME_TOKEN\", process.env[\"ACTIONS_RUNTIME_TOKEN\"])\n    core.exportVariable(\"ACTIONS_RUNTIME_URL\", process.env[\"ACTIONS_RUNTIME_URL\"])\n    core.exportVariable(\"GITHUB_RETENTION_DAYS\", process.env[\"GITHUB_RETENTION_DAYS\"])\n    console.log(context)\n    "
-      - name: Checking out the repository
-        uses: actions/checkout@v4
-        with:
-          clean: false
-          submodules: recursive
-      - name: Build Script Setup
-        run: ./run --help || (git clean -ffdx && ./run --help)
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - if: "(contains(github.event.pull_request.labels.*.name, 'CI: Clean build required') || inputs.clean_build_required)"
-        name: Clean before
-        run: ./run git-clean
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - run: ./run backend ci-check
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - if: failure() && runner.os == 'Windows'
-        name: List files if failed (Windows)
-        run: Get-ChildItem -Force -Recurse
-      - if: failure() && runner.os != 'Windows'
-        name: List files if failed (non-Windows)
-        run: ls -lAR
-      - if: "(always()) && (contains(github.event.pull_request.labels.*.name, 'CI: Clean build required') || inputs.clean_build_required)"
-        name: Clean after
-        run: ./run git-clean
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    env:
-      GRAAL_EDITION: GraalVM CE
   enso-build-ci-gen-job-ci-check-backend-graal-vm-ce-windows-amd64:
     name: Engine (GraalVM CE) (windows, amd64)
     runs-on:
@@ -208,61 +161,6 @@ jobs:
       GRAAL_EDITION: GraalVM CE
     permissions:
       checks: write
-  enso-build-ci-gen-job-jvm-tests-graal-vm-ce-macos-amd64:
-    name: JVM Tests (GraalVM CE) (macos, amd64)
-    runs-on:
-      - macos-13
-    steps:
-      - if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent')
-        name: Installing wasm-pack
-        uses: jetli/wasm-pack-action@v0.4.0
-        with:
-          version: v0.12.1
-      - name: Expose Artifact API and context information.
-        uses: actions/github-script@v7
-        with:
-          script: "\n    core.exportVariable(\"ACTIONS_RUNTIME_TOKEN\", process.env[\"ACTIONS_RUNTIME_TOKEN\"])\n    core.exportVariable(\"ACTIONS_RUNTIME_URL\", process.env[\"ACTIONS_RUNTIME_URL\"])\n    core.exportVariable(\"GITHUB_RETENTION_DAYS\", process.env[\"GITHUB_RETENTION_DAYS\"])\n    console.log(context)\n    "
-      - name: Checking out the repository
-        uses: actions/checkout@v4
-        with:
-          clean: false
-          submodules: recursive
-      - name: Build Script Setup
-        run: ./run --help || (git clean -ffdx && ./run --help)
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - if: "(contains(github.event.pull_request.labels.*.name, 'CI: Clean build required') || inputs.clean_build_required)"
-        name: Clean before
-        run: ./run git-clean
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - run: ./run backend test jvm
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - if: (success() || failure()) && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository)
-        name: Engine Test Reporter
-        uses: dorny/test-reporter@v1
-        with:
-          max-annotations: 50
-          name: Engine Tests Report (GraalVM CE, macos, amd64)
-          path: ${{ env.ENSO_TEST_JUNIT_DIR }}/*.xml
-          path-replace-backslashes: true
-          reporter: java-junit
-      - if: failure() && runner.os == 'Windows'
-        name: List files if failed (Windows)
-        run: Get-ChildItem -Force -Recurse
-      - if: failure() && runner.os != 'Windows'
-        name: List files if failed (non-Windows)
-        run: ls -lAR
-      - if: "(always()) && (contains(github.event.pull_request.labels.*.name, 'CI: Clean build required') || inputs.clean_build_required)"
-        name: Clean after
-        run: ./run git-clean
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    env:
-      GRAAL_EDITION: GraalVM CE
-    permissions:
-      checks: write
   enso-build-ci-gen-job-jvm-tests-graal-vm-ce-windows-amd64:
     name: JVM Tests (GraalVM CE) (windows, amd64)
     runs-on:
@@ -378,64 +276,6 @@ jobs:
       GRAAL_EDITION: GraalVM CE
     permissions:
       checks: write
-  enso-build-ci-gen-job-standard-library-tests-graal-vm-ce-macos-amd64:
-    name: Standard Library Tests (GraalVM CE) (macos, amd64)
-    runs-on:
-      - macos-13
-    steps:
-      - if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent')
-        name: Installing wasm-pack
-        uses: jetli/wasm-pack-action@v0.4.0
-        with:
-          version: v0.12.1
-      - name: Expose Artifact API and context information.
-        uses: actions/github-script@v7
-        with:
-          script: "\n    core.exportVariable(\"ACTIONS_RUNTIME_TOKEN\", process.env[\"ACTIONS_RUNTIME_TOKEN\"])\n    core.exportVariable(\"ACTIONS_RUNTIME_URL\", process.env[\"ACTIONS_RUNTIME_URL\"])\n    core.exportVariable(\"GITHUB_RETENTION_DAYS\", process.env[\"GITHUB_RETENTION_DAYS\"])\n    console.log(context)\n    "
-      - name: Checking out the repository
-        uses: actions/checkout@v4
-        with:
-          clean: false
-          submodules: recursive
-      - name: Build Script Setup
-        run: ./run --help || (git clean -ffdx && ./run --help)
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - if: "(contains(github.event.pull_request.labels.*.name, 'CI: Clean build required') || inputs.clean_build_required)"
-        name: Clean before
-        run: ./run git-clean
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - run: ./run backend test standard-library
-        env:
-          ENSO_LIB_S3_AWS_ACCESS_KEY_ID: ${{ secrets.ENSO_LIB_S3_AWS_ACCESS_KEY_ID }}
-          ENSO_LIB_S3_AWS_REGION: ${{ secrets.ENSO_LIB_S3_AWS_REGION }}
-          ENSO_LIB_S3_AWS_SECRET_ACCESS_KEY: ${{ secrets.ENSO_LIB_S3_AWS_SECRET_ACCESS_KEY }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - if: (success() || failure()) && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository)
-        name: Standard Library Test Reporter
-        uses: dorny/test-reporter@v1
-        with:
-          max-annotations: 50
-          name: Standard Library Tests Report (GraalVM CE, macos, amd64)
-          path: ${{ env.ENSO_TEST_JUNIT_DIR }}/*/*.xml
-          path-replace-backslashes: true
-          reporter: java-junit
-      - if: failure() && runner.os == 'Windows'
-        name: List files if failed (Windows)
-        run: Get-ChildItem -Force -Recurse
-      - if: failure() && runner.os != 'Windows'
-        name: List files if failed (non-Windows)
-        run: ls -lAR
-      - if: "(always()) && (contains(github.event.pull_request.labels.*.name, 'CI: Clean build required') || inputs.clean_build_required)"
-        name: Clean after
-        run: ./run git-clean
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    env:
-      GRAAL_EDITION: GraalVM CE
-    permissions:
-      checks: write
   enso-build-ci-gen-job-standard-library-tests-graal-vm-ce-windows-amd64:
     name: Standard Library Tests (GraalVM CE) (windows, amd64)
     runs-on:
diff --git a/.github/workflows/engine-pull-request.yml b/.github/workflows/engine-pull-request.yml
new file mode 100644
index 000000000000..a886fedc149e
--- /dev/null
+++ b/.github/workflows/engine-pull-request.yml
@@ -0,0 +1,52 @@
+# This file is not auto-generated. Feel free to edit it.
+
+name: ✨ Engine
+
+on:
+  push:
+    branches:
+      - develop
+  pull_request:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}-engine-pull-request
+  cancel-in-progress: true
+
+permissions:
+  checks: write
+
+jobs:
+  engine-changed-files:
+    name: 🔍 Files Changed
+    uses: ./.github/workflows/engine-changed-files.yml
+    secrets: inherit
+
+  engine-checks:
+    name: ⚙️ Checks
+    uses: ./.github/workflows/engine-checks.yml
+    needs: [engine-changed-files]
+    if: needs.engine-changed-files.outputs.any_changed == 'true' || github.ref == 'refs/heads/develop'
+    secrets: inherit
+
+  engine-checks-optional:
+    name: ⚙️ Checks (Optional)
+    uses: ./.github/workflows/engine-checks-optional.yml
+    needs: [engine-changed-files]
+    if: needs.engine-changed-files.outputs.any_changed == 'true' || github.ref == 'refs/heads/develop'
+    secrets: inherit
+
+  required-checks:
+    name: Required Checks
+    runs-on: ubuntu-latest
+    needs: [engine-checks]
+    if: always()
+    steps:
+      - name: Checks Summary
+        run: |
+          echo "Engine Checks: ${{ needs.engine-checks.result }}"
+
+          if [[ "${{ needs.engine-checks.result }}" == "failure" ]]; then
+            exit 1
+          fi
+
+          echo "Success!"
diff --git a/.github/workflows/gui-changed-files.yml b/.github/workflows/gui-changed-files.yml
new file mode 100644
index 000000000000..d16036ae0093
--- /dev/null
+++ b/.github/workflows/gui-changed-files.yml
@@ -0,0 +1,57 @@
+# This file is not auto-generated. Feel free to edit it.
+
+name: GUI Changed Files
+
+on:
+  workflow_call:
+    outputs:
+      all_changed_files:
+        description: "Returns all changed files"
+        value: ${{ jobs.gui-changed-files.outputs.all_changed_files }}
+      any_changed:
+        description: "Returns `true` when any of the filenames have changed"
+        value: ${{ jobs.gui-changed-files.outputs.any_changed }}
+
+jobs:
+  gui-changed-files:
+    runs-on: ubuntu-latest
+    name: Changed Files
+    outputs:
+      all_changed_files: ${{ steps.gui-changed-files.outputs.all_changed_files }}
+      any_changed: ${{ steps.gui-changed-files.outputs.any_changed }}
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 2
+      - name: Get changed files
+        id: gui-changed-files
+        uses: tj-actions/changed-files@v45
+        with:
+          files: |
+            app/**
+            package.json
+            pnpm-lock.yaml
+            pnpm-workspace.yaml
+            eslint.config.js
+            .prettierrc.js
+            .prettierignore
+            vitest.workspace.ts
+            .github/workflows/gui-changed-files.yml
+            .github/workflows/gui-checks.yml
+            .github/workflows/gui-pull-request.yml
+            .github/workflows/storybook.yml
+          files_ignore: |
+            app/ide-desktop/**
+            app/gui/scripts/**
+            app/gui/.gitignore
+            .git-*
+      - name: List all changed files
+        env:
+          ALL_CHANGED_FILES: ${{ steps.gui-changed-files.outputs.all_changed_files }}
+        run: |
+          if [[ "${{ steps.gui-changed-files.outputs.any_changed }}" == "true" ]]; then
+            echo "Files changed:"
+          fi
+          for file in ${ALL_CHANGED_FILES}; do
+            echo "$file"
+          done
diff --git a/.github/workflows/gui-checks.yml b/.github/workflows/gui-checks.yml
index 5d1091df8457..730d49198748 100644
--- a/.github/workflows/gui-checks.yml
+++ b/.github/workflows/gui-checks.yml
@@ -1,3 +1,5 @@
+# This file is not auto-generated. Feel free to edit it.
+
 name: GUI Checks
 on: workflow_call
 
@@ -31,17 +33,6 @@ jobs:
           node-version-file: .node-version
           cache: "pnpm"
 
-      - uses: actions/cache/restore@v4
-        name: Download cache
-        id: cache
-        with:
-          path: |
-            **/.eslintcache
-            node_modules/.cache/prettier
-          key: ${{ runner.os }}-gui-${{ github.run_id }}
-          restore-keys: |
-            ${{ runner.os }}-gui
-
       - if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent')
         name: Installing wasm-pack
         uses: jetli/wasm-pack-action@v0.4.0
@@ -51,10 +42,15 @@ jobs:
       - name: 📦 Install dependencies
         run: pnpm install --frozen-lockfile
 
-      - name: 📝 Prettier
-        id: prettier
-        continue-on-error: true
-        run: pnpm run ci:prettier
+      - uses: actions/cache/restore@v4
+        name: Download cache
+        id: cache
+        with:
+          path: |
+            **/.eslintcache
+          key: ${{ runner.os }}-gui-${{ github.run_id }}
+          restore-keys: |
+            ${{ runner.os }}-gui
 
       # Next Tasks are depend on Typecheck, because we build libraries at this stage
       - name: 🧠 Typecheck
@@ -88,7 +84,6 @@ jobs:
       - name: ❌ Fail if any check failed
         if: always() && (steps.prettier.outcome == 'failure' || steps.lint.outcome == 'failure' || steps.typecheck.outcome == 'failure' || steps.unit-tests.outcome == 'failure')
         run: |
-          echo "Prettier outcome: ${{ steps.prettier.outcome }}"
           echo "Lint outcome: ${{ steps.lint.outcome }}"
           echo "Typecheck outcome: ${{ steps.typecheck.outcome }}"
           echo "Unit tests outcome: ${{ steps.unit-tests.outcome }}"
@@ -102,7 +97,6 @@ jobs:
           key: ${{ steps.cache.outputs.cache-primary-key }}
           path: |
             **/.eslintcache
-            node_modules/.cache/prettier
 
   playwright:
     name: 🎭 Playwright Tests
diff --git a/.github/workflows/gui-packaging-optional.yml b/.github/workflows/gui-packaging-optional.yml
new file mode 100644
index 000000000000..4f5ab0bfd79a
--- /dev/null
+++ b/.github/workflows/gui-packaging-optional.yml
@@ -0,0 +1,197 @@
+# This file is auto-generated. Do not edit it manually!
+# Edit the enso_build::ci_gen module instead and run `cargo run --package enso-build-ci-gen`.
+
+name: GUI Packaging (Optional)
+on:
+  workflow_dispatch:
+    inputs:
+      clean_build_required:
+        description: Clean before and after the run.
+        required: false
+        type: boolean
+        default: false
+  workflow_call: {}
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}-gui-packaging-optional
+  cancel-in-progress: ${{ github.ref != 'refs/heads/develop' }}
+jobs:
+  enso-build-ci-gen-job-build-backend-macos-amd64:
+    name: Build Backend (macos, amd64)
+    runs-on:
+      - macos-13
+    continue-on-error: true
+    steps:
+      - if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent')
+        name: Installing wasm-pack
+        uses: jetli/wasm-pack-action@v0.4.0
+        with:
+          version: v0.12.1
+      - name: Expose Artifact API and context information.
+        uses: actions/github-script@v7
+        with:
+          script: "\n    core.exportVariable(\"ACTIONS_RUNTIME_TOKEN\", process.env[\"ACTIONS_RUNTIME_TOKEN\"])\n    core.exportVariable(\"ACTIONS_RUNTIME_URL\", process.env[\"ACTIONS_RUNTIME_URL\"])\n    core.exportVariable(\"GITHUB_RETENTION_DAYS\", process.env[\"GITHUB_RETENTION_DAYS\"])\n    console.log(context)\n    "
+      - name: Checking out the repository
+        uses: actions/checkout@v4
+        with:
+          clean: false
+          submodules: recursive
+      - name: Build Script Setup
+        run: ./run --help || (git clean -ffdx && ./run --help)
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - if: "(contains(github.event.pull_request.labels.*.name, 'CI: Clean build required') || inputs.clean_build_required)"
+        name: Clean before
+        run: ./run git-clean
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - run: ./run backend get
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - if: failure() && runner.os == 'Windows'
+        name: List files if failed (Windows)
+        run: Get-ChildItem -Force -Recurse
+      - if: failure() && runner.os != 'Windows'
+        name: List files if failed (non-Windows)
+        run: ls -lAR
+      - if: "(always()) && (contains(github.event.pull_request.labels.*.name, 'CI: Clean build required') || inputs.clean_build_required)"
+        name: Clean after
+        run: ./run git-clean
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  enso-build-ci-gen-job-gui-build-macos-amd64:
+    name: GUI build (macos, amd64)
+    runs-on:
+      - macos-13
+    continue-on-error: true
+    steps:
+      - if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent')
+        name: Installing wasm-pack
+        uses: jetli/wasm-pack-action@v0.4.0
+        with:
+          version: v0.12.1
+      - name: Expose Artifact API and context information.
+        uses: actions/github-script@v7
+        with:
+          script: "\n    core.exportVariable(\"ACTIONS_RUNTIME_TOKEN\", process.env[\"ACTIONS_RUNTIME_TOKEN\"])\n    core.exportVariable(\"ACTIONS_RUNTIME_URL\", process.env[\"ACTIONS_RUNTIME_URL\"])\n    core.exportVariable(\"GITHUB_RETENTION_DAYS\", process.env[\"GITHUB_RETENTION_DAYS\"])\n    console.log(context)\n    "
+      - name: Checking out the repository
+        uses: actions/checkout@v4
+        with:
+          clean: false
+          submodules: recursive
+      - name: Build Script Setup
+        run: ./run --help || (git clean -ffdx && ./run --help)
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - if: "(contains(github.event.pull_request.labels.*.name, 'CI: Clean build required') || inputs.clean_build_required)"
+        name: Clean before
+        run: ./run git-clean
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - run: ./run gui build
+        env:
+          ENSO_CLOUD_API_URL: ${{ vars.ENSO_CLOUD_API_URL }}
+          ENSO_CLOUD_CHAT_URL: ${{ vars.ENSO_CLOUD_CHAT_URL }}
+          ENSO_CLOUD_COGNITO_DOMAIN: ${{ vars.ENSO_CLOUD_COGNITO_DOMAIN }}
+          ENSO_CLOUD_COGNITO_REGION: ${{ vars.ENSO_CLOUD_COGNITO_REGION }}
+          ENSO_CLOUD_COGNITO_USER_POOL_ID: ${{ vars.ENSO_CLOUD_COGNITO_USER_POOL_ID }}
+          ENSO_CLOUD_COGNITO_USER_POOL_WEB_CLIENT_ID: ${{ vars.ENSO_CLOUD_COGNITO_USER_POOL_WEB_CLIENT_ID }}
+          ENSO_CLOUD_ENVIRONMENT: ${{ vars.ENSO_CLOUD_ENVIRONMENT }}
+          ENSO_CLOUD_GOOGLE_ANALYTICS_TAG: ${{ vars.ENSO_CLOUD_GOOGLE_ANALYTICS_TAG }}
+          ENSO_CLOUD_SENTRY_DSN: ${{ vars.ENSO_CLOUD_SENTRY_DSN }}
+          ENSO_CLOUD_STRIPE_KEY: ${{ vars.ENSO_CLOUD_STRIPE_KEY }}
+          ENSO_IDE_AG_GRID_LICENSE_KEY: ${{ vars.ENSO_AG_GRID_LICENSE_KEY }}
+          ENSO_IDE_MAPBOX_API_TOKEN: ${{ vars.ENSO_MAPBOX_API_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - if: failure() && runner.os == 'Windows'
+        name: List files if failed (Windows)
+        run: Get-ChildItem -Force -Recurse
+      - if: failure() && runner.os != 'Windows'
+        name: List files if failed (non-Windows)
+        run: ls -lAR
+      - if: "(always()) && (contains(github.event.pull_request.labels.*.name, 'CI: Clean build required') || inputs.clean_build_required)"
+        name: Clean after
+        run: ./run git-clean
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  enso-build-ci-gen-job-package-ide-macos-amd64:
+    name: Package New IDE (macos, amd64)
+    needs:
+      - enso-build-ci-gen-job-build-backend-macos-amd64
+    runs-on:
+      - macos-13
+    continue-on-error: true
+    steps:
+      - if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent')
+        name: Installing wasm-pack
+        uses: jetli/wasm-pack-action@v0.4.0
+        with:
+          version: v0.12.1
+      - name: Expose Artifact API and context information.
+        uses: actions/github-script@v7
+        with:
+          script: "\n    core.exportVariable(\"ACTIONS_RUNTIME_TOKEN\", process.env[\"ACTIONS_RUNTIME_TOKEN\"])\n    core.exportVariable(\"ACTIONS_RUNTIME_URL\", process.env[\"ACTIONS_RUNTIME_URL\"])\n    core.exportVariable(\"GITHUB_RETENTION_DAYS\", process.env[\"GITHUB_RETENTION_DAYS\"])\n    console.log(context)\n    "
+      - name: Checking out the repository
+        uses: actions/checkout@v4
+        with:
+          clean: false
+          submodules: recursive
+      - name: Build Script Setup
+        run: ./run --help || (git clean -ffdx && ./run --help)
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - if: "(contains(github.event.pull_request.labels.*.name, 'CI: Clean build required') || inputs.clean_build_required)"
+        name: Clean before
+        run: ./run git-clean
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - run: ./run ide build --backend-source current-ci-run --gui-upload-artifact false
+        env:
+          APPLEID: ${{ secrets.APPLE_NOTARIZATION_USERNAME }}
+          APPLEIDPASS: ${{ secrets.APPLE_NOTARIZATION_PASSWORD }}
+          APPLETEAMID: ${{ secrets.APPLE_NOTARIZATION_TEAM_ID }}
+          CSC_FOR_PULL_REQUEST: "true"
+          CSC_IDENTITY_AUTO_DISCOVERY: "true"
+          CSC_KEY_PASSWORD: ${{ secrets.APPLE_CODE_SIGNING_CERT_PASSWORD }}
+          CSC_LINK: ${{ secrets.APPLE_CODE_SIGNING_CERT }}
+          ENSO_CLOUD_API_URL: ${{ vars.ENSO_CLOUD_API_URL }}
+          ENSO_CLOUD_CHAT_URL: ${{ vars.ENSO_CLOUD_CHAT_URL }}
+          ENSO_CLOUD_COGNITO_DOMAIN: ${{ vars.ENSO_CLOUD_COGNITO_DOMAIN }}
+          ENSO_CLOUD_COGNITO_REGION: ${{ vars.ENSO_CLOUD_COGNITO_REGION }}
+          ENSO_CLOUD_COGNITO_USER_POOL_ID: ${{ vars.ENSO_CLOUD_COGNITO_USER_POOL_ID }}
+          ENSO_CLOUD_COGNITO_USER_POOL_WEB_CLIENT_ID: ${{ vars.ENSO_CLOUD_COGNITO_USER_POOL_WEB_CLIENT_ID }}
+          ENSO_CLOUD_ENVIRONMENT: ${{ vars.ENSO_CLOUD_ENVIRONMENT }}
+          ENSO_CLOUD_GOOGLE_ANALYTICS_TAG: ${{ vars.ENSO_CLOUD_GOOGLE_ANALYTICS_TAG }}
+          ENSO_CLOUD_SENTRY_DSN: ${{ vars.ENSO_CLOUD_SENTRY_DSN }}
+          ENSO_CLOUD_STRIPE_KEY: ${{ vars.ENSO_CLOUD_STRIPE_KEY }}
+          ENSO_IDE_AG_GRID_LICENSE_KEY: ${{ vars.ENSO_AG_GRID_LICENSE_KEY }}
+          ENSO_IDE_MAPBOX_API_TOKEN: ${{ vars.ENSO_MAPBOX_API_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - run: corepack pnpm -r --filter enso exec playwright test --timeout 300000
+        env:
+          DEBUG: "pw:browser log:"
+          ENSO_TEST_USER: ${{ secrets.ENSO_CLOUD_TEST_ACCOUNT_USERNAME }}
+          ENSO_TEST_USER_PASSWORD: ${{ secrets.ENSO_CLOUD_TEST_ACCOUNT_PASSWORD }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - if: failure()
+        name: Upload Test Traces
+        uses: actions/upload-artifact@v4
+        with:
+          compression-level: 0
+          name: test-traces-macos-amd64
+          path: app/ide-desktop/client/test-traces
+      - run: rm $HOME/.enso/credentials
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - if: failure() && runner.os == 'Windows'
+        name: List files if failed (Windows)
+        run: Get-ChildItem -Force -Recurse
+      - if: failure() && runner.os != 'Windows'
+        name: List files if failed (non-Windows)
+        run: ls -lAR
+      - if: "(always()) && (contains(github.event.pull_request.labels.*.name, 'CI: Clean build required') || inputs.clean_build_required)"
+        name: Clean after
+        run: ./run git-clean
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+env:
+  ENSO_BUILD_SKIP_VERSION_CHECK: "true"
diff --git a/.github/workflows/gui-packaging-pull-request.yml b/.github/workflows/gui-packaging-pull-request.yml
new file mode 100644
index 000000000000..c379bb18b3fb
--- /dev/null
+++ b/.github/workflows/gui-packaging-pull-request.yml
@@ -0,0 +1,54 @@
+# This file is not auto-generated. Feel free to edit it.
+
+name: ✨ GUI Packaging
+
+on:
+  push:
+    branches:
+      - develop
+  pull_request:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}-gui-packaging-pull-request
+  cancel-in-progress: true
+
+jobs:
+  gui-changed-files:
+    name: 🔍 GUI Files Changed
+    uses: ./.github/workflows/gui-changed-files.yml
+    secrets: inherit
+
+  engine-changed-files:
+    name: 🔍 Engine Files Changed
+    uses: ./.github/workflows/engine-changed-files.yml
+    secrets: inherit
+
+  gui-packaging:
+    name: 📦 Package
+    uses: ./.github/workflows/gui-packaging.yml
+    needs: [gui-changed-files, engine-changed-files]
+    if: needs.gui-changed-files.outputs.any_changed == 'true' || needs.engine-changed-files.outputs.any_changed == 'true' || github.ref == 'refs/heads/develop'
+    secrets: inherit
+
+  gui-packaging-optional:
+    name: 📦 Package (Optional)
+    uses: ./.github/workflows/gui-packaging-optional.yml
+    needs: [gui-changed-files, engine-changed-files]
+    if: needs.gui-changed-files.outputs.any_changed == 'true' || needs.engine-changed-files.outputs.any_changed == 'true' || github.ref == 'refs/heads/develop'
+    secrets: inherit
+
+  required-checks:
+    name: Required Checks
+    runs-on: ubuntu-latest
+    needs: [gui-packaging]
+    if: always()
+    steps:
+      - name: Checks Summary
+        run: |
+          echo "GUI Packaging: ${{ needs.gui-packaging.result }}"
+
+          if [[ "${{ needs.gui-packaging.result }}" == "failure" ]]; then
+            exit 1
+          fi
+
+          echo "Success!"
diff --git a/.github/workflows/gui.yml b/.github/workflows/gui-packaging.yml
similarity index 66%
rename from .github/workflows/gui.yml
rename to .github/workflows/gui-packaging.yml
index c20b8cbca980..52fcced5cb4e 100644
--- a/.github/workflows/gui.yml
+++ b/.github/workflows/gui-packaging.yml
@@ -3,10 +3,6 @@
 
 name: GUI Packaging
 on:
-  push:
-    branches:
-      - develop
-  pull_request: {}
   workflow_dispatch:
     inputs:
       clean_build_required:
@@ -14,8 +10,9 @@ on:
         required: false
         type: boolean
         default: false
+  workflow_call: {}
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.ref }}-gui-packaging
   cancel-in-progress: ${{ github.ref != 'refs/heads/develop' }}
 jobs:
   enso-build-ci-gen-job-build-backend-linux-amd64:
@@ -61,48 +58,6 @@ jobs:
         run: ./run git-clean
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  enso-build-ci-gen-job-build-backend-macos-amd64:
-    name: Build Backend (macos, amd64)
-    runs-on:
-      - macos-13
-    steps:
-      - if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent')
-        name: Installing wasm-pack
-        uses: jetli/wasm-pack-action@v0.4.0
-        with:
-          version: v0.12.1
-      - name: Expose Artifact API and context information.
-        uses: actions/github-script@v7
-        with:
-          script: "\n    core.exportVariable(\"ACTIONS_RUNTIME_TOKEN\", process.env[\"ACTIONS_RUNTIME_TOKEN\"])\n    core.exportVariable(\"ACTIONS_RUNTIME_URL\", process.env[\"ACTIONS_RUNTIME_URL\"])\n    core.exportVariable(\"GITHUB_RETENTION_DAYS\", process.env[\"GITHUB_RETENTION_DAYS\"])\n    console.log(context)\n    "
-      - name: Checking out the repository
-        uses: actions/checkout@v4
-        with:
-          clean: false
-          submodules: recursive
-      - name: Build Script Setup
-        run: ./run --help || (git clean -ffdx && ./run --help)
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - if: "(contains(github.event.pull_request.labels.*.name, 'CI: Clean build required') || inputs.clean_build_required)"
-        name: Clean before
-        run: ./run git-clean
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - run: ./run backend get
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - if: failure() && runner.os == 'Windows'
-        name: List files if failed (Windows)
-        run: Get-ChildItem -Force -Recurse
-      - if: failure() && runner.os != 'Windows'
-        name: List files if failed (non-Windows)
-        run: ls -lAR
-      - if: "(always()) && (contains(github.event.pull_request.labels.*.name, 'CI: Clean build required') || inputs.clean_build_required)"
-        name: Clean after
-        run: ./run git-clean
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   enso-build-ci-gen-job-build-backend-windows-amd64:
     name: Build Backend (windows, amd64)
     runs-on:
@@ -201,60 +156,6 @@ jobs:
         run: ./run git-clean
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  enso-build-ci-gen-job-gui-build-macos-amd64:
-    name: GUI build (macos, amd64)
-    runs-on:
-      - macos-13
-    steps:
-      - if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent')
-        name: Installing wasm-pack
-        uses: jetli/wasm-pack-action@v0.4.0
-        with:
-          version: v0.12.1
-      - name: Expose Artifact API and context information.
-        uses: actions/github-script@v7
-        with:
-          script: "\n    core.exportVariable(\"ACTIONS_RUNTIME_TOKEN\", process.env[\"ACTIONS_RUNTIME_TOKEN\"])\n    core.exportVariable(\"ACTIONS_RUNTIME_URL\", process.env[\"ACTIONS_RUNTIME_URL\"])\n    core.exportVariable(\"GITHUB_RETENTION_DAYS\", process.env[\"GITHUB_RETENTION_DAYS\"])\n    console.log(context)\n    "
-      - name: Checking out the repository
-        uses: actions/checkout@v4
-        with:
-          clean: false
-          submodules: recursive
-      - name: Build Script Setup
-        run: ./run --help || (git clean -ffdx && ./run --help)
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - if: "(contains(github.event.pull_request.labels.*.name, 'CI: Clean build required') || inputs.clean_build_required)"
-        name: Clean before
-        run: ./run git-clean
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - run: ./run gui build
-        env:
-          ENSO_CLOUD_API_URL: ${{ vars.ENSO_CLOUD_API_URL }}
-          ENSO_CLOUD_CHAT_URL: ${{ vars.ENSO_CLOUD_CHAT_URL }}
-          ENSO_CLOUD_COGNITO_DOMAIN: ${{ vars.ENSO_CLOUD_COGNITO_DOMAIN }}
-          ENSO_CLOUD_COGNITO_REGION: ${{ vars.ENSO_CLOUD_COGNITO_REGION }}
-          ENSO_CLOUD_COGNITO_USER_POOL_ID: ${{ vars.ENSO_CLOUD_COGNITO_USER_POOL_ID }}
-          ENSO_CLOUD_COGNITO_USER_POOL_WEB_CLIENT_ID: ${{ vars.ENSO_CLOUD_COGNITO_USER_POOL_WEB_CLIENT_ID }}
-          ENSO_CLOUD_ENVIRONMENT: ${{ vars.ENSO_CLOUD_ENVIRONMENT }}
-          ENSO_CLOUD_GOOGLE_ANALYTICS_TAG: ${{ vars.ENSO_CLOUD_GOOGLE_ANALYTICS_TAG }}
-          ENSO_CLOUD_SENTRY_DSN: ${{ vars.ENSO_CLOUD_SENTRY_DSN }}
-          ENSO_CLOUD_STRIPE_KEY: ${{ vars.ENSO_CLOUD_STRIPE_KEY }}
-          ENSO_IDE_AG_GRID_LICENSE_KEY: ${{ vars.ENSO_AG_GRID_LICENSE_KEY }}
-          ENSO_IDE_MAPBOX_API_TOKEN: ${{ vars.ENSO_MAPBOX_API_TOKEN }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - if: failure() && runner.os == 'Windows'
-        name: List files if failed (Windows)
-        run: Get-ChildItem -Force -Recurse
-      - if: failure() && runner.os != 'Windows'
-        name: List files if failed (non-Windows)
-        run: ls -lAR
-      - if: "(always()) && (contains(github.event.pull_request.labels.*.name, 'CI: Clean build required') || inputs.clean_build_required)"
-        name: Clean after
-        run: ./run git-clean
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   enso-build-ci-gen-job-gui-build-windows-amd64:
     name: GUI build (windows, amd64)
     runs-on:
@@ -384,85 +285,6 @@ jobs:
         run: ./run git-clean
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  enso-build-ci-gen-job-package-ide-macos-amd64:
-    name: Package New IDE (macos, amd64)
-    needs:
-      - enso-build-ci-gen-job-build-backend-macos-amd64
-    runs-on:
-      - macos-13
-    steps:
-      - if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent')
-        name: Installing wasm-pack
-        uses: jetli/wasm-pack-action@v0.4.0
-        with:
-          version: v0.12.1
-      - name: Expose Artifact API and context information.
-        uses: actions/github-script@v7
-        with:
-          script: "\n    core.exportVariable(\"ACTIONS_RUNTIME_TOKEN\", process.env[\"ACTIONS_RUNTIME_TOKEN\"])\n    core.exportVariable(\"ACTIONS_RUNTIME_URL\", process.env[\"ACTIONS_RUNTIME_URL\"])\n    core.exportVariable(\"GITHUB_RETENTION_DAYS\", process.env[\"GITHUB_RETENTION_DAYS\"])\n    console.log(context)\n    "
-      - name: Checking out the repository
-        uses: actions/checkout@v4
-        with:
-          clean: false
-          submodules: recursive
-      - name: Build Script Setup
-        run: ./run --help || (git clean -ffdx && ./run --help)
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - if: "(contains(github.event.pull_request.labels.*.name, 'CI: Clean build required') || inputs.clean_build_required)"
-        name: Clean before
-        run: ./run git-clean
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - run: ./run ide build --backend-source current-ci-run --gui-upload-artifact false
-        env:
-          APPLEID: ${{ secrets.APPLE_NOTARIZATION_USERNAME }}
-          APPLEIDPASS: ${{ secrets.APPLE_NOTARIZATION_PASSWORD }}
-          APPLETEAMID: ${{ secrets.APPLE_NOTARIZATION_TEAM_ID }}
-          CSC_FOR_PULL_REQUEST: "true"
-          CSC_IDENTITY_AUTO_DISCOVERY: "true"
-          CSC_KEY_PASSWORD: ${{ secrets.APPLE_CODE_SIGNING_CERT_PASSWORD }}
-          CSC_LINK: ${{ secrets.APPLE_CODE_SIGNING_CERT }}
-          ENSO_CLOUD_API_URL: ${{ vars.ENSO_CLOUD_API_URL }}
-          ENSO_CLOUD_CHAT_URL: ${{ vars.ENSO_CLOUD_CHAT_URL }}
-          ENSO_CLOUD_COGNITO_DOMAIN: ${{ vars.ENSO_CLOUD_COGNITO_DOMAIN }}
-          ENSO_CLOUD_COGNITO_REGION: ${{ vars.ENSO_CLOUD_COGNITO_REGION }}
-          ENSO_CLOUD_COGNITO_USER_POOL_ID: ${{ vars.ENSO_CLOUD_COGNITO_USER_POOL_ID }}
-          ENSO_CLOUD_COGNITO_USER_POOL_WEB_CLIENT_ID: ${{ vars.ENSO_CLOUD_COGNITO_USER_POOL_WEB_CLIENT_ID }}
-          ENSO_CLOUD_ENVIRONMENT: ${{ vars.ENSO_CLOUD_ENVIRONMENT }}
-          ENSO_CLOUD_GOOGLE_ANALYTICS_TAG: ${{ vars.ENSO_CLOUD_GOOGLE_ANALYTICS_TAG }}
-          ENSO_CLOUD_SENTRY_DSN: ${{ vars.ENSO_CLOUD_SENTRY_DSN }}
-          ENSO_CLOUD_STRIPE_KEY: ${{ vars.ENSO_CLOUD_STRIPE_KEY }}
-          ENSO_IDE_AG_GRID_LICENSE_KEY: ${{ vars.ENSO_AG_GRID_LICENSE_KEY }}
-          ENSO_IDE_MAPBOX_API_TOKEN: ${{ vars.ENSO_MAPBOX_API_TOKEN }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - run: corepack pnpm -r --filter enso exec playwright test --timeout 300000
-        env:
-          DEBUG: "pw:browser log:"
-          ENSO_TEST_USER: ${{ secrets.ENSO_CLOUD_TEST_ACCOUNT_USERNAME }}
-          ENSO_TEST_USER_PASSWORD: ${{ secrets.ENSO_CLOUD_TEST_ACCOUNT_PASSWORD }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - if: failure()
-        name: Upload Test Traces
-        uses: actions/upload-artifact@v4
-        with:
-          compression-level: 0
-          name: test-traces-macos-amd64
-          path: app/ide-desktop/client/test-traces
-      - run: rm $HOME/.enso/credentials
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - if: failure() && runner.os == 'Windows'
-        name: List files if failed (Windows)
-        run: Get-ChildItem -Force -Recurse
-      - if: failure() && runner.os != 'Windows'
-        name: List files if failed (non-Windows)
-        run: ls -lAR
-      - if: "(always()) && (contains(github.event.pull_request.labels.*.name, 'CI: Clean build required') || inputs.clean_build_required)"
-        name: Clean after
-        run: ./run git-clean
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   enso-build-ci-gen-job-package-ide-windows-amd64:
     name: Package New IDE (windows, amd64)
     needs:
diff --git a/.github/workflows/gui-pull-request.yml b/.github/workflows/gui-pull-request.yml
index 650f001d2279..36d7f77faf93 100644
--- a/.github/workflows/gui-pull-request.yml
+++ b/.github/workflows/gui-pull-request.yml
@@ -1,6 +1,6 @@
 # This file is not auto-generated. Feel free to edit it.
 
-name: ✨ GUI Pull Request
+name: ✨ GUI
 
 on:
   push:
@@ -9,7 +9,7 @@ on:
   pull_request:
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.ref }}-gui-pull-request
   cancel-in-progress: true
 
 permissions:
@@ -20,73 +20,85 @@ permissions:
   checks: write
 
 jobs:
-  changed-files:
+  gui-changed-files:
+    name: 🔍 Files Changed
+    uses: ./.github/workflows/gui-changed-files.yml
+    secrets: inherit
+
+  prettier:
+    name: 🧹 Prettier
     runs-on: ubuntu-latest
-    name: 🔍 GUI files changed
-    outputs:
-      all_changed_files: ${{ steps.changed-files.outputs.all_changed_files }}
-      any_changed: ${{ steps.changed-files.outputs.any_changed }}
     steps:
       - uses: actions/checkout@v4
+      - name: 📦 Setup pnpm
+        uses: pnpm/action-setup@v4
+      - uses: actions/setup-node@v4
+        name: ⎔ Setup Node
         with:
-          fetch-depth: 2
-      - name: Get changed files
-        id: changed-files
-        uses: tj-actions/changed-files@v44
+          node-version-file: .node-version
+          cache: "pnpm"
+      - if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent')
+        name: Installing wasm-pack
+        uses: jetli/wasm-pack-action@v0.4.0
         with:
-          files: |
-            app/**
-            package.json
-            pnpm-lock.yaml
-            pnpm-workspace.yaml
-            eslint.config.js
-            .prettierrc.js
-            .prettierignore
-            vitest.workspace.ts
-            .github/workflows/gui*
-          files_ignore: |
-            app/ide-desktop/**
-            app/gui/scripts/**
-            app/gui/.gitignore
-            .git-*
-
-      - name: List all changed files
-        env:
-          ALL_CHANGED_FILES: ${{ steps.changed-files.outputs.all_changed_files }}
-        run: |
-          for file in ${ALL_CHANGED_FILES}; do
-            echo "$file was changed"
-          done
+          version: v0.12.1
+      - name: 📦 Install dependencies
+        run: pnpm install --frozen-lockfile --ignore-scripts
+      - uses: actions/cache/restore@v4
+        name: Download cache
+        id: cache
+        with:
+          path: |
+            node_modules/.cache/prettier
+          key: ${{ runner.os }}-gui-${{ github.run_id }}
+          restore-keys: |
+            ${{ runner.os }}-gui
+      - name: Run prettier
+        run: pnpm run ci:prettier
+      - name: 💾 Save cache
+        uses: actions/cache/save@v4
+        if: always() && steps.cache.outputs.cache-hit != 'true'
+        id: save-cache
+        with:
+          key: ${{ steps.cache.outputs.cache-primary-key }}
+          path: |
+            node_modules/.cache/prettier
 
-  checks:
+  gui-checks:
     name: 🧰 Checks
     uses: ./.github/workflows/gui-checks.yml
-    needs: [changed-files]
-    if: ${{ needs.changed-files.outputs.any_changed == 'true' }}
+    needs: [gui-changed-files]
+    if: needs.gui-changed-files.outputs.any_changed == 'true' || github.ref == 'refs/heads/develop'
     secrets: inherit
 
   storybook:
     name: 📚 Deploy Storybook
     uses: ./.github/workflows/storybook.yml
-    needs: [changed-files]
-    if: ${{ needs.changed-files.outputs.any_changed == 'true' }}
+    needs: [gui-changed-files]
+    if: needs.gui-changed-files.outputs.any_changed == 'true' || github.ref == 'refs/heads/develop'
     secrets: inherit
 
-  # This job is used to report success if the needed jobs were successful.
-  # This is a workaround to make optional jobs required if they run
-  report-success:
-    name: GUI Checks Success or Skipped
+  required-checks:
+    name: Required Checks
     runs-on: ubuntu-latest
-    needs: [checks, storybook]
+    needs: [prettier, gui-checks, storybook]
     if: always()
     steps:
-      - name: Report success
+      - name: Checks Summary
         run: |
-          echo "Checks: ${{ needs.checks.result }}"
+          echo "Prettier: ${{ needs.prettier.result }}"
+          echo "GUI Checks: ${{ needs.gui-checks.result }}"
           echo "Storybook: ${{ needs.storybook.result }}"
 
-          if [[ "${{ needs.checks.result }}" == "failure" || "${{ needs.storybook.result }}" == "failure" ]]; then
-            exit 1
-          fi
+          declare -a checks
+          checks+=("${{ needs.prettier.result }}")
+          checks+=("${{ needs.gui-checks.result }}")
+          checks+=("${{ needs.storybook.result }}")
+
+          for result in "${checks[@]}"; do
+            if [[ "$result" == "failure" ]]; then
+              exit 1
+            fi
+          done
 
           echo "Success!"
diff --git a/.github/workflows/shader-tools.yml b/.github/workflows/shader-tools.yml
deleted file mode 100644
index 4f9250871d5b..000000000000
--- a/.github/workflows/shader-tools.yml
+++ /dev/null
@@ -1,105 +0,0 @@
-# This file is auto-generated. Do not edit it manually!
-# Edit the build/shader-tools/src/ci.rs module instead and run `cargo run --package enso-build-ci-gen`.
-
-name: Package Tools
-on:
-  workflow_dispatch: {}
-jobs:
-  run-create-linux-latest:
-    name: Run create (LinuxLatest)
-    runs-on:
-      - ubuntu-latest
-    steps:
-      - name: Checking out the repository
-        uses: actions/checkout@v4
-        with:
-          clean: false
-          submodules: recursive
-      - id: step_0
-        run: cargo run --package enso-build-shader-tools --bin create
-        env:
-          GITHUB_TOKEN: ${{ secrets.CI_PRIVATE_TOKEN }}
-    outputs:
-      ENSO_RELEASE_ID: ${{ steps.step_0.outputs.ENSO_RELEASE_ID }}
-    timeout-minutes: 360
-  run-package-linux-latest:
-    name: Run package (LinuxLatest)
-    needs:
-      - run-create-linux-latest
-    runs-on:
-      - ubuntu-latest
-    steps:
-      - name: Checking out the repository
-        uses: actions/checkout@v4
-        with:
-          clean: false
-          submodules: recursive
-      - id: step_1
-        run: cargo run --package enso-build-shader-tools --bin package
-        env:
-          GITHUB_TOKEN: ${{ secrets.CI_PRIVATE_TOKEN }}
-    env:
-      ENSO_RELEASE_ID: ${{ needs.run-create-linux-latest.outputs.ENSO_RELEASE_ID }}
-    timeout-minutes: 360
-  run-package-mac-os-latest:
-    name: Run package (MacOSLatest)
-    needs:
-      - run-create-linux-latest
-    runs-on:
-      - macos-latest
-    steps:
-      - name: Checking out the repository
-        uses: actions/checkout@v4
-        with:
-          clean: false
-          submodules: recursive
-      - id: step_3
-        run: cargo run --package enso-build-shader-tools --bin package
-        env:
-          GITHUB_TOKEN: ${{ secrets.CI_PRIVATE_TOKEN }}
-    env:
-      ENSO_RELEASE_ID: ${{ needs.run-create-linux-latest.outputs.ENSO_RELEASE_ID }}
-    timeout-minutes: 360
-  run-package-windows-latest:
-    name: Run package (WindowsLatest)
-    needs:
-      - run-create-linux-latest
-    runs-on:
-      - windows-latest
-    steps:
-      - name: Checking out the repository
-        uses: actions/checkout@v4
-        with:
-          clean: false
-          submodules: recursive
-      - id: step_2
-        run: cargo run --package enso-build-shader-tools --bin package
-        env:
-          GITHUB_TOKEN: ${{ secrets.CI_PRIVATE_TOKEN }}
-    env:
-      ENSO_RELEASE_ID: ${{ needs.run-create-linux-latest.outputs.ENSO_RELEASE_ID }}
-    timeout-minutes: 360
-  run-publish-linux-latest:
-    name: Run publish (LinuxLatest)
-    needs:
-      - run-create-linux-latest
-      - run-package-linux-latest
-      - run-package-mac-os-latest
-      - run-package-windows-latest
-    runs-on:
-      - ubuntu-latest
-    steps:
-      - name: Checking out the repository
-        uses: actions/checkout@v4
-        with:
-          clean: false
-          submodules: recursive
-      - id: step_4
-        run: cargo run --package enso-build-shader-tools --bin publish
-        env:
-          GITHUB_TOKEN: ${{ secrets.CI_PRIVATE_TOKEN }}
-    env:
-      ENSO_RELEASE_ID: ${{ needs.run-create-linux-latest.outputs.ENSO_RELEASE_ID }}
-    timeout-minutes: 360
-env:
-  ENSO_BUILD_SKIP_VERSION_CHECK: "true"
diff --git a/.github/workflows/wasm-changed-files.yml b/.github/workflows/wasm-changed-files.yml
new file mode 100644
index 000000000000..fdbf1aa2b345
--- /dev/null
+++ b/.github/workflows/wasm-changed-files.yml
@@ -0,0 +1,51 @@
+# This file is not auto-generated. Feel free to edit it.
+
+name: WASM Changed Files
+
+on:
+  workflow_call:
+    outputs:
+      all_changed_files:
+        description: "Returns all changed files"
+        value: ${{ jobs.wasm-changed-files.outputs.all_changed_files }}
+      any_changed:
+        description: "Returns `true` when any of the filenames have changed"
+        value: ${{ jobs.wasm-changed-files.outputs.any_changed }}
+
+jobs:
+  wasm-changed-files:
+    runs-on: ubuntu-latest
+    name: Changed Files
+    outputs:
+      all_changed_files: ${{ steps.wasm-changed-files.outputs.all_changed_files }}
+      any_changed: ${{ steps.wasm-changed-files.outputs.any_changed }}
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 2
+      - name: Get changed files
+        id: wasm-changed-files
+        uses: tj-actions/changed-files@v45
+        with:
+          files: |
+            .cargo/**
+            app/rust-ffi/**
+            build/**
+            lib/rust/**
+            tools/language-server/logstat/**
+            tools/language-server/wstest/**
+            Cargo.lock
+            Cargo.toml
+            rust-toolchain.toml
+            rustfmt.toml
+            .github/workflows/wasm*
+      - name: List all changed files
+        env:
+          ALL_CHANGED_FILES: ${{ steps.wasm-changed-files.outputs.all_changed_files }}
+        run: |
+          if [[ "${{ steps.wasm-changed-files.outputs.any_changed }}" == "true" ]]; then
+            echo "Files changed:"
+          fi
+          for file in ${ALL_CHANGED_FILES}; do
+            echo "$file"
+          done
diff --git a/.github/workflows/gui-tests.yml b/.github/workflows/wasm-checks.yml
similarity index 93%
rename from .github/workflows/gui-tests.yml
rename to .github/workflows/wasm-checks.yml
index 4abe8f1d23f3..246f8bb97305 100644
--- a/.github/workflows/gui-tests.yml
+++ b/.github/workflows/wasm-checks.yml
@@ -1,12 +1,8 @@
 # This file is auto-generated. Do not edit it manually!
 # Edit the enso_build::ci_gen module instead and run `cargo run --package enso-build-ci-gen`.
 
-name: GUI Check
+name: WASM Checks
 on:
-  push:
-    branches:
-      - develop
-  pull_request: {}
   workflow_dispatch:
     inputs:
       clean_build_required:
@@ -14,19 +10,11 @@ on:
         required: false
         type: boolean
         default: false
+  workflow_call: {}
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}-wasm-checks
+  cancel-in-progress: ${{ github.ref != 'refs/heads/develop' }}
 jobs:
-  enso-build-ci-gen-job-cancel-workflow-linux-amd64:
-    name: Cancel Previous Runs
-    if: github.ref != 'refs/heads/develop'
-    runs-on:
-      - ubuntu-latest
-    steps:
-      - name: Cancel Previous Runs
-        uses: styfle/cancel-workflow-action@0.12.1
-        with:
-          access_token: ${{ github.token }}
-    permissions:
-      actions: write
   enso-build-ci-gen-job-lint-linux-amd64:
     name: Lint (linux, amd64)
     runs-on:
diff --git a/.github/workflows/wasm-pull-request.yml b/.github/workflows/wasm-pull-request.yml
new file mode 100644
index 000000000000..16aecc6559f5
--- /dev/null
+++ b/.github/workflows/wasm-pull-request.yml
@@ -0,0 +1,42 @@
+# This file is not auto-generated. Feel free to edit it.
+
+name: ✨ WASM
+
+on:
+  push:
+    branches:
+      - develop
+  pull_request:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}-wasm-pull-request
+  cancel-in-progress: true
+
+jobs:
+  wasm-changed-files:
+    name: 🔍 Files Changed
+    uses: ./.github/workflows/wasm-changed-files.yml
+    secrets: inherit
+
+  wasm-checks:
+    name: 🦀 Checks
+    uses: ./.github/workflows/wasm-checks.yml
+    needs: [wasm-changed-files]
+    if: needs.wasm-changed-files.outputs.any_changed == 'true' || github.ref == 'refs/heads/develop'
+    secrets: inherit
+
+  required-checks:
+    name: Required Checks
+    runs-on: ubuntu-latest
+    needs: [wasm-checks]
+    if: always()
+    steps:
+      - name: Checks Summary
+        run: |
+          echo "WASM Checks: ${{ needs.wasm-checks.result }}"
+
+          if [[ "${{ needs.wasm-checks.result }}" == "failure" ]]; then
+            exit 1
+          fi
+
+          echo "Success!"
diff --git a/.prettierignore b/.prettierignore
index 709537c7f4b2..41d9adc6f8bc 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -16,7 +16,6 @@ distribution/lib/Standard/*/*/manifest.yaml
 distribution/lib/Standard/*/*/polyglot
 distribution/lib/Standard/*/*/THIRD-PARTY
 distribution/docs-js
-docs/**/*.md
 
 built-distribution/
 THIRD-PARTY
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4df253fba6e9..b1e53b92c712 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # Next Next Release
 
+#### Enso IDE
+
+- [ENSO_IDE_MAPBOX_API_TOKEN environment variable should be provided to enable
+  GeoMap visualization][11889].
+- [Round ‘Add component’ button under the component menu replaced by a small
+  button protruding from the output port.][11836].
+
+[11889]: https://github.com/enso-org/enso/pull/11889
+[11836]: https://github.com/enso-org/enso/pull/11836
+
 #### Enso Language & Runtime
 
 - [Intersection types & type checks][11600]
@@ -120,6 +130,7 @@
 - [Added `Table.input` allowing creation of typed tables from vectors of data,
   including auto parsing text columns.][11562]
 - [Enhance Managed_Resource to allow implementation of in-memory caches][11577]
+- [Added `add_group_number` to the in-memory database.[11818]
 - [The reload button clears the HTTP cache.][11673]
 
 [11235]: https://github.com/enso-org/enso/pull/11235
@@ -129,6 +140,7 @@
 [11490]: https://github.com/enso-org/enso/pull/11490
 [11562]: https://github.com/enso-org/enso/pull/11562
 [11577]: https://github.com/enso-org/enso/pull/11577
+[11818]: https://github.com/enso-org/enso/pull/11818
 [11673]: https://github.com/enso-org/enso/pull/11673
 
 #### Enso Language & Runtime
diff --git a/app/gui/env.d.ts b/app/gui/env.d.ts
index f7095e04d189..2babbb394e40 100644
--- a/app/gui/env.d.ts
+++ b/app/gui/env.d.ts
@@ -175,6 +175,7 @@ declare global {
     readonly projectManagementApi?: ProjectManagementApi
     readonly fileBrowserApi?: FileBrowserApi
     readonly versionInfo?: VersionInfo
+    readonly mapBoxApiToken?: () => string
     toggleDevtools: () => void
     /**
      * If set to `true`, animations will be disabled.
diff --git a/app/gui/integration-test/project-view/actions.ts b/app/gui/integration-test/project-view/actions.ts
index 96743db1f575..00522b0410aa 100644
--- a/app/gui/integration-test/project-view/actions.ts
+++ b/app/gui/integration-test/project-view/actions.ts
@@ -66,9 +66,9 @@ export async function dragNodeByBinding(page: Page, nodeBinding: string, x: numb
 }
 
 /** Move mouse away to avoid random hover events and wait for any circular menus to disappear. */
-export async function ensureNoCircularMenusVisibleDueToHovering(page: Page) {
+export async function ensureNoComponentMenusVisibleDueToHovering(page: Page) {
   await page.mouse.move(-1000, 0)
-  await expect(locate.circularMenu(page)).toBeHidden()
+  await expect(locate.componentMenu(page)).toBeHidden()
 }
 
 /** Ensure no nodes are selected. */
diff --git a/app/gui/integration-test/project-view/componentBrowser.spec.ts b/app/gui/integration-test/project-view/componentBrowser.spec.ts
index 3e49c831d834..95607c23504e 100644
--- a/app/gui/integration-test/project-view/componentBrowser.spec.ts
+++ b/app/gui/integration-test/project-view/componentBrowser.spec.ts
@@ -73,25 +73,21 @@ test('Different ways of opening Component Browser', async ({ page }) => {
   await expectAndCancelBrowser(page, '', 'selected')
 })
 
-test('Opening Component Browser with small plus buttons', async ({ page }) => {
+test('Opening Component Browser from output port buttons', async ({ page }) => {
   await actions.goToGraph(page)
 
   // Small (+) button shown when node is hovered
-  await page.keyboard.press('Escape')
-  await page.mouse.move(100, 80)
-  await expect(locate.smallPlusButton(page)).toBeHidden()
-  await locate.graphNodeIcon(locate.graphNodeByBinding(page, 'selected')).hover()
-  await expect(locate.smallPlusButton(page)).toBeVisible()
-  await locate.smallPlusButton(page).click()
+  const node = locate.graphNodeByBinding(page, 'selected')
+  await locate.graphNodeIcon(node).hover()
+  await expect(locate.createNodeFromPort(node)).toBeVisible()
+  await locate.createNodeFromPort(node).click({ force: true })
   await expectAndCancelBrowser(page, '', 'selected')
 
-  // Small (+) button shown when node is sole selection
+  // Small (+) button shown when node is selected
   await page.keyboard.press('Escape')
-  await page.mouse.move(300, 300)
-  await expect(locate.smallPlusButton(page)).toBeHidden()
-  await locate.graphNodeByBinding(page, 'selected').click()
-  await expect(locate.smallPlusButton(page)).toBeVisible()
-  await locate.smallPlusButton(page).click()
+  await node.click()
+  await expect(locate.createNodeFromPort(node)).toBeVisible()
+  await locate.createNodeFromPort(node).click({ force: true })
   await expectAndCancelBrowser(page, '', 'selected')
 })
 
diff --git a/app/gui/integration-test/project-view/graphNodeVisualization.spec.ts b/app/gui/integration-test/project-view/graphNodeVisualization.spec.ts
index bf8556275791..af27ca9159c9 100644
--- a/app/gui/integration-test/project-view/graphNodeVisualization.spec.ts
+++ b/app/gui/integration-test/project-view/graphNodeVisualization.spec.ts
@@ -9,7 +9,7 @@ test('Node can open and load visualization', async ({ page }) => {
   await actions.goToGraph(page)
   const node = locate.graphNode(page).last()
   await node.click({ position: { x: 8, y: 8 } })
-  await expect(locate.circularMenu(page)).toExist()
+  await expect(locate.componentMenu(page)).toExist()
   await locate.toggleVisualizationButton(page).click()
   await expect(locate.anyVisualization(page)).toExist()
   await expect(locate.loadingVisualization(page)).toHaveCount(0)
diff --git a/app/gui/integration-test/project-view/locate.ts b/app/gui/integration-test/project-view/locate.ts
index e57546a852a2..e8a4a04b769f 100644
--- a/app/gui/integration-test/project-view/locate.ts
+++ b/app/gui/integration-test/project-view/locate.ts
@@ -79,11 +79,11 @@ export const graphEditor = componentLocator('.GraphEditor')
 export const codeEditor = componentLocator('.CodeEditor')
 export const anyVisualization = componentLocator('.GraphVisualization')
 export const loadingVisualization = componentLocator('.LoadingVisualization')
-export const circularMenu = componentLocator('.CircularMenu')
+export const componentMenu = componentLocator('.ComponentMenu')
 export const addNewNodeButton = componentLocator('.PlusButton')
 export const componentBrowser = componentLocator('.ComponentBrowser')
 export const nodeOutputPort = componentLocator('.outputPortHoverArea')
-export const smallPlusButton = componentLocator('.SmallPlusButton')
+export const createNodeFromPort = componentLocator('.CreateNodeFromPortButton .plusIcon')
 export const editorRoot = componentLocator('.CodeMirror')
 export const nodeComment = componentLocator('.GraphNodeComment')
 export const nodeCommentContent = componentLocator('.GraphNodeComment div[contentEditable]')
diff --git a/app/gui/integration-test/project-view/nodeComments.spec.ts b/app/gui/integration-test/project-view/nodeComments.spec.ts
index c9e386cae4e0..d48c1f7ece7e 100644
--- a/app/gui/integration-test/project-view/nodeComments.spec.ts
+++ b/app/gui/integration-test/project-view/nodeComments.spec.ts
@@ -22,8 +22,8 @@ test('Start editing comment via menu', async ({ page }) => {
   await actions.goToGraph(page)
   const node = locate.graphNodeByBinding(page, 'final')
   await node.click()
-  await locate.circularMenu(node).getByRole('button', { name: 'More' }).click()
-  await locate.circularMenu(node).getByRole('button', { name: 'Comment' }).click()
+  await locate.componentMenu(node).getByRole('button', { name: 'More' }).click()
+  await locate.componentMenu(node).getByRole('button', { name: 'Comment' }).click()
   await expect(locate.nodeCommentContent(node)).toBeFocused()
 })
 
@@ -60,8 +60,8 @@ test('Add new comment via menu', async ({ page }) => {
   const nodeComment = locate.nodeCommentContent(node)
 
   await node.click()
-  await locate.circularMenu(node).getByRole('button', { name: 'More' }).click()
-  await locate.circularMenu(node).getByRole('button', { name: 'Comment' }).click()
+  await locate.componentMenu(node).getByRole('button', { name: 'More' }).click()
+  await locate.componentMenu(node).getByRole('button', { name: 'Comment' }).click()
   await expect(locate.nodeCommentContent(node)).toBeFocused()
   const NEW_COMMENT = 'New comment text'
   await nodeComment.fill(NEW_COMMENT)
diff --git a/app/gui/integration-test/project-view/typesOnNodeHover.spec.ts b/app/gui/integration-test/project-view/typesOnNodeHover.spec.ts
index 32811c648382..eea37fd602d7 100644
--- a/app/gui/integration-test/project-view/typesOnNodeHover.spec.ts
+++ b/app/gui/integration-test/project-view/typesOnNodeHover.spec.ts
@@ -15,17 +15,17 @@ async function assertTypeLabelOnNode(
 ) {
   // Ensure the visualization button won't be covered by any other parts of another node (e.g. a comment).
   await bringNodeToFront(page, node)
-  await node.hover({ position: { x: 8, y: 8 } })
-  await locate.toggleVisualizationButton(node).click()
+  await node.hover({ position: { x: 8, y: 8 }, force: true })
+  await locate.toggleVisualizationButton(node).click({ force: true })
   const targetLabel = node.locator('.node-type').first()
   await expect(targetLabel).toHaveText(type.short)
   await expect(targetLabel).toHaveAttribute('title', type.full)
-  await locate.toggleVisualizationButton(node).click()
+  await locate.toggleVisualizationButton(node).click({ force: true })
   await actions.deselectNodes(page)
 }
 
 async function bringNodeToFront(page: Page, node: Locator) {
-  await node.click({ position: { x: 8, y: 8 } })
+  await node.click({ position: { x: 0, y: 8 }, force: true })
   await page.keyboard.press('Escape')
 }
 
diff --git a/app/gui/package.json b/app/gui/package.json
index 8f1f2f35dc7f..4a9e45f7245f 100644
--- a/app/gui/package.json
+++ b/app/gui/package.json
@@ -166,7 +166,7 @@
     "@types/d3": "^7.4.0",
     "@types/hash-sum": "^1.0.0",
     "@types/jsdom": "^21.1.1",
-    "@types/mapbox-gl": "^2.7.13",
+    "@types/mapbox-gl": "^3.4.1",
     "@types/node": "^22.9.0",
     "@types/papaparse": "^5.3.15",
     "@types/react": "^18.0.27",
diff --git a/app/gui/src/project-view/components/CodeEditor/sync.ts b/app/gui/src/project-view/components/CodeEditor/sync.ts
index a5b3f11cd766..88616e48d66f 100644
--- a/app/gui/src/project-view/components/CodeEditor/sync.ts
+++ b/app/gui/src/project-view/components/CodeEditor/sync.ts
@@ -4,7 +4,7 @@ import { changeSetToTextEdits } from '@/util/codemirror/text'
 import { useToast } from '@/util/toast'
 import {
   Annotation,
-  ChangeSet,
+  type ChangeSet,
   type EditorSelection,
   type Extension,
   type Text,
@@ -12,23 +12,24 @@ import {
 import { EditorView } from '@codemirror/view'
 import { createDebouncer } from 'lib0/eventloop'
 import { onUnmounted, watch } from 'vue'
-import { MutableModule } from 'ydoc-shared/ast'
-import { SourceRangeEdit, textChangeToEdits } from 'ydoc-shared/util/data/text'
+import { type SourceRangeEdit, textChangeToEdits } from 'ydoc-shared/util/data/text'
 import { type Origin } from 'ydoc-shared/yjsModel'
 
 // Indicates a change updating the text to correspond to the given module state.
-const synchronizedModule = Annotation.define<MutableModule>()
+const synchronizedModule = Annotation.define<true>()
 
 /** @returns A CodeMirror Extension that synchronizes the editor state with the AST of an Enso module. */
 export function useEnsoSourceSync(
   projectStore: Pick<ProjectStore, 'module'>,
-  graphStore: Pick<GraphStore, 'moduleSource' | 'viewModule' | 'startEdit' | 'commitEdit'>,
+  graphStore: Pick<
+    GraphStore,
+    'moduleSource' | 'viewModule' | 'startEdit' | 'commitEdit' | 'onBeforeEdit'
+  >,
   editorView: EditorView,
 ) {
   let pendingChanges:
     | { changes: ChangeSet; selectionBefore: EditorSelection; textBefore: Text }
     | undefined
-  let currentModule: MutableModule | undefined
 
   const notifyErrorToast = useToast.error()
   const notifyError = notifyErrorToast.show.bind(notifyErrorToast)
@@ -36,12 +37,7 @@ export function useEnsoSourceSync(
   const debounceUpdates = createDebouncer(0)
   const updateListener: Extension = EditorView.updateListener.of((update) => {
     for (const transaction of update.transactions) {
-      const newModule = transaction.annotation(synchronizedModule)
-      if (newModule) {
-        // Flush the pipeline of edits that were based on the old module.
-        commitPendingChanges()
-        currentModule = newModule
-      } else if (transaction.docChanged && currentModule) {
+      if (transaction.docChanged && !transaction.annotation(synchronizedModule)) {
         pendingChanges =
           pendingChanges ?
             {
@@ -63,29 +59,27 @@ export function useEnsoSourceSync(
   /** Set the editor contents to the current module state, discarding any pending editor-initiated changes. */
   function resetView() {
     pendingChanges = undefined
-    currentModule = undefined
     const viewText = editorView.state.doc.toString()
     const code = graphStore.moduleSource.text
     const changes = textChangeToEdits(viewText, code)
     console.info('Resetting the editor to the module code.', changes)
     editorView.dispatch({
       changes,
-      annotations: synchronizedModule.of(graphStore.startEdit()),
+      annotations: synchronizedModule.of(true),
     })
   }
 
   /** Apply any pending changes to the currently-synchronized module, clearing the set of pending changes. */
   function commitPendingChanges() {
-    if (!pendingChanges || !currentModule) return
+    if (!pendingChanges) return
     const { changes, selectionBefore, textBefore } = pendingChanges
     pendingChanges = undefined
     const edits = changeSetToTextEdits(changes)
     try {
-      const editedModule = currentModule.edit()
+      const editedModule = graphStore.startEdit()
       editedModule.applyTextEdits(edits, graphStore.viewModule)
       if (editedModule.root()?.code() === editorView.state.doc.toString()) {
         graphStore.commitEdit(editedModule, undefined, 'local:userAction:CodeEditor')
-        currentModule = editedModule
         return
       }
     } catch (error) {
@@ -95,59 +89,51 @@ export function useEnsoSourceSync(
     editorView.dispatch({
       changes: changes.invert(textBefore),
       selection: selectionBefore,
-      annotations: synchronizedModule.of(currentModule),
+      annotations: synchronizedModule.of(true),
     })
-    if (currentModule.root()?.code() !== editorView.state.doc.toString()) {
+    if (graphStore.moduleSource.text !== editorView.state.doc.toString()) {
       console.warn('Unexpected: Applying inverted edit did not yield original module source')
       resetView()
     }
   }
 
-  let needResync = false
+  function beforeSourceChange({ origin }: { origin: Origin | undefined }) {
+    if (pendingChanges && origin !== 'local:userAction:CodeEditor') commitPendingChanges()
+  }
+
   function observeSourceChange(textEdits: readonly SourceRangeEdit[], origin: Origin | undefined) {
-    // If we received an update from outside the Code Editor while the editor contained uncommitted changes, we cannot
-    // proceed incrementally; we wait for the changes to be merged as Y.Js AST updates, and then set the view to the
-    // resulting code.
-    if (needResync) {
-      if (!pendingChanges) {
-        resetView()
-        needResync = false
-      }
-      return
-    }
-    // When we aren't in the `needResync` state, we can ignore updates that originated in the Code Editor.
-    if (origin === 'local:userAction:CodeEditor') {
-      return
-    }
-    if (pendingChanges) {
-      console.info(`Deferring update (editor dirty).`)
-      needResync = true
-      return
+    if (origin !== 'local:userAction:CodeEditor') {
+      editorView.dispatch({
+        changes: textEdits,
+        annotations: synchronizedModule.of(true),
+      })
     }
-
-    // If none of the above exit-conditions were reached, the transaction is applicable to our current state.
-    editorView.dispatch({
-      changes: textEdits,
-      annotations: synchronizedModule.of(graphStore.startEdit()),
-    })
   }
 
-  onUnmounted(() => graphStore.moduleSource.unobserve(observeSourceChange))
   /**
-   * Starts synchronizing the editor with module updates. This must be called *after* installing the `updateListener`
-   * extension in the editor.
+   * Starts synchronizing the editor with module updates. This must be called (once) *after* installing the
+   * `updateListener` extension in the editor.
    */
   function connectModuleListener() {
+    let cleanup: (() => void) | undefined = undefined
     watch(
       () => projectStore.module,
       (module, _oldValue, onCleanup) => {
         if (!module) return
+        const beforeEditHandler = graphStore.onBeforeEdit(beforeSourceChange)
         graphStore.moduleSource.observe(observeSourceChange)
-        onCleanup(() => graphStore.moduleSource.unobserve(observeSourceChange))
+        cleanup = () => {
+          beforeEditHandler?.unregister()
+          graphStore.moduleSource.unobserve(observeSourceChange)
+          cleanup = undefined
+        }
+        onCleanup(cleanup)
       },
       { immediate: true },
     )
+    onUnmounted(() => cleanup?.())
   }
+
   return {
     /** The extension to install in the editor. */
     updateListener,
diff --git a/app/gui/src/project-view/components/ComponentBrowser.vue b/app/gui/src/project-view/components/ComponentBrowser.vue
index 29bfd8842f31..097ea1418282 100644
--- a/app/gui/src/project-view/components/ComponentBrowser.vue
+++ b/app/gui/src/project-view/components/ComponentBrowser.vue
@@ -378,7 +378,7 @@ const handler = componentBrowserBindings.handler({
       :nodeSize="inputSize"
       :nodePosition="nodePosition"
       :scale="1"
-      :isCircularMenuVisible="false"
+      :isComponentMenuVisible="false"
       :isFullscreen="false"
       :isFullscreenAllowed="false"
       :isResizable="false"
diff --git a/app/gui/src/project-view/components/ComponentMenu.vue b/app/gui/src/project-view/components/ComponentMenu.vue
index 8911369d59ee..e40d7ceaa84b 100644
--- a/app/gui/src/project-view/components/ComponentMenu.vue
+++ b/app/gui/src/project-view/components/ComponentMenu.vue
@@ -13,7 +13,7 @@ const isDropdownOpened = ref(false)
 
 <template>
   <div
-    class="CircularMenu"
+    class="ComponentMenu"
     :class="{
       menu: !componentButtons.pickColor.state,
       openedDropdown: isDropdownOpened,
@@ -58,7 +58,7 @@ const isDropdownOpened = ref(false)
 </template>
 
 <style scoped>
-.CircularMenu {
+.ComponentMenu {
   position: absolute;
   left: -36px;
   bottom: -36px;
diff --git a/app/gui/src/project-view/components/DocumentationEditor/__tests__/textPaste.test.ts b/app/gui/src/project-view/components/DocumentationEditor/__tests__/textPaste.test.ts
index c36f16a21e0d..dd1da68f7850 100644
--- a/app/gui/src/project-view/components/DocumentationEditor/__tests__/textPaste.test.ts
+++ b/app/gui/src/project-view/components/DocumentationEditor/__tests__/textPaste.test.ts
@@ -10,7 +10,6 @@ test.each([
   },
   {
     clipboard: 'example.com',
-    inserted: '<https://example.com>',
   },
   {
     clipboard: 'http://example.com',
@@ -22,15 +21,12 @@ test.each([
   },
   {
     clipboard: 'example.com/Address containing spaces and a < character',
-    inserted: '<https://example.com/Address containing spaces and a %3C character>',
   },
   {
     clipboard: 'example.com/Address resembling *bold syntax*',
-    inserted: '<https://example.com/Address resembling %2Abold syntax%2A>',
   },
   {
     clipboard: 'Url: www.a.example.com, another: www.b.example.com',
-    inserted: 'Url: <https://www.a.example.com>, another: <https://www.b.example.com>',
   },
   {
     clipboard: 'gopher:///no/autolinking/unusual/protocols',
@@ -53,6 +49,9 @@ test.each([
   {
     clipboard: 'example.com with trailing text',
   },
+  {
+    clipboard: 'Standard.Base.Math',
+  },
 ])('Auto-linking pasted text: $clipboard', ({ clipboard, inserted }) => {
   expect(transformPastedText(clipboard)).toBe(inserted ?? clipboard)
 })
diff --git a/app/gui/src/project-view/components/DocumentationEditor/textPaste.ts b/app/gui/src/project-view/components/DocumentationEditor/textPaste.ts
index d6c44409cad6..7b9f495eedbf 100644
--- a/app/gui/src/project-view/components/DocumentationEditor/textPaste.ts
+++ b/app/gui/src/project-view/components/DocumentationEditor/textPaste.ts
@@ -5,30 +5,10 @@ function uriEscapeChar(char: string) {
 }
 
 function toAutoLink(text: string) {
-  return `<${addProtocolIfMissing(text).replaceAll(/[\][<>*`]/g, uriEscapeChar)}>`
-}
-
-function addProtocolIfMissing(url: string) {
-  return (URL.canParse(url) ? '' : 'https://') + url
-}
-
-/**
- * Return whether the input is likely to be a URL, possibly with the protocol omitted. This matches more aggressively
- * than {@link LINKABLE_URL_REGEX}, but rejects some inputs that would technically make valid URLs but are more likely
- * to be other text.
- */
-function isReasonableUrl(text: string) {
-  const textWithProto = addProtocolIfMissing(text)
-  let textAsUrl: URL | undefined
-  try {
-    textAsUrl = new URL(textWithProto)
-  } catch {
-    return false
-  }
-  return textAsUrl.protocol.match(/https?:/) && textAsUrl.hostname.match(/\.[a-z]/)
+  return `<${text.replaceAll(/[\][<>*`]/g, uriEscapeChar)}>`
 }
 
 /** Convert the input to Markdown. This includes converting any likely URLs to <autolink>s. */
 export function transformPastedText(text: string): string {
-  return isReasonableUrl(text) ? toAutoLink(text) : text.replaceAll(LINKABLE_URL_REGEX, toAutoLink)
+  return text.replaceAll(LINKABLE_URL_REGEX, toAutoLink)
 }
diff --git a/app/gui/src/project-view/components/GraphEditor.vue b/app/gui/src/project-view/components/GraphEditor.vue
index e6fc1a97d388..093244559f95 100644
--- a/app/gui/src/project-view/components/GraphEditor.vue
+++ b/app/gui/src/project-view/components/GraphEditor.vue
@@ -30,6 +30,7 @@ import { keyboardBusy, keyboardBusyExceptIn, unrefElement, useEvent } from '@/co
 import { groupColorVar } from '@/composables/nodeColors'
 import type { PlacementStrategy } from '@/composables/nodeCreation'
 import { provideGraphEditorLayers } from '@/providers/graphEditorLayers'
+import { provideGraphEditorState } from '@/providers/graphEditorState'
 import type { GraphNavigator } from '@/providers/graphNavigator'
 import { provideGraphNavigator } from '@/providers/graphNavigator'
 import { provideNodeColors } from '@/providers/graphNodeColors'
@@ -286,7 +287,7 @@ const graphBindingsHandler = graphBindings.handler({
     projectStore.lsRpcConnection.profilingStop()
   },
   openComponentBrowser() {
-    if (graphNavigator.sceneMousePos != null && !componentBrowserVisible.value) {
+    if (graphNavigator.sceneMousePos != null && !componentBrowserOpened.value) {
       createWithComponentBrowser(fromSelection() ?? { placement: { type: 'mouse' } })
     }
   },
@@ -390,23 +391,25 @@ const documentationEditorHandler = documentationEditorBindings.handler({
 
 // === Component Browser ===
 
-const componentBrowserVisible = ref(false)
+const { componentBrowserOpened } = provideGraphEditorState({
+  componentBrowserOpened: ref(false),
+})
 const componentBrowserNodePosition = ref<Vec2>(Vec2.Zero)
 const componentBrowserUsage = ref<Usage>({ type: 'newNode' })
 
-watch(componentBrowserVisible, (v) =>
+watch(componentBrowserOpened, (v) =>
   rightDock.setStorageMode(v ? StorageMode.ComponentBrowser : StorageMode.Default),
 )
 
 function openComponentBrowser(usage: Usage, position: Vec2) {
   componentBrowserUsage.value = usage
   componentBrowserNodePosition.value = position
-  componentBrowserVisible.value = true
+  componentBrowserOpened.value = true
 }
 
 function hideComponentBrowser() {
   graphStore.editedNodeInfo = undefined
-  componentBrowserVisible.value = false
+  componentBrowserOpened.value = false
   displayedDocs.value = undefined
 }
 
@@ -639,7 +642,7 @@ const groupColors = computed(() => {
           />
           <GraphEdges :navigator="graphNavigator" @createNodeFromEdge="handleEdgeDrop" />
           <ComponentBrowser
-            v-if="componentBrowserVisible"
+            v-if="componentBrowserOpened"
             ref="componentBrowser"
             :navigator="graphNavigator"
             :nodePosition="componentBrowserNodePosition"
diff --git a/app/gui/src/project-view/components/GraphEditor/CreateNodeFromPortButton.vue b/app/gui/src/project-view/components/GraphEditor/CreateNodeFromPortButton.vue
new file mode 100644
index 000000000000..ae0b5c2de641
--- /dev/null
+++ b/app/gui/src/project-view/components/GraphEditor/CreateNodeFromPortButton.vue
@@ -0,0 +1,108 @@
+<script setup lang="ts">
+import { ref } from 'vue'
+import { AstId } from 'ydoc-shared/ast'
+
+const props = defineProps<{ portId: AstId }>()
+const emit = defineEmits<{ click: [] }>()
+const hovered = ref(false)
+</script>
+
+<template>
+  <g :class="{ CreateNodeFromPortButton: true, hovered }" @click="emit('click')">
+    <rect :class="{ connection: true }" fill="currentColor"></rect>
+    <g :class="{ plusIcon: true }">
+      <mask :id="`${props.portId}_add_node_clip_path`">
+        <rect class="maskBackground"></rect>
+        <rect class="plusV"></rect>
+        <rect class="plusH"></rect>
+      </mask>
+      <circle :mask="`url(#${props.portId}_add_node_clip_path)`" fill="currentColor"></circle>
+    </g>
+    <rect class="hoverArea" @pointerenter="hovered = true" @pointerleave="hovered = false"></rect>
+  </g>
+</template>
+
+<style scoped>
+.CreateNodeFromPortButton {
+  --radius: 6px;
+  --maskSize: calc(var(--radius) * 2);
+  --strokeWidth: 1.5px;
+  --leftOffset: 16px;
+  --topOffset: 40px;
+  --color-dimmed: color-mix(in oklab, var(--color-node-primary) 60%, white 40%);
+  --color: var(--color-node-primary);
+}
+
+.connection {
+  --width: 4px;
+  --direct-hover-offset: calc(
+    var(--output-port-hovered-extra-width) * var(--direct-hover-animation)
+  );
+  width: var(--width);
+  height: calc((var(--topOffset) - var(--direct-hover-offset) + 2px) * var(--hover-animation));
+  transform: translate(
+    calc(var(--port-clip-start) * (100% + 1px) + var(--leftOffset) - var(--width) / 2),
+    calc(var(--node-size-y) + var(--direct-hover-offset) - var(--output-port-overlap))
+  );
+  cursor: pointer;
+  color: var(--color-dimmed);
+  transition: color 0.2s ease;
+}
+
+.hovered * {
+  color: var(--color);
+}
+
+.plusIcon {
+  transform: translate(
+    calc(var(--port-clip-start) * (100% + 1px) + var(--leftOffset) - var(--radius)),
+    calc(
+      var(--node-size-y) + var(--output-port-max-width) + var(--node-vertical-gap) +
+        var(--topOffset)
+    )
+  );
+  color: var(--color-dimmed);
+  cursor: pointer;
+  & .maskBackground {
+    fill: white;
+    width: var(--maskSize);
+    height: var(--maskSize);
+  }
+  & .plusV {
+    x: calc(var(--maskSize) / 2 - var(--strokeWidth) / 2);
+    y: calc(var(--radius) / 2);
+    width: var(--strokeWidth);
+    height: var(--radius);
+    fill: black;
+  }
+  & .plusH {
+    x: calc(var(--radius) / 2);
+    y: calc(var(--maskSize) / 2 - var(--strokeWidth) / 2);
+    width: var(--radius);
+    height: var(--strokeWidth);
+    fill: black;
+  }
+  & circle {
+    cx: var(--radius);
+    cy: var(--radius);
+    r: calc(var(--radius) * var(--hover-animation));
+    transition: color 0.2s ease;
+  }
+}
+
+.hoverArea {
+  --margin: 4px;
+  --width: calc(var(--radius) * 2 + var(--margin) * 2);
+  fill: transparent;
+  width: var(--width);
+  height: calc(
+    var(--node-vertical-gap) + var(--output-port-max-width) + var(--margin) * 2 + var(--topOffset) +
+      var(--radius)
+  );
+  transform: translate(
+    calc(var(--port-clip-start) * (100% + 1px) + var(--leftOffset) - var(--width) / 2),
+    calc(var(--node-size-y) + var(--output-port-max-width))
+  );
+  cursor: pointer;
+}
+</style>
diff --git a/app/gui/src/project-view/components/GraphEditor/GraphNode.vue b/app/gui/src/project-view/components/GraphEditor/GraphNode.vue
index 6c52425865f9..dcdd17599b69 100644
--- a/app/gui/src/project-view/components/GraphEditor/GraphNode.vue
+++ b/app/gui/src/project-view/components/GraphEditor/GraphNode.vue
@@ -17,7 +17,6 @@ import GraphNodeOutputPorts from '@/components/GraphEditor/GraphNodeOutputPorts.
 import GraphVisualization from '@/components/GraphEditor/GraphVisualization.vue'
 import type { NodeCreationOptions } from '@/components/GraphEditor/nodeCreation'
 import PointFloatingMenu from '@/components/PointFloatingMenu.vue'
-import SmallPlusButton from '@/components/SmallPlusButton.vue'
 import SvgIcon from '@/components/SvgIcon.vue'
 import { useDoubleClick } from '@/composables/doubleClick'
 import { usePointer, useResizeObserver } from '@/composables/events'
@@ -500,7 +499,7 @@ const showMenuAt = ref<{ x: number; y: number }>()
       :nodeSize="nodeSize"
       :scale="navigator?.scale ?? 1"
       :nodePosition="nodePosition"
-      :isCircularMenuVisible="menuVisible"
+      :isComponentMenuVisible="menuVisible"
       :currentType="props.node.vis?.identifier"
       :dataSource="dataSource"
       :typename="expressionInfo?.typename"
@@ -562,17 +561,15 @@ const showMenuAt = ref<{ x: number; y: number }>()
         v-if="props.node.type !== 'output'"
         :nodeId="nodeId"
         :forceVisible="nodeHovered"
+        @newNodeClick="
+          setSoleSelected(), emit('createNodes', [{ commit: false, content: undefined }])
+        "
         @portClick="(...args) => emit('outputPortClick', ...args)"
         @portDoubleClick="(...args) => emit('outputPortDoubleClick', ...args)"
         @update:hoverAnim="emit('update:hoverAnim', $event)"
         @update:nodeHovered="outputHovered = $event"
       />
     </svg>
-    <SmallPlusButton
-      v-if="menuVisible"
-      :class="isVisualizationVisible ? 'afterNode' : 'belowMenu'"
-      @createNodes="setSoleSelected(), emit('createNodes', $event)"
-    />
   </div>
   <PointFloatingMenu v-if="showMenuAt" :point="showMenuAt" @close="showMenuAt = undefined">
     <ComponentContextMenu @close="showMenuAt = undefined" />
@@ -641,7 +638,7 @@ const showMenuAt = ref<{ x: number; y: number }>()
   opacity: 1;
 }
 
-.CircularMenu {
+.ComponentMenu {
   z-index: 25;
   &.partial {
     z-index: 1;
diff --git a/app/gui/src/project-view/components/GraphEditor/GraphNodeOutputPorts.vue b/app/gui/src/project-view/components/GraphEditor/GraphNodeOutputPorts.vue
index b054066cff97..218acf7aba1c 100644
--- a/app/gui/src/project-view/components/GraphEditor/GraphNodeOutputPorts.vue
+++ b/app/gui/src/project-view/components/GraphEditor/GraphNodeOutputPorts.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import { useApproach } from '@/composables/animation'
 import { useDoubleClick } from '@/composables/doubleClick'
+import { useGraphEditorState } from '@/providers/graphEditorState'
 import { useGraphStore, type NodeId } from '@/stores/graph'
 import { isDef } from '@vueuse/core'
 import { setIfUndefined } from 'lib0/map'
@@ -14,12 +15,14 @@ import {
   type EffectScope,
 } from 'vue'
 import type { AstId } from 'ydoc-shared/ast'
+import CreateNodeFromPortButton from './CreateNodeFromPortButton.vue'
 
 const props = defineProps<{ nodeId: NodeId; forceVisible: boolean }>()
 
 const emit = defineEmits<{
   portClick: [event: PointerEvent, portId: AstId]
   portDoubleClick: [event: PointerEvent, portId: AstId]
+  newNodeClick: [portId: AstId]
   'update:hoverAnim': [progress: number]
   'update:nodeHovered': [hovered: boolean]
 }>()
@@ -43,6 +46,8 @@ const outputPortsSet = computed(() => {
   return bindings
 })
 
+const { componentBrowserOpened } = useGraphEditorState()
+
 const outputPorts = computed((): PortData[] => {
   const ports = outputPortsSet.value
   const numPorts = ports.size
@@ -122,6 +127,7 @@ function portGroupStyle(port: PortData) {
     '--direct-hover-animation': hoverAnimations.get(port.portId)?.[0].value ?? 0,
     '--port-clip-start': start,
     '--port-clip-end': end,
+    '--port-label-transform-x': `calc(${((end - start) / 2 + start) * 100}%)`,
     transform: 'var(--output-port-transform)',
   }
 }
@@ -144,6 +150,11 @@ graph.suggestEdgeFromOutput(outputHovered)
         <rect class="outputPort" />
       </g>
       <text class="outputPortLabel">{{ port.label }}</text>
+      <CreateNodeFromPortButton
+        v-if="!componentBrowserOpened"
+        :portId="port.portId"
+        @click="emit('newNodeClick', port.portId)"
+      />
     </g>
   </template>
 </template>
@@ -205,6 +216,9 @@ graph.suggestEdgeFromOutput(outputHovered)
   text-anchor: middle;
   opacity: calc(var(--hover-animation) * var(--hover-animation));
   fill: var(--color-node-primary);
-  transform: translate(50%, calc(var(--node-size-y) + var(--output-port-max-width) + 16px));
+  transform: translate(
+    var(--port-label-transform-x),
+    calc(var(--node-size-y) + var(--output-port-max-width) + 16px)
+  );
 }
 </style>
diff --git a/app/gui/src/project-view/components/GraphEditor/GraphVisualization.vue b/app/gui/src/project-view/components/GraphEditor/GraphVisualization.vue
index 728add3b3269..d868d96b67f0 100644
--- a/app/gui/src/project-view/components/GraphEditor/GraphVisualization.vue
+++ b/app/gui/src/project-view/components/GraphEditor/GraphVisualization.vue
@@ -25,7 +25,7 @@ const DEFAULT_CONTENT_HEIGHT_PX = 150
 
 const props = defineProps<{
   currentType?: Opt<VisualizationIdentifier>
-  isCircularMenuVisible: boolean
+  isComponentMenuVisible: boolean
   isFullscreenAllowed: boolean
   isResizable: boolean
   isPreview?: boolean
@@ -230,7 +230,7 @@ customElements.define(ensoVisualizationHost, defineCustomElement(VisualizationHo
           :showControls="!isPreview"
           :hideVisualizationButton="
             isFullscreen ? 'hide'
-            : isCircularMenuVisible ? 'invisible'
+            : isComponentMenuVisible ? 'invisible'
             : 'show'
           "
           :isFullscreenAllowed="isFullscreenAllowed"
diff --git a/app/gui/src/project-view/components/PlainTextEditor/___tests__/urlLinks.test.ts b/app/gui/src/project-view/components/PlainTextEditor/___tests__/urlLinks.test.ts
index f656756588a3..c64ab341e739 100644
--- a/app/gui/src/project-view/components/PlainTextEditor/___tests__/urlLinks.test.ts
+++ b/app/gui/src/project-view/components/PlainTextEditor/___tests__/urlLinks.test.ts
@@ -50,15 +50,6 @@ test.each([
       },
     ],
   },
-  {
-    text: 'Url: www.example.com',
-    expectedLinks: [
-      {
-        text: 'www.example.com',
-        href: 'https://www.example.com',
-      },
-    ],
-  },
   {
     text: 'Email: user@example.com',
     expectedLinks: [
diff --git a/app/gui/src/project-view/components/SmallPlusButton.vue b/app/gui/src/project-view/components/SmallPlusButton.vue
deleted file mode 100644
index 00ae235fb141..000000000000
--- a/app/gui/src/project-view/components/SmallPlusButton.vue
+++ /dev/null
@@ -1,35 +0,0 @@
-<script setup lang="ts">
-import type { NodeCreationOptions } from '@/components/GraphEditor/nodeCreation'
-import SvgButton from '@/components/SvgButton.vue'
-
-const emit = defineEmits<{
-  createNodes: [options: NodeCreationOptions[]]
-}>()
-
-function addNode() {
-  emit('createNodes', [{ commit: false, content: undefined }])
-}
-</script>
-
-<template>
-  <SvgButton name="add" class="SmallPlusButton" title="Add Component" @click.stop="addNode" />
-</template>
-
-<style scoped>
-.SmallPlusButton {
-  width: var(--node-base-height);
-  height: var(--node-base-height);
-  margin: 0;
-
-  backdrop-filter: var(--blur-app-bg);
-  background: var(--color-app-bg);
-  border-radius: 16px;
-
-  &:hover {
-    background: rgb(230, 230, 255);
-  }
-  &:active {
-    background: rgb(158, 158, 255);
-  }
-}
-</style>
diff --git a/app/gui/src/project-view/components/visualizations/GeoMapVisualization.vue b/app/gui/src/project-view/components/visualizations/GeoMapVisualization.vue
index 47c9f012781c..020064b374b5 100644
--- a/app/gui/src/project-view/components/visualizations/GeoMapVisualization.vue
+++ b/app/gui/src/project-view/components/visualizations/GeoMapVisualization.vue
@@ -8,10 +8,11 @@ export const defaultPreprocessor = [
 ] as const
 export const scripts = [
   // mapbox-gl does not have an ESM release.
-  'https://api.tiles.mapbox.com/mapbox-gl-js/v2.15.0/mapbox-gl.js',
+  'https://api.tiles.mapbox.com/mapbox-gl-js/v3.8.0/mapbox-gl.js',
   // The deck.gl scripting API is not available in the ESM module.
-  'https://cdn.jsdelivr.net/npm/deck.gl@8.9.27/dist.min.js',
+  'https://cdn.jsdelivr.net/npm/deck.gl@9.0.38/dist.min.js',
 ]
+export const styles = ['https://api.tiles.mapbox.com/mapbox-gl-js/v3.8.0/mapbox-gl.css']
 
 /**
  * Provides a mapbox & deck.gl-based map visualization.
@@ -100,8 +101,8 @@ const props = defineProps<{ data: Data }>()
  * Mapbox API access token.
  * All the limits of API are listed here: https://docs.mapbox.com/api/#rate-limits
  */
-const TOKEN = import.meta.env.ENSO_IDE_MAPBOX_API_TOKEN
-if (TOKEN == null) {
+const TOKEN = window.mapBoxApiToken?.()
+if (!TOKEN) {
   console.warn(
     'Mapbox API token is missing, to use Geo Map visualization please provide ENSO_IDE_MAPBOX_API_TOKEN.',
   )
@@ -170,9 +171,15 @@ function updateState(data: Data) {
   }
   const center = centerPoint()
 
+  function safeOrDefault(value: number | undefined, defaultValue: number): number {
+    if (value === 0 || value == null || Number.isNaN(value)) return defaultValue
+    return value
+  }
+  const width = safeOrDefault(mapNode.value?.clientWidth, 600)
+  const height = safeOrDefault(mapNode.value?.clientHeight, 400)
   const viewPort = new deck.WebMercatorViewport({
-    width: mapNode.value?.clientWidth ?? 600,
-    height: mapNode.value?.clientHeight ?? 400,
+    width,
+    height,
     longitude: center.longitude,
     latitude: center.latitude,
     zoom: DEFAULT_MAP_ZOOM,
@@ -229,6 +236,16 @@ function initDeckGl() {
       initialViewState: viewState.value,
       controller: controller.value,
     }) as any
+    // Hotfix for https://github.com/mapbox/mapbox-gl-js/issues/13355
+    ;(deckgl.value as any)._map.map._updateContainerDimensions = function () {
+      if (!this._container) return
+
+      const width = this._container.offsetWidth || 400
+      const height = this._container.offsetHeight || 300
+
+      this._containerWidth = width
+      this._containerHeight = height
+    }
   } catch (error) {
     console.error(error)
     resetState()
diff --git a/app/gui/src/project-view/components/visualizations/JSONVisualization/JsonErrorWidget.vue b/app/gui/src/project-view/components/visualizations/JSONVisualization/JsonErrorWidget.vue
new file mode 100644
index 000000000000..b98c141ffce7
--- /dev/null
+++ b/app/gui/src/project-view/components/visualizations/JSONVisualization/JsonErrorWidget.vue
@@ -0,0 +1,16 @@
+<script setup lang="ts">
+const props = defineProps<{
+  data: unknown
+}>()
+</script>
+
+<template>
+  <span class="JsonErrorWidget" v-text="props.data" />
+</template>
+
+<style scoped>
+.JsonErrorWidget {
+  padding: 8px;
+  padding-inline-start: 0;
+}
+</style>
diff --git a/app/gui/src/project-view/components/visualizations/JSONVisualization/JsonValueWidget.vue b/app/gui/src/project-view/components/visualizations/JSONVisualization/JsonValueWidget.vue
index 894ffaaad5fa..3b23a1141696 100644
--- a/app/gui/src/project-view/components/visualizations/JSONVisualization/JsonValueWidget.vue
+++ b/app/gui/src/project-view/components/visualizations/JSONVisualization/JsonValueWidget.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup>
 import JsonArrayWidget from '@/components/visualizations/JSONVisualization/JsonArrayWidget.vue'
+import JsonErrorWidget from '@/components/visualizations/JSONVisualization/JsonErrorWidget.vue'
 import JsonObjectWidget from '@/components/visualizations/JSONVisualization/JsonObjectWidget.vue'
 import JsonPrimitiveWidget from '@/components/visualizations/JSONVisualization/JsonPrimitiveWidget.vue'
 
@@ -10,8 +11,12 @@ const emit = defineEmits<{
 </script>
 
 <template>
+  <JsonErrorWidget
+    v-if="props.data && typeof props.data === 'object' && '_to_js_object_error_' in props.data"
+    :data="props.data._to_js_object_error_"
+  />
   <JsonArrayWidget
-    v-if="Array.isArray(props.data)"
+    v-else-if="Array.isArray(props.data)"
     :data="props.data"
     @createProjection="emit('createProjection', $event)"
   />
diff --git a/app/gui/src/project-view/components/visualizations/TableVisualization.vue b/app/gui/src/project-view/components/visualizations/TableVisualization.vue
index f00f7c1ab042..c4df286aba7b 100644
--- a/app/gui/src/project-view/components/visualizations/TableVisualization.vue
+++ b/app/gui/src/project-view/components/visualizations/TableVisualization.vue
@@ -362,7 +362,7 @@ function toField(
   const template =
     icon ?
       `<span style='${styles}'><span data-ref="eLabel" class="ag-header-cell-label" role="presentation" style='${styles}'><span data-ref="eText" class="ag-header-cell-text"></span></span>${menu} ${filterButton} ${sort} ${getSvgTemplate(icon)} ${svgTemplateWarning}</span>`
-    : `<span style='${styles}' data-ref="eLabel"><span data-ref="eText" class="ag-header-cell-text"></span> ${menu} ${filterButton} ${sort} ${svgTemplateWarning}</span>`
+    : `<span style='${styles}' data-ref="eLabel"><span data-ref="eText" class="ag-header-cell-label"></span> ${menu} ${filterButton} ${sort} ${svgTemplateWarning}</span>`
 
   return {
     field: name,
diff --git a/app/gui/src/project-view/components/visualizations/WarningsVisualization.vue b/app/gui/src/project-view/components/visualizations/WarningsVisualization.vue
index 1fa934250153..89ec16c560ba 100644
--- a/app/gui/src/project-view/components/visualizations/WarningsVisualization.vue
+++ b/app/gui/src/project-view/components/visualizations/WarningsVisualization.vue
@@ -20,17 +20,47 @@ const removeWarnings = computed(() =>
 </script>
 
 <script setup lang="ts">
-type Data = string[]
+type Error = {
+  type?: string
+  content?: {
+    argument_name?: string
+    call_location?: string
+    constructor?: string
+    function_name?: string
+    type?: string
+  }
+  message?: string
+}
 
-const props = defineProps<{ data: Data }>()
+type Warning = string[]
 
+type Data = Error | Warning
+
+const props = defineProps<{ data: Data }>()
 const config = useVisualizationConfig()
 
+const messages = computed(() => {
+  const data = props.data
+  if (Array.isArray(data)) {
+    return data
+  }
+  if (typeof data === 'object' && data !== null && 'message' in data) {
+    return [data.message]
+  }
+  return []
+})
+
+const isRemoveWarningsDisabled = computed(() =>
+  Array.isArray(props.data) ?
+    messages.value.length === 0
+  : typeof props.data === 'object' && props.data !== null && 'message' in props.data,
+)
+
 config.setToolbar([
   {
     icon: 'not_exclamation',
     title: 'Remove Warnings',
-    disabled: () => props.data.length === 0,
+    disabled: isRemoveWarningsDisabled,
     onClick: () => config.createNodes({ content: removeWarnings.value, commit: true }),
     dataTestid: 'remove-warnings-button',
   },
@@ -40,8 +70,8 @@ config.setToolbar([
 <template>
   <div class="WarningsVisualization">
     <ul>
-      <li v-if="props.data.length === 0">There are no warnings.</li>
-      <li v-for="(warning, index) in props.data" :key="index" v-text="warning"></li>
+      <li v-if="messages.length === 0">There are no warnings.</li>
+      <li v-for="(warning, index) in messages" :key="index" v-text="warning"></li>
     </ul>
   </div>
 </template>
diff --git a/app/gui/src/project-view/providers/graphEditorState.ts b/app/gui/src/project-view/providers/graphEditorState.ts
new file mode 100644
index 000000000000..5d200d6828a3
--- /dev/null
+++ b/app/gui/src/project-view/providers/graphEditorState.ts
@@ -0,0 +1,15 @@
+import { createContextStore } from '@/providers'
+import { identity } from '@vueuse/core'
+import { Ref } from 'vue'
+
+/** The global state of the graph editor. */
+export interface GraphEditorState {
+  /** Whether the component browser is opened or not. */
+  componentBrowserOpened: Ref<boolean>
+}
+
+export { provideGraphEditorState, useGraphEditorState }
+const [provideGraphEditorState, useGraphEditorState] = createContextStore(
+  'Graph editor state',
+  identity<GraphEditorState>,
+)
diff --git a/app/gui/src/project-view/stores/graph/index.ts b/app/gui/src/project-view/stores/graph/index.ts
index 9836946d92df..4655fa48850c 100644
--- a/app/gui/src/project-view/stores/graph/index.ts
+++ b/app/gui/src/project-view/stores/graph/index.ts
@@ -53,7 +53,7 @@ import type {
 import { reachable } from 'ydoc-shared/util/data/graph'
 import type { LocalUserActionOrigin, Origin, VisualizationMetadata } from 'ydoc-shared/yjsModel'
 import { defaultLocalOrigin, visMetadataEquals } from 'ydoc-shared/yjsModel'
-import { UndoManager } from 'yjs'
+import * as Y from 'yjs'
 
 const FALLBACK_BINDING_PREFIX = 'node'
 
@@ -376,7 +376,7 @@ export const [provideGraphStore, useGraphStore] = createContextStore(
     const undoManagerStatus = reactive({
       canUndo: false,
       canRedo: false,
-      update(m: UndoManager) {
+      update(m: Y.UndoManager) {
         this.canUndo = m.canUndo()
         this.canRedo = m.canRedo()
       },
@@ -386,7 +386,7 @@ export const [provideGraphStore, useGraphStore] = createContextStore(
       (m) => {
         if (m) {
           const update = () => undoManagerStatus.update(m)
-          const events = stringUnionToArray<keyof Events<UndoManager>>()(
+          const events = stringUnionToArray<keyof Events<Y.UndoManager>>()(
             'stack-item-added',
             'stack-item-popped',
             'stack-cleared',
@@ -786,6 +786,11 @@ export const [provideGraphStore, useGraphStore] = createContextStore(
       { onError: console.error },
     )
 
+    function onBeforeEdit(f: (transaction: Y.Transaction) => void): { unregister: () => void } {
+      proj.module?.doc.ydoc.on('beforeTransaction', f)
+      return { unregister: () => proj.module?.doc.ydoc.off('beforeTransaction', f) }
+    }
+
     return proxyRefs({
       db: markRaw(db),
       mockExpressionUpdate,
@@ -826,6 +831,7 @@ export const [provideGraphStore, useGraphStore] = createContextStore(
       startEdit,
       commitEdit,
       edit,
+      onBeforeEdit,
       viewModule,
       addMissingImports,
       addMissingImportsDisregardConflicts,
diff --git a/app/gui/src/project-view/stores/visualization/index.ts b/app/gui/src/project-view/stores/visualization/index.ts
index 4a32b0d4eeba..914d270b675a 100644
--- a/app/gui/src/project-view/stores/visualization/index.ts
+++ b/app/gui/src/project-view/stores/visualization/index.ts
@@ -22,6 +22,7 @@ import {
   type VisualizationId,
 } from '@/stores/visualization/metadata'
 import type { VisualizationModule } from '@/stores/visualization/runtimeTypes'
+import { assert } from '@/util/assert'
 import type { Opt } from '@/util/data/opt'
 import { isUrlString } from '@/util/data/urlString'
 import { isIconName } from '@/util/iconName'
@@ -103,40 +104,47 @@ export const [provideVisualizationStore, useVisualizationStore] = createContextS
       })
     }
 
+    const loadedScripts = new Set<string>()
+    const loadedStyles = new Set<string>()
     const scriptsNode = document.head.appendChild(document.createElement('div'))
     scriptsNode.classList.add('visualization-scripts')
-    const loadedScripts = new Set<string>()
-    function loadScripts(module: VisualizationModule) {
+
+    function loadAsync(
+      urls: string[],
+      type: 'scripts' | 'styles',
+      container: HTMLElement,
+      loaded: Set<string>,
+    ) {
       const promises: Promise<void>[] = []
-      if ('scripts' in module && module.scripts) {
-        if (!Array.isArray(module.scripts)) {
-          console.warn('Visualiation scripts should be an array:', module.scripts)
-        }
-        const scripts = Array.isArray(module.scripts) ? module.scripts : [module.scripts]
-        for (const url of scripts) {
-          if (typeof url !== 'string') {
-            console.warn('Visualization script should be a string, skipping URL:', url)
-          } else if (!loadedScripts.has(url)) {
-            loadedScripts.add(url)
-            const node = document.createElement('script')
+      for (const url of urls) {
+        if (!loaded.has(url)) {
+          loaded.add(url)
+          const nodeKind = type === 'scripts' ? 'script' : 'link'
+          const node = document.createElement(nodeKind)
+          if (type === 'styles') {
+            assert(node instanceof HTMLLinkElement)
+            node.href = url
+            node.rel = 'stylesheet'
+          } else if (type === 'scripts') {
+            assert(node instanceof HTMLScriptElement)
             node.src = url
-            // Some resources still set only "Access-Control-Allow-Origin" in the response.
-            // We need to explicitly make a request CORS - see https://resourcepolicy.fyi
-            node.crossOrigin = 'anonymous'
-            promises.push(
-              new Promise<void>((resolve, reject) => {
-                node.addEventListener('load', () => {
-                  resolve()
-                  node.remove()
-                })
-                node.addEventListener('error', () => {
-                  reject()
-                  node.remove()
-                })
-              }),
-            )
-            scriptsNode.appendChild(node)
           }
+          // Some resources still set only "Access-Control-Allow-Origin" in the response.
+          // We need to explicitly make a request CORS - see https://resourcepolicy.fyi
+          node.crossOrigin = 'anonymous'
+          promises.push(
+            new Promise<void>((resolve, reject) => {
+              node.addEventListener('load', () => {
+                resolve()
+                node.remove()
+              })
+              node.addEventListener('error', () => {
+                reject()
+                node.remove()
+              })
+            }),
+          )
+          container.appendChild(node)
         }
       }
       return Promise.allSettled(promises)
@@ -168,7 +176,12 @@ export const [provideVisualizationStore, useVisualizationStore] = createContextS
               await projectRoot,
               await proj.dataConnection,
             ).then(async (viz) => {
-              await loadScripts(viz)
+              const styles = viz.styles ?? []
+              const scripts = viz.scripts ?? []
+              await Promise.allSettled([
+                loadAsync(styles, 'styles', document.head, loadedStyles),
+                loadAsync(scripts, 'scripts', scriptsNode, loadedScripts),
+              ])
               return viz
             })
             if (key) cache.set(key, vizPromise)
@@ -279,7 +292,11 @@ export const [provideVisualizationStore, useVisualizationStore] = createContextS
     async function resolveBuiltinVisualization(type: string) {
       const module = builtinVisualizationsByName[type]
       if (!module) throw new Error(`Unknown visualization type: ${type}`)
-      await loadScripts(module)
+      const { scripts, styles } = module
+      await Promise.allSettled([
+        loadAsync(styles ?? [], 'styles', document.head, loadedStyles),
+        loadAsync(scripts ?? [], 'scripts', scriptsNode, loadedScripts),
+      ])
       return module
     }
 
diff --git a/app/gui/src/project-view/util/__tests__/link.test.ts b/app/gui/src/project-view/util/__tests__/link.test.ts
index f8ed89a68490..1c280eebaed2 100644
--- a/app/gui/src/project-view/util/__tests__/link.test.ts
+++ b/app/gui/src/project-view/util/__tests__/link.test.ts
@@ -3,7 +3,6 @@ import { LINKABLE_EMAIL_REGEX, LINKABLE_URL_REGEX } from '../link'
 
 const cases = {
   urls: [
-    'www.a.b',
     'http://example.com',
     'https://a.b',
     'https://some.local',
@@ -19,6 +18,7 @@ const cases = {
     '(a@b.cd)',
   ],
   neither: [
+    'www.a.b',
     'https://💩.la/',
     'a.b',
     'http://AsDf',
diff --git a/app/gui/src/project-view/util/ast/__tests__/abstract.test.ts b/app/gui/src/project-view/util/ast/__tests__/abstract.test.ts
index ecc768e54336..165f4d497834 100644
--- a/app/gui/src/project-view/util/ast/__tests__/abstract.test.ts
+++ b/app/gui/src/project-view/util/ast/__tests__/abstract.test.ts
@@ -30,14 +30,6 @@ test('Raw block abstracts to Ast.BodyBlock', () => {
 const normalizingCases = [
   { input: ' a', normalized: '    a' },
   { input: 'a ', normalized: 'a \n' },
-  {
-    input: ['main =', '  foo', ' bar', '  baz'].join('\n'),
-    normalized: ['main =', '  foo', '  bar', '  baz'].join('\n'),
-  },
-  {
-    input: ['main =', '  foo', ' bar', 'baz'].join('\n'),
-    normalized: ['main =', '  foo', '  bar', 'baz'].join('\n'),
-  },
 ]
 const cases = [
   'Console.',
@@ -383,6 +375,8 @@ const cases = [
   '\n\n',
   '\na',
   '\n\na',
+  ['main =', '  foo', ' bar', '  baz'].join('\n'),
+  ['main =', '  foo', ' bar', 'baz'].join('\n'),
   ...normalizingCases,
 ]
 test.each(cases)('parse/print round-trip: %s', (testCase) => {
diff --git a/app/gui/src/project-view/util/callTree.ts b/app/gui/src/project-view/util/callTree.ts
index 5c34e4cf584f..087ded4b9163 100644
--- a/app/gui/src/project-view/util/callTree.ts
+++ b/app/gui/src/project-view/util/callTree.ts
@@ -4,7 +4,11 @@ import type { WidgetConfiguration } from '@/providers/widgetRegistry/configurati
 import * as widgetCfg from '@/providers/widgetRegistry/configuration'
 import { DisplayMode } from '@/providers/widgetRegistry/configuration'
 import type { MethodCallInfo } from '@/stores/graph/graphDatabase'
-import type { SuggestionEntry, SuggestionEntryArgument } from '@/stores/suggestionDatabase/entry'
+import {
+  isRequiredArgument,
+  type SuggestionEntry,
+  type SuggestionEntryArgument,
+} from '@/stores/suggestionDatabase/entry'
 import { Ast } from '@/util/ast'
 import type { AstId } from '@/util/ast/abstract'
 import { findLastIndex, tryGetIndex } from '@/util/data/array'
@@ -118,7 +122,7 @@ export class ArgumentPlaceholder extends Argument {
 
   /** TODO: Add docs */
   override get hideByDefault(): boolean {
-    return this.argInfo.hasDefault && this.dynamicConfig?.display !== DisplayMode.Always
+    return !isRequiredArgument(this.argInfo) && this.dynamicConfig?.display !== DisplayMode.Always
   }
 }
 
diff --git a/app/gui/src/project-view/util/link.ts b/app/gui/src/project-view/util/link.ts
index 916f60fd5bce..76413b53e353 100644
--- a/app/gui/src/project-view/util/link.ts
+++ b/app/gui/src/project-view/util/link.ts
@@ -1,9 +1,9 @@
 /**
  * Heuristic that matches strings suitable to be automatically interpreted as links. Recognizes absolute URLs with
- * `http` and `https` protocols, and some protocol-less strings that are likely to be URLs.
+ * `http` and `https` protocols.
  */
 export const LINKABLE_URL_REGEX =
-  /(?:https?:\/\/(?:www\.)?|www\.)[-a-zA-Z0-9@:%._+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b[-a-zA-Z0-9()@:%_+.~#?&/=]*/g
+  /https?:\/\/[-a-zA-Z0-9@:%._+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b[-a-zA-Z0-9()@:%_+.~#?&/=]*/g
 
 /** Heuristic that matches strings suitable to be automatically interpreted as email addresses. */
 export const LINKABLE_EMAIL_REGEX =
diff --git a/app/ide-desktop/client/src/globals.d.ts b/app/ide-desktop/client/src/globals.d.ts
index 0b30a96221ff..85645d320f4f 100644
--- a/app/ide-desktop/client/src/globals.d.ts
+++ b/app/ide-desktop/client/src/globals.d.ts
@@ -158,6 +158,7 @@ declare global {
     readonly fileBrowserApi?: FileBrowserApi
     readonly projectManagementApi?: ProjectManagementApi
     readonly versionInfo?: VersionInfo
+    readonly mapBoxApiToken: () => string
     toggleDevtools: () => void
   }
 
diff --git a/app/ide-desktop/client/src/preload.ts b/app/ide-desktop/client/src/preload.ts
index 855e4fd241a9..c49383057caa 100644
--- a/app/ide-desktop/client/src/preload.ts
+++ b/app/ide-desktop/client/src/preload.ts
@@ -31,6 +31,7 @@ const NAVIGATION_API_KEY = 'navigationApi'
 const MENU_API_KEY = 'menuApi'
 const SYSTEM_API_KEY = 'systemApi'
 const VERSION_INFO_KEY = 'versionInfo'
+const MAPBOX_API_TOKEN_KEY = 'mapBoxApiToken'
 
 // =========================
 // === exposeInMainWorld ===
@@ -205,3 +206,9 @@ exposeInMainWorld(SYSTEM_API_KEY, {
 // ====================
 
 exposeInMainWorld(VERSION_INFO_KEY, debug.VERSION_INFO)
+
+// ==================
+// === MapBox API ===
+// ==================
+
+exposeInMainWorld(MAPBOX_API_TOKEN_KEY, () => process.env.ENSO_IDE_MAPBOX_API_TOKEN || '')
diff --git a/app/ydoc-server/src/ydoc.ts b/app/ydoc-server/src/ydoc.ts
index f9f62e71badc..bbb76d8ddbca 100644
--- a/app/ydoc-server/src/ydoc.ts
+++ b/app/ydoc-server/src/ydoc.ts
@@ -67,19 +67,22 @@ export class WSSharedDoc {
     this.doc.on('update', (update, origin) => this.updateHandler(update, origin))
   }
 
-  /** Send a message to all connected clients. */
-  broadcast(message: Uint8Array) {
+  /** Send a message to all connected clients, except any client whose connection is passed as `exclude`. */
+  broadcast(message: Uint8Array, exclude?: YjsConnection | undefined) {
     for (const [conn] of this.conns) {
-      if (typeof conn !== 'string') conn.send(message)
+      if (typeof conn === 'string') continue
+      if (conn === exclude) continue
+      conn.send(message)
     }
   }
 
   /** Process an update event from the YDoc document. */
-  updateHandler(update: Uint8Array, _origin: any) {
+  updateHandler(update: Uint8Array, origin: unknown) {
     const encoder = encoding.createEncoder()
     encoding.writeVarUint(encoder, messageSync)
     writeUpdate(encoder, update)
-    this.broadcast(encoding.toUint8Array(encoder))
+    const exclude = origin instanceof YjsConnection ? origin : undefined
+    this.broadcast(encoding.toUint8Array(encoder), exclude)
   }
 }
 
diff --git a/app/ydoc-shared/src/ast/tree.ts b/app/ydoc-shared/src/ast/tree.ts
index 62b8dab1d5e3..72b7e6972ace 100644
--- a/app/ydoc-shared/src/ast/tree.ts
+++ b/app/ydoc-shared/src/ast/tree.ts
@@ -2704,17 +2704,13 @@ export class BodyBlock extends BaseExpression {
 
   /** TODO: Add docs */
   *concreteChildren({ indent }: PrintContext): IterableIterator<RawConcreteChild> {
-    let linesIndent: string | undefined = undefined
     for (const line of this.fields.get('lines')) {
       yield preferUnspaced(line.newline)
       if (line.statement) {
         const whitespace: string =
-          linesIndent ??
           (line.statement.whitespace && line.statement.whitespace.length > (indent || '').length ?
             line.statement.whitespace
-          : undefined) ??
-          (indent != null ? indent + '    ' : '')
-        linesIndent = whitespace
+          : undefined) ?? (indent != null ? indent + '    ' : '')
         yield { whitespace, node: line.statement.node }
       }
     }
diff --git a/build/build/paths.yaml b/build/build/paths.yaml
index 9db33cbe4404..288c22dd6efa 100644
--- a/build/build/paths.yaml
+++ b/build/build/paths.yaml
@@ -7,16 +7,17 @@
     workflows/:
       changelog.yml:
       engine-benchmark.yml:
-      gui-tests.yml:
-      gui.yml:
-      engine-nightly.yml:
+      engine-checks-nightly.yml:
+      engine-checks-optional.yml:
+      engine-checks.yml:
       extra-nightly-tests.yml:
+      gui-packaging-optional.yml:
+      gui-packaging.yml:
       nightly.yml:
       promote.yml:
       release.yml:
-      scala-new.yml:
-      shader-tools.yml:
       std-libs-benchmark.yml:
+      wasm-checks.yml:
   app/:
     gui/: # GUI.
       dist/:
diff --git a/build/build/src/ci_gen.rs b/build/build/src/ci_gen.rs
index 693133a231b8..6163c84baf54 100644
--- a/build/build/src/ci_gen.rs
+++ b/build/build/src/ci_gen.rs
@@ -79,6 +79,11 @@ pub const RELEASE_TARGETS: [(OS, Arch); 4] = [
 pub const PR_CHECKED_TARGETS: [(OS, Arch); 3] =
     [(OS::Windows, Arch::X86_64), (OS::Linux, Arch::X86_64), (OS::MacOS, Arch::X86_64)];
 
+pub const PR_REQUIRED_TARGETS: [(OS, Arch); 2] =
+    [(OS::Windows, Arch::X86_64), (OS::Linux, Arch::X86_64)];
+
+pub const PR_OPTIONAL_TARGETS: [(OS, Arch); 1] = [(OS::MacOS, Arch::X86_64)];
+
 pub const DEFAULT_BRANCH_NAME: &str = "develop";
 
 pub const RELEASE_CONCURRENCY_GROUP: &str = "release";
@@ -478,6 +483,16 @@ impl PromoteReleaseJob {
     pub const PROMOTE_STEP_ID: &'static str = "promote";
 }
 
+fn concurrency(group: impl AsRef<str>) -> Concurrency {
+    let github_workflow = wrap_expression("github.workflow");
+    let github_ref = wrap_expression("github.ref");
+    let group_ref = group.as_ref();
+    Concurrency::Map {
+        group:              format!("{github_workflow}-{github_ref}-{group_ref}"),
+        cancel_in_progress: wrap_expression(not_default_branch()),
+    }
+}
+
 /// Generate a workflow that checks if the changelog has been updated (if needed).
 pub fn changelog() -> Result<Workflow> {
     use PullRequestActivityType::*;
@@ -556,15 +571,35 @@ fn add_release_steps(workflow: &mut Workflow) -> Result {
     Ok(())
 }
 
-/// Add jobs that perform backend checks ,including Scala and Standard Library tests.
+/// Add jobs that perform backend checks, including Scala and Standard Library tests.
+pub fn add_backend_checks_customized(
+    workflow: &mut Workflow,
+    target: Target,
+    graal_edition: graalvm::Edition,
+    continue_on_error: impl Fn(&Target) -> Option<bool>,
+) {
+    workflow.add_customized(target, job::CiCheckBackend { graal_edition }, |job| {
+        job.continue_on_error = continue_on_error(&target);
+    });
+    workflow.add_customized(target, job::JvmTests { graal_edition }, |job| {
+        job.continue_on_error = continue_on_error(&target);
+    });
+    workflow.add_customized(
+        target,
+        job::StandardLibraryTests { graal_edition, cloud_tests_enabled: false },
+        |job| {
+            job.continue_on_error = continue_on_error(&target);
+        },
+    );
+}
+
+/// Add jobs that perform backend checks, including Scala and Standard Library tests.
 pub fn add_backend_checks(
     workflow: &mut Workflow,
     target: Target,
     graal_edition: graalvm::Edition,
 ) {
-    workflow.add(target, job::CiCheckBackend { graal_edition });
-    workflow.add(target, job::JvmTests { graal_edition });
-    workflow.add(target, job::StandardLibraryTests { graal_edition, cloud_tests_enabled: false });
+    add_backend_checks_customized(workflow, target, graal_edition, |_| None);
 }
 
 pub fn workflow_call_job(name: impl Into<String>, path: impl Into<String>) -> Job {
@@ -652,15 +687,20 @@ pub fn typical_check_triggers() -> Event {
     }
 }
 
-pub fn gui() -> Result<Workflow> {
+pub fn gui_packaging() -> Result<Workflow> {
+    let on = Event {
+        workflow_dispatch: Some(manual_workflow_dispatch()),
+        workflow_call: Some(default()),
+        ..default()
+    };
     let mut workflow = Workflow {
         name: "GUI Packaging".into(),
-        on: typical_check_triggers(),
-        concurrency: Some(concurrency()),
+        concurrency: Some(concurrency("gui-packaging")),
+        on,
         ..default()
     };
 
-    for target in PR_CHECKED_TARGETS {
+    for target in PR_REQUIRED_TARGETS {
         let project_manager_job = workflow.add(target, job::BuildBackend);
         workflow.add_customized(target, job::PackageIde, |job| {
             job.needs.insert(project_manager_job.clone());
@@ -670,40 +710,93 @@ pub fn gui() -> Result<Workflow> {
     Ok(workflow)
 }
 
-pub fn gui_tests() -> Result<Workflow> {
-    let on = typical_check_triggers();
-    let mut workflow = Workflow { name: "GUI Check".into(), on, ..default() };
-    workflow.add(PRIMARY_TARGET, job::CancelWorkflow);
+pub fn gui_packaging_optional() -> Result<Workflow> {
+    let on = Event {
+        workflow_dispatch: Some(manual_workflow_dispatch()),
+        workflow_call: Some(default()),
+        ..default()
+    };
+    let mut workflow = Workflow {
+        name: "GUI Packaging (Optional)".into(),
+        concurrency: Some(concurrency("gui-packaging-optional")),
+        on,
+        ..default()
+    };
+
+    for target in PR_OPTIONAL_TARGETS {
+        let continue_on_error = Some(true);
+        let project_manager_job = workflow.add_customized(target, job::BuildBackend, |job| {
+            job.continue_on_error = continue_on_error;
+        });
+        workflow.add_customized(target, job::PackageIde, |job| {
+            job.needs.insert(project_manager_job.clone());
+            job.continue_on_error = continue_on_error;
+        });
+        workflow.add_customized(target, job::GuiBuild, |job| {
+            job.continue_on_error = continue_on_error;
+        });
+    }
+    Ok(workflow)
+}
+
+pub fn wasm_checks() -> Result<Workflow> {
+    let on = Event {
+        workflow_dispatch: Some(manual_workflow_dispatch()),
+        workflow_call: Some(default()),
+        ..default()
+    };
+    let mut workflow = Workflow {
+        name: "WASM Checks".into(),
+        concurrency: Some(concurrency("wasm-checks")),
+        on,
+        ..default()
+    };
     workflow.add(PRIMARY_TARGET, job::Lint);
     workflow.add(PRIMARY_TARGET, job::WasmTest);
     workflow.add(PRIMARY_TARGET, job::NativeTest);
     Ok(workflow)
 }
 
-fn concurrency() -> Concurrency {
-    let github_workflow = wrap_expression("github.workflow");
-    let github_ref = wrap_expression("github.ref");
-    Concurrency::Map {
-        group:              format!("{github_workflow}-{github_ref}"),
-        cancel_in_progress: wrap_expression(not_default_branch()),
+pub fn engine_checks() -> Result<Workflow> {
+    let on = Event {
+        workflow_dispatch: Some(manual_workflow_dispatch()),
+        workflow_call: Some(default()),
+        ..default()
+    };
+    let mut workflow = Workflow {
+        name: "Engine Checks".into(),
+        concurrency: Some(concurrency("engine-checks")),
+        on,
+        ..default()
+    };
+    workflow.add(PRIMARY_TARGET, job::VerifyLicensePackages);
+    for target in PR_REQUIRED_TARGETS {
+        add_backend_checks(&mut workflow, target, graalvm::Edition::Community);
     }
+    Ok(workflow)
 }
 
-pub fn backend() -> Result<Workflow> {
+pub fn engine_checks_optional() -> Result<Workflow> {
+    let on = Event {
+        workflow_dispatch: Some(manual_workflow_dispatch()),
+        workflow_call: Some(default()),
+        ..default()
+    };
     let mut workflow = Workflow {
-        name: "Engine CI".into(),
-        on: typical_check_triggers(),
-        concurrency: Some(concurrency()),
+        name: "Engine Checks (Optional)".into(),
+        concurrency: Some(concurrency("engine-checks-optional")),
+        on,
         ..default()
     };
-    workflow.add(PRIMARY_TARGET, job::VerifyLicensePackages);
-    for target in PR_CHECKED_TARGETS {
-        add_backend_checks(&mut workflow, target, graalvm::Edition::Community);
+    for target in PR_OPTIONAL_TARGETS {
+        add_backend_checks_customized(&mut workflow, target, graalvm::Edition::Community, |_| {
+            Some(true)
+        });
     }
     Ok(workflow)
 }
 
-pub fn engine_nightly() -> Result<Workflow> {
+pub fn engine_checks_nightly() -> Result<Workflow> {
     let on = Event {
         schedule: vec![Schedule::new("0 3 * * *")?],
         workflow_dispatch: Some(manual_workflow_dispatch()),
@@ -809,11 +902,13 @@ pub fn generate(
     let workflows = [
         (repo_root.changelog_yml.to_path_buf(), changelog()?),
         (repo_root.nightly_yml.to_path_buf(), nightly()?),
-        (repo_root.scala_new_yml.to_path_buf(), backend()?),
-        (repo_root.engine_nightly_yml.to_path_buf(), engine_nightly()?),
+        (repo_root.engine_checks_yml.to_path_buf(), engine_checks()?),
+        (repo_root.engine_checks_optional_yml.to_path_buf(), engine_checks_optional()?),
+        (repo_root.engine_checks_nightly_yml.to_path_buf(), engine_checks_nightly()?),
         (repo_root.extra_nightly_tests_yml.to_path_buf(), extra_nightly_tests()?),
-        (repo_root.gui_yml.to_path_buf(), gui()?),
-        (repo_root.gui_tests_yml.to_path_buf(), gui_tests()?),
+        (repo_root.gui_packaging_yml.to_path_buf(), gui_packaging()?),
+        (repo_root.gui_packaging_optional_yml.to_path_buf(), gui_packaging_optional()?),
+        (repo_root.wasm_checks_yml.to_path_buf(), wasm_checks()?),
         (repo_root.engine_benchmark_yml.to_path_buf(), engine_benchmark()?),
         (repo_root.std_libs_benchmark_yml.to_path_buf(), std_libs_benchmark()?),
         (repo_root.release_yml.to_path_buf(), release()?),
diff --git a/build/ci_utils/src/actions/workflow/definition.rs b/build/ci_utils/src/actions/workflow/definition.rs
index 0c3410c8ce8a..4dec2a1164de 100644
--- a/build/ci_utils/src/actions/workflow/definition.rs
+++ b/build/ci_utils/src/actions/workflow/definition.rs
@@ -668,33 +668,35 @@ pub enum JobSecrets {
 #[derive(Clone, Debug, Default, Serialize, Deserialize)]
 #[serde(rename_all = "kebab-case")]
 pub struct Job {
-    pub name:            String,
+    pub name:              String,
     #[serde(skip_serializing_if = "BTreeSet::is_empty")]
-    pub needs:           BTreeSet<String>,
+    pub needs:             BTreeSet<String>,
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub r#if:            Option<String>,
+    pub r#if:              Option<String>,
     #[serde(skip_serializing_if = "Vec::is_empty")]
-    pub runs_on:         Vec<RunnerLabel>,
+    pub runs_on:           Vec<RunnerLabel>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub continue_on_error: Option<bool>,
     #[serde(skip_serializing_if = "Vec::is_empty")]
-    pub steps:           Vec<Step>,
+    pub steps:             Vec<Step>,
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub concurrency:     Option<Concurrency>,
+    pub concurrency:       Option<Concurrency>,
     #[serde(skip_serializing_if = "BTreeMap::is_empty")]
-    pub outputs:         BTreeMap<String, String>,
+    pub outputs:           BTreeMap<String, String>,
     #[serde(skip_serializing_if = "BTreeMap::is_empty")]
-    pub env:             BTreeMap<String, String>,
+    pub env:               BTreeMap<String, String>,
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub strategy:        Option<Strategy>,
+    pub strategy:          Option<Strategy>,
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub timeout_minutes: Option<u32>,
+    pub timeout_minutes:   Option<u32>,
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub uses:            Option<String>,
+    pub uses:              Option<String>,
     #[serde(skip_serializing_if = "BTreeMap::is_empty")]
-    pub with:            BTreeMap<String, String>,
+    pub with:              BTreeMap<String, String>,
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub secrets:         Option<JobSecrets>,
+    pub secrets:           Option<JobSecrets>,
     #[serde(skip_serializing_if = "BTreeMap::is_empty")]
-    pub permissions:     BTreeMap<Permission, Access>,
+    pub permissions:       BTreeMap<Permission, Access>,
 }
 
 impl Job {
diff --git a/distribution/lib/Standard/AWS/0.0.0-dev/src/Database/Redshift/Internal/Redshift_Dialect.enso b/distribution/lib/Standard/AWS/0.0.0-dev/src/Database/Redshift/Internal/Redshift_Dialect.enso
index da6b3b682407..2a753d901a8d 100644
--- a/distribution/lib/Standard/AWS/0.0.0-dev/src/Database/Redshift/Internal/Redshift_Dialect.enso
+++ b/distribution/lib/Standard/AWS/0.0.0-dev/src/Database/Redshift/Internal/Redshift_Dialect.enso
@@ -161,7 +161,7 @@ type Redshift_Dialect
     prepare_fetch_types_query : SQL_Expression -> Context -> SQL_Statement
     prepare_fetch_types_query self expression context =
         Base_Generator.default_fetch_types_query self expression context
-   
+
     ## PRIVATE
     generate_collate self collation_name:Text -> Text = Base_Generator.default_generate_collate collation_name     
 
diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Data.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Data.enso
index 0b18de729d53..64a3c3cdcbf9 100644
--- a/distribution/lib/Standard/Base/0.0.0-dev/src/Data.enso
+++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Data.enso
@@ -182,6 +182,7 @@ read_text path=(Missing_Argument.throw "path") (encoding : Encoding = Encoding.d
    Lists files contained in the provided directory.
 
    Arguments:
+   - directory: A path or `File` object to get the contents of.
    - name_filter: A glob pattern that can be used to filter the returned files.
      If it is not specified, all files are returned.
    - recursive: Specifies whether the returned list of files should include also
diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Extensions.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Extensions.enso
index 5247e7f9e6b9..30115590da66 100644
--- a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Extensions.enso
+++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Extensions.enso
@@ -305,7 +305,7 @@ Text.find_all self pattern:Text|Regex=".*" case_sensitivity:Case_Sensitivity=..S
     compiled_pattern = Regex.compile pattern case_insensitive=case_insensitive
     compiled_pattern.match_all self
 
-## ALIAS check matches, regex, like
+## ALIAS check matches, like, regex
    GROUP Text
    ICON preparation
 
@@ -360,7 +360,7 @@ Text.match self pattern:Text|Regex=".*" case_sensitivity:Case_Sensitivity=..Sens
 Text.to_regex : Boolean -> Regex ! Regex_Syntax_Error | Illegal_Argument
 Text.to_regex self case_insensitive=False = Regex.compile self case_insensitive
 
-## ALIAS tokenize, parse
+## ALIAS parse, tokenize
    GROUP Conversions
    ICON split
 
@@ -426,8 +426,8 @@ Text.split self delimiter="," case_sensitivity:Case_Sensitivity=..Sensitive use_
                         combined_delimiter = parenthesize (delimiter.map parenthesize . join '|')
                         self.split combined_delimiter case_sensitivity=case_sensitivity use_regex=True
 
-## ALIAS split, parse, regex
-   ADVANCED
+## ADVANCED
+   ALIAS parse, regex, split
    GROUP Conversions
    ICON split
    Takes an input string and and a pattern and returns all the matches as a
diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Enso_Cloud/Data_Link_Capabilities.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Enso_Cloud/Data_Link_Capabilities.enso
index 01ef76d78abf..95d755d33c37 100644
--- a/distribution/lib/Standard/Base/0.0.0-dev/src/Enso_Cloud/Data_Link_Capabilities.enso
+++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Enso_Cloud/Data_Link_Capabilities.enso
@@ -80,10 +80,12 @@ type Writable_Data_Link
    A type class representing a data link that is a link to a file.
    If the data link links to a directory, it allows crossing filesystems using `/` and `list` operations.
 type File_Like_Data_Link
+    ## PRIVATE
     Value underlying as_file
-   ## PRIVATE
-      Creates a `Writable_Data_Link` from a data link instance, if that data
-      link supports writing. If it does not, an error is thrown.
-   find data_link_instance (if_not_supported = (Error.throw (Illegal_Argument.Error "The "+(data_link_name data_link_instance)+" is not a link to a file object."))) -> File_Like_Data_Link ! Illegal_Argument =
-       handle_no_conversion _ = if_not_supported
-       Panic.catch No_Such_Conversion (File_Like_Data_Link.from data_link_instance) handle_no_conversion
+
+    ## PRIVATE
+       Creates a `Writable_Data_Link` from a data link instance, if that data
+       link supports writing. If it does not, an error is thrown.
+    find data_link_instance (if_not_supported = (Error.throw (Illegal_Argument.Error "The "+(data_link_name data_link_instance)+" is not a link to a file object."))) -> File_Like_Data_Link ! Illegal_Argument =
+        handle_no_conversion _ = if_not_supported
+        Panic.catch No_Such_Conversion (File_Like_Data_Link.from data_link_instance) handle_no_conversion
diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Network/Reload_Detector.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Network/Reload_Detector.enso
index 3669c7eaacfe..2df8ff6a498f 100644
--- a/distribution/lib/Standard/Base/0.0.0-dev/src/Network/Reload_Detector.enso
+++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Network/Reload_Detector.enso
@@ -3,7 +3,7 @@ import Standard.Base.Meta
 import Standard.Base.Nothing.Nothing
 import Standard.Base.Runtime.Managed_Resource.Managed_Resource
 import Standard.Base.Runtime.Ref.Ref
-from Standard.Base.Data.Boolean import Boolean, True, False
+from Standard.Base.Data.Boolean import Boolean, False, True
 
 ## PRIVATE
    This is used by ReloadDetector.java to create a `Managed_Resource` that is
@@ -17,10 +17,12 @@ from Standard.Base.Data.Boolean import Boolean, True, False
 type Reload_Detector
     private Value mr:Managed_Resource
 
+    ## Create a new reload detector.
     new -> Reload_Detector =
         mr = Managed_Resource.register (Ref.new 1) (_-> Nothing) True
         Reload_Detector.Value mr
 
+    ## Check if a reload has occurred.
     has_reload_occurred self =
         self.mr.has_been_finalized
 
diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Runtime/Managed_Resource.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Runtime/Managed_Resource.enso
index 33beacf92d7e..e4eacd248ba9 100644
--- a/distribution/lib/Standard/Base/0.0.0-dev/src/Runtime/Managed_Resource.enso
+++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Runtime/Managed_Resource.enso
@@ -4,7 +4,7 @@ import project.Any.Any
 import project.Errors.Common.Uninitialized_State
 import project.Meta
 import project.Nothing.Nothing
-from project.Data.Boolean import Boolean, True, False
+from project.Data.Boolean import Boolean, False, True
 
 ## Resource provides an API for manual management of computation resources.
 
@@ -79,8 +79,7 @@ type Managed_Resource
          the `Managed_Resource` (or to `Uninitialized_State` error).
        Returns:
        Value returned from the `action`
-
-    with : (Any -> Any) -> Any -> Any
+    with : (Any -> Any) -> Any
     with self ~action = @Tail_Call with_builtin self action
 
     ## PRIVATE
@@ -102,5 +101,8 @@ type Managed_Resource
         if x.is_error.not then False else
             if x.catch.is_a Uninitialized_State then True else x
 
+## PRIVATE
 register_builtin r fn sys:Boolean = @Builtin_Method "Managed_Resource.register_builtin"
+
+## PRIVATE
 with_builtin r fn = @Builtin_Method "Managed_Resource.with_builtin"
diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/System/File.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/System/File.enso
index 825069dfc9ad..51decf6624fe 100644
--- a/distribution/lib/Standard/Base/0.0.0-dev/src/System/File.enso
+++ b/distribution/lib/Standard/Base/0.0.0-dev/src/System/File.enso
@@ -797,7 +797,7 @@ type File
         if Data_Link.is_data_link self then Data_Link_Helpers.interpret_data_link_target_as_file self . list name_filter=name_filter recursive=recursive else
             if self.is_directory.not then Error.throw (Illegal_Argument.Error "Cannot `list` a non-directory.") else
                 all_files = if recursive then list_descendants self else self.list_immediate_children
-                case name_filter of
+                filtered_files = case name_filter of
                     "" -> all_files
                     _ ->
                         used_filter = if recursive.not || name_filter.contains "**" then name_filter else
@@ -806,6 +806,7 @@ type File
                         all_files.filter file->
                             pathStr = self.relativize file . path
                             File_Utils.matches matcher pathStr
+                filtered_files . sort on=.path
 
     ## GROUP Metadata
        ICON metadata
diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/System/Input_Stream.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/System/Input_Stream.enso
index a7256efb0cc7..e1ed2622458c 100644
--- a/distribution/lib/Standard/Base/0.0.0-dev/src/System/Input_Stream.enso
+++ b/distribution/lib/Standard/Base/0.0.0-dev/src/System/Input_Stream.enso
@@ -4,12 +4,11 @@ import project.Data.Numbers.Integer
 import project.Data.Text.Encoding.Encoding
 import project.Data.Vector.Vector
 import project.Error.Error
-import project.Panic.Panic
 import project.Errors.File_Error.File_Error
 import project.Errors.Illegal_State.Illegal_State
 import project.Errors.Problem_Behavior.Problem_Behavior
-from project.Errors.Common import Uninitialized_State
 import project.Nothing.Nothing
+import project.Panic.Panic
 import project.Runtime.Managed_Resource.Managed_Resource
 import project.System.Advanced.Restartable_Input_Stream.Restartable_Input_Stream
 import project.System.File.Advanced.Temporary_File.Temporary_File
@@ -18,11 +17,12 @@ import project.System.File.File_Access.File_Access
 import project.System.File.Generic.Writable_File.Writable_File
 import project.System.Internal.Reporting_Stream_Decoder_Helper
 from project.Data.Boolean import Boolean, False, True
+from project.Errors.Common import Uninitialized_State
 
-polyglot java import java.io.IOException
 polyglot java import java.io.BufferedInputStream
 polyglot java import java.io.ByteArrayInputStream
 polyglot java import java.io.InputStream as Java_Input_Stream
+polyglot java import java.io.IOException
 polyglot java import org.enso.base.encoding.Encoding_Utils
 polyglot java import org.enso.base.encoding.ReportingStreamDecoder
 polyglot java import org.enso.base.Stream_Utils
diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Warning.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Warning.enso
index b2c8ffd9ad70..1f21a194a7ea 100644
--- a/distribution/lib/Standard/Base/0.0.0-dev/src/Warning.enso
+++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Warning.enso
@@ -90,8 +90,7 @@ type Warning
        Arguments:
        - value: the value to which warnings should be set to.
        - warnings: vector of warnings to set to the value.
-    set : Any -> Vector Warning -> Any
-    set value warnings = set_array value warnings
+    set value (warnings:Vector Warning) = set_array value warnings
 
     ## PRIVATE
        ADVANCED
diff --git a/distribution/lib/Standard/Database/0.0.0-dev/src/Connection/Postgres_Connection.enso b/distribution/lib/Standard/Database/0.0.0-dev/src/Connection/Postgres_Connection.enso
index 88d5df36b8d2..90f8bead6ad4 100644
--- a/distribution/lib/Standard/Database/0.0.0-dev/src/Connection/Postgres_Connection.enso
+++ b/distribution/lib/Standard/Database/0.0.0-dev/src/Connection/Postgres_Connection.enso
@@ -10,6 +10,7 @@ import project.Column_Description.Column_Description
 import project.Connection.Connection.Connection
 import project.DB_Table.DB_Table
 import project.Dialect
+import project.Internal.Common.Connections_Helpers
 import project.Internal.Connection.Entity_Naming_Properties.Entity_Naming_Properties
 import project.Internal.Data_Link_Setup.Data_Link_Setup
 import project.Internal.IR.Query.Query
@@ -18,13 +19,11 @@ import project.Internal.SQL_Type_Reference.SQL_Type_Reference
 import project.SQL_Query.SQL_Query
 import project.SQL_Statement.SQL_Statement
 import project.SQL_Type.SQL_Type
-import project.Internal.Common.Connections_Helpers
 from project.Connection.Connection import make_schema_selector, make_structure_creator, make_table_name_selector, make_table_types_selector
 from project.Errors import SQL_Error, Table_Already_Exists, Table_Not_Found
 from project.Internal.Postgres.Helpers import get_encoding_name, parse_postgres_encoding
 from project.Internal.Upload.Helpers.Default_Arguments import first_column_name_in_structure
 
-
 type Postgres_Connection
     ## PRIVATE
 
diff --git a/distribution/lib/Standard/Database/0.0.0-dev/src/DB_Column.enso b/distribution/lib/Standard/Database/0.0.0-dev/src/DB_Column.enso
index 71820daaccf6..167c2e1d3674 100644
--- a/distribution/lib/Standard/Database/0.0.0-dev/src/DB_Column.enso
+++ b/distribution/lib/Standard/Database/0.0.0-dev/src/DB_Column.enso
@@ -1,7 +1,7 @@
 from Standard.Base import all
 import Standard.Base.Data.Read.Many_Files_List.Many_Files_List
-import Standard.Base.Errors.Common.Index_Out_Of_Bounds
 import Standard.Base.Errors.Common.Floating_Point_Equality
+import Standard.Base.Errors.Common.Index_Out_Of_Bounds
 import Standard.Base.Errors.Illegal_Argument.Illegal_Argument
 import Standard.Base.Errors.Illegal_State.Illegal_State
 import Standard.Base.Internal.Rounding_Helpers
diff --git a/distribution/lib/Standard/Database/0.0.0-dev/src/DB_Table.enso b/distribution/lib/Standard/Database/0.0.0-dev/src/DB_Table.enso
index 4d41918bd873..c7f658c6f780 100644
--- a/distribution/lib/Standard/Database/0.0.0-dev/src/DB_Table.enso
+++ b/distribution/lib/Standard/Database/0.0.0-dev/src/DB_Table.enso
@@ -9,6 +9,7 @@ import Standard.Base.Errors.Common.Floating_Point_Equality
 import Standard.Base.Errors.Common.Incomparable_Values
 import Standard.Base.Errors.Common.Index_Out_Of_Bounds
 import Standard.Base.Errors.Common.Type_Error
+import Standard.Base.Errors.Common.Missing_Argument
 import Standard.Base.Errors.Deprecated.Deprecated
 import Standard.Base.Errors.File_Error.File_Error
 import Standard.Base.Errors.Illegal_Argument.Illegal_Argument
@@ -24,11 +25,13 @@ import Standard.Table.Columns_To_Add.Columns_To_Add
 import Standard.Table.Columns_To_Keep.Columns_To_Keep
 import Standard.Table.Expression.Expression
 import Standard.Table.Expression.Expression_Error
+import Standard.Table.Grouping_Method.Grouping_Method
 import Standard.Table.Internal.Add_Row_Number
 import Standard.Table.Internal.Column_Naming_Helper.Column_Naming_Helper
 import Standard.Table.Internal.Constant_Column.Constant_Column
 import Standard.Table.Internal.Display_Helpers
 import Standard.Table.Internal.Join_Kind_Cross.Join_Kind_Cross
+import Standard.Table.Internal.Match_Columns_Helpers
 import Standard.Table.Internal.Problem_Builder.Problem_Builder
 import Standard.Table.Internal.Replace_Helpers
 import Standard.Table.Internal.Table_Helpers
@@ -38,7 +41,6 @@ import Standard.Table.Internal.Table_Ref.Table_Ref
 import Standard.Table.Internal.Unique_Name_Strategy.Unique_Name_Strategy
 import Standard.Table.Internal.Value_Type_Helpers
 import Standard.Table.Internal.Widget_Helpers
-import Standard.Table.Internal.Match_Columns_Helpers
 import Standard.Table.Row.Row
 import Standard.Table.Rows_To_Read.Rows_To_Read
 import Standard.Table.Value_Type.By_Type
@@ -403,7 +405,7 @@ type DB_Table
             result = self.updated_columns (new_columns.map _.as_internal)
             Warning.attach (Deprecated.Warning "Standard.Database.DB_Table.DB_Table" "remove_columns_by_type" "Deprecated: use `remove_columns` with a `By_Type` instead.") result
 
-    ## ALIAS select_blank_fields, select_missing_columns, select_na, filter_blank_columns
+    ## ALIAS filter_blank_columns, select_blank_fields, select_missing_columns, select_na
        GROUP Standard.Base.Selections
        ICON select_column
 
@@ -621,7 +623,7 @@ type DB_Table
                     Warning.with_suspended new_names names->
                         self.updated_columns (self.internal_columns.map c-> c.rename (names.at c.name))
 
-    ## ALIAS rename, header
+    ## ALIAS header, rename
        GROUP Standard.Base.Metadata
        ICON table_edit
        Returns a new table with the columns renamed based on entries in the
@@ -925,6 +927,99 @@ type DB_Table
                 updated_table = renamed_table.updated_columns (renamed_table.internal_columns + [new_column])
                 updated_table.as_subquery
 
+    ## PRIVATE add group column, group id, bucket, tile
+       GROUP Standard.Base.Values
+       ICON column_add
+       Adds a new column to the table enumerating groups of rows, assigning each
+       row to one group number. All rows in each group will get the same number.
+
+       Arguments:
+       - grouping_method: Specifies how to group the rows; see "Grouping
+         Methods", below.
+       - name: The name of the new column. Defaults to "Group".
+       - from: The starting value for the enumeration. Defaults to 0.
+       - step: The amount to increment the enumeration by. Defaults to 1.
+
+       ? Grouping Methods
+
+         The following grouping methods are supported:
+         - `Unique`: Group rows by the specified columns.
+         - Equal_Count: Create the specified number of groups with the same
+           number of rows in each group (except possibly the last one).
+
+       ? Ordering of rows
+
+         Note that the ordering of rows from the original table is preserved in
+         all cases. The grouping and ordering settings can affect how the group
+         numbers are assigned, depending on the grouping method.  The order of
+         the rows itself is not changed by this operation.
+
+       ! Error Conditions
+
+         - If the columns specified in `group_by` or `order_by` are not present
+           in the table, a `Missing_Input_Columns` error is raised.
+         - If the column with the same name as provided `name` already exists,
+           a `Duplicate_Output_Column_Names` problem is reported and the
+           existing column is renamed to avoid the clash.
+         - If grouping on floating point numbers, a `Floating_Point_Equality`
+           problem is reported.
+
+       > Example
+         Assign group numbers based on unique values of the first two columns.
+
+            ## table:
+                x | y | z
+               ---+---+---
+                1 | 0 | 2
+                0 | 1 | 0
+                1 | 2 | 0
+                0 | 1 | 1
+                1 | 0 | 1
+                1 | 2 | 1
+            table = table_builder [['x', [1, 0, 1, 0, 1, 1]], ['y', [0, 1, 2, 1, 0, 2]], ['z' [2, 0, 0, 1, 1, 1]]]
+            table2 = table.add_group_number (..Unique group_by=['x', 'y']) "g"
+            table2.at 'g' . to_vector
+            # => [0, 1, 2, 1, 0, 2]
+            ## table2:
+                x | y | z | g
+               ---+---+---+---
+                1 | 0 | 2 | 0
+                0 | 1 | 0 | 1
+                1 | 2 | 0 | 2
+                0 | 1 | 1 | 1
+                1 | 0 | 1 | 2
+                1 | 2 | 1 | 0
+
+       > Example
+         Divide rows into three groups.
+            ## table:
+                x | y
+               ---+---
+                1 | 5
+                2 | 4
+                3 | 3
+                4 | 2
+                5 | 1
+            table = table_builder [['x', [1, 2, 3, 4, 5]], ['y', [5, 4, 3, 2, 1]]]
+            table2 = tabble.add_group_number (..Equal_Count 3) "g"
+            table2.at 'g' . to_vector
+            # => [0, 0, 1, 1, 2]
+            ## table2:
+                x | y | g
+               ---+---+---
+                1 | 5 | 0
+                2 | 4 | 0
+                3 | 3 | 1
+                4 | 2 | 1
+                5 | 1 | 2
+    @name (Widget.Text_Input display=..Always)
+    @from (Widget.Numeric_Input display=..Always)
+    @group_by (Widget_Helpers.make_column_name_multi_selector display=..When_Modified)
+    @order_by (Widget_Helpers.make_order_by_selector display=..When_Modified)
+    add_group_number self (grouping_method:Grouping_Method=..Unique) (name:Text="Group") (from:Integer=0) (step:Integer=1) (on_problems:Problem_Behavior=..Report_Warning) -> Table =
+        _ = [grouping_method, name, from, step, on_problems]
+        Error.throw (Unsupported_Database_Operation.Error "add_group_number")
+
 
     ## ALIAS order_by
        GROUP Standard.Base.Selections
@@ -1417,7 +1512,7 @@ type DB_Table
         _ = [columns, case_sensitivity, on_problems]
         Error.throw (Unsupported_Database_Operation.Error "duplicates")
 
-    ## ALIAS merge, xlookup, vlookup, hlookup, lookup
+    ## ALIAS hlookup, lookup, merge, vlookup, xlookup
        GROUP Standard.Base.Calculations
        ICON join
        Joins two tables according to the specified join conditions.
@@ -1495,7 +1590,7 @@ type DB_Table
     @join_kind Widget_Helpers.make_join_kind_selector
     @on Widget_Helpers.make_join_condition_selector
     join : DB_Table -> Join_Kind -> Join_Condition | Text | Vector (Join_Condition | Text) -> Text -> Problem_Behavior -> DB_Table
-    join self right (join_kind : Join_Kind = ..Left_Outer) (on : Join_Condition | Text | Vector (Join_Condition | Text) = (default_join_condition self join_kind)) (right_prefix:Text="Right ") (on_problems:Problem_Behavior=..Report_Warning) =
+    join self right=(Missing_Argument.throw "right") (join_kind : Join_Kind = ..Left_Outer) (on : Join_Condition | Text | Vector (Join_Condition | Text) = (default_join_condition self join_kind)) (right_prefix:Text="Right ") (on_problems:Problem_Behavior=..Report_Warning) =
         Feature.Join.if_supported_else_throw self.connection.dialect "join" <|
             self.join_or_cross_join right join_kind on right_prefix on_problems
 
@@ -1610,7 +1705,7 @@ type DB_Table
             on_problems.attach_problems_before limit_problems <|
                 self.join_or_cross_join right join_kind=Join_Kind_Cross on=[] right_prefix on_problems
 
-    ## ALIAS join, xlookup, vlookup, hlookup, lookup
+    ## ALIAS hlookup, join, lookup, vlookup, xlookup
        GROUP Standard.Base.Calculations
        ICON join
        Merges this table with a lookup table.
@@ -1970,7 +2065,7 @@ type DB_Table
 
                         DB_Table.Value union_alias self.connection new_columns new_ctx
 
-    ## ALIAS group by, summarize, count, count distinct, sum, average, mean, median, percentile, mode, standard deviation, variance, minimum, maximum, first, last, shortest, longest
+    ## ALIAS average, count, count distinct, first, group by, last, longest, maximum, mean, median, minimum, mode, percentile, shortest, standard deviation, sum, summarize, variance
        GROUP Standard.Base.Calculations
        ICON transform4
 
@@ -2309,7 +2404,7 @@ type DB_Table
         _ = [columns, format, locale, error_on_missing_columns, on_problems]
         Error.throw (Unsupported_Database_Operation.Error "format")
 
-    ## ALIAS tokenize, parse
+    ## ALIAS parse, tokenize
        GROUP Standard.Base.Conversions
        ICON split
        Splits a column of text into a set of new columns.
@@ -2335,7 +2430,7 @@ type DB_Table
         _ = [column, delimiter, column_count.columns_to_split, on_problems]
         Error.throw (Unsupported_Database_Operation.Error "split_to_columns")
 
-    ## ALIAS tokenize, parse
+    ## ALIAS parse, tokenize
        GROUP Standard.Base.Conversions
        ICON split
        Splits a column of text into a set of new rows.
@@ -2351,7 +2446,7 @@ type DB_Table
         _ = [column, delimiter]
         Error.throw (Unsupported_Database_Operation.Error "split_to_rows")
 
-    ## ALIAS split, parse, regex
+    ## ALIAS parse, regex, split
        GROUP Standard.Base.Conversions
        ICON split
        Tokenizes a column of text into a set of new columns using a regular
@@ -2380,7 +2475,7 @@ type DB_Table
         _ = [column, pattern, case_sensitivity, column_count, on_problems]
         Error.throw (Unsupported_Database_Operation.Error "tokenize_to_columns")
 
-    ## ALIAS split, parse, regex
+    ## ALIAS parse, regex, split
        GROUP Standard.Base.Conversions
        ICON split
        Tokenizes a column of text into a set of new rows using a regular
@@ -2403,7 +2498,7 @@ type DB_Table
         _ = [column, pattern, case_sensitivity, at_least_one_row]
         Error.throw (Unsupported_Database_Operation.Error "tokenize_to_rows")
 
-    ## ALIAS split, tokenize, regex
+    ## ALIAS regex, split, tokenize
        GROUP Standard.Base.Conversions
        ICON split
        Converts a Text column into new columns using a regular expression
@@ -2568,7 +2663,7 @@ type DB_Table
         _ = [columns, shrink_types, error_on_missing_columns, on_problems]
         Error.throw (Unsupported_Database_Operation.Error "auto_cast")
 
-    ## ALIAS drop_missing_rows, dropna, remove_blank_rows, remove_empty_rows, remove_missing_rows, filter_empty_rows, drop_empty_rows
+    ## ALIAS drop_empty_rows, drop_missing_rows, dropna, filter_empty_rows, remove_blank_rows, remove_empty_rows, remove_missing_rows
        GROUP Standard.Base.Selections
        ICON preparation
        Remove rows which are all blank or containing blank values.
@@ -2604,7 +2699,7 @@ type DB_Table
         table = self.connection.read_statement sql
         table.at column_name . at 0
 
-    ## ALIAS load, import
+    ## ALIAS import, load
        GROUP Standard.Base.Input
        ICON data_input
        Returns a materialized dataframe containing rows of this table.
@@ -2781,7 +2876,7 @@ type DB_Table
     to_text : Text
     to_text self = "(Database Table "+self.name.to_text+")"
 
-    ## ALIAS export, save, output, to_file
+    ## ALIAS export, output, save, to_file
        GROUP Standard.Base.Output
        ICON data_output
        This function writes the table into a file.
@@ -3001,7 +3096,7 @@ type DB_Table
             transformer col = col.text_cleanse remove
             Table_Helpers.replace_columns_with_transformed_columns self from transformer
 
-    ## ALIAS cumulative, count, sum, total, minimum, maximum, sum, mean, product, variance, standard deviation
+    ## ALIAS count, cumulative, maximum, mean, minimum, product, standard deviation, sum, sum, total, variance
        GROUP Standard.Base.Values
        ICON data_input
        Adds a new column to the table with a running calculation.
diff --git a/distribution/lib/Standard/Database/0.0.0-dev/src/Feature.enso b/distribution/lib/Standard/Database/0.0.0-dev/src/Feature.enso
index ac8880942439..d82b0d38b0a4 100644
--- a/distribution/lib/Standard/Database/0.0.0-dev/src/Feature.enso
+++ b/distribution/lib/Standard/Database/0.0.0-dev/src/Feature.enso
@@ -31,6 +31,9 @@ type Feature
     ## PRIVATE
        Catch all for tests that haven't yet been categorized correctly or use multiple features.
     Integration_Tests
+    ## PRIVATE
+       add a group number column to a table.
+    Add_Group_Number
     ## PRIVATE
        add a row number column to a table.
     Add_Row_Number
diff --git a/distribution/lib/Standard/Table/0.0.0-dev/src/Columns_To_Keep.enso b/distribution/lib/Standard/Table/0.0.0-dev/src/Columns_To_Keep.enso
index 8ad44c74b53c..70220b04c8c9 100644
--- a/distribution/lib/Standard/Table/0.0.0-dev/src/Columns_To_Keep.enso
+++ b/distribution/lib/Standard/Table/0.0.0-dev/src/Columns_To_Keep.enso
@@ -1,6 +1,6 @@
+import Standard.Base.Errors.Common.Missing_Argument
 from Standard.Base import Text, Vector
 from Standard.Base.Metadata import Display, make_single_choice, Widget
-import Standard.Base.Errors.Common.Missing_Argument
 
 ## Specifies which columns to keep in a union operation.
 type Columns_To_Keep
diff --git a/distribution/lib/Standard/Table/0.0.0-dev/src/Errors.enso b/distribution/lib/Standard/Table/0.0.0-dev/src/Errors.enso
index fcd47b776fb5..6a3013778a23 100644
--- a/distribution/lib/Standard/Table/0.0.0-dev/src/Errors.enso
+++ b/distribution/lib/Standard/Table/0.0.0-dev/src/Errors.enso
@@ -891,9 +891,9 @@ type Mixing_Date_Time_Types
 
 ## Indicates that a table with no rows has been returned.
 type No_Rows
-   ## PRIVATE
-      The message should be used to provide additional context.
-   private Warning message:Text
+    ## PRIVATE
+       The message should be used to provide additional context.
+    private Warning message:Text
 
-   ## PRIVATE
-   to_display_text self -> Text = self.message
+    ## PRIVATE
+    to_display_text self -> Text = self.message
diff --git a/distribution/lib/Standard/Table/0.0.0-dev/src/Excel/Excel_Workbook.enso b/distribution/lib/Standard/Table/0.0.0-dev/src/Excel/Excel_Workbook.enso
index 469ca8961f6b..b414f532c492 100644
--- a/distribution/lib/Standard/Table/0.0.0-dev/src/Excel/Excel_Workbook.enso
+++ b/distribution/lib/Standard/Table/0.0.0-dev/src/Excel/Excel_Workbook.enso
@@ -21,10 +21,10 @@ import project.Excel.Excel_Range.Excel_Range
 import project.Headers.Headers
 import project.Internal.Excel_Reader
 import project.Internal.Excel_Section.Excel_Section
-import project.Internal.Read_Many_As_Merged_Table_Strategy.Read_Many_As_Merged_Table_Strategy
-import project.Internal.Read_Many_As_Merged_Table_Strategy.Read_Many_As_Table_Result
 import project.Internal.Java_Problems
 import project.Internal.Problem_Builder.Problem_Builder
+import project.Internal.Read_Many_As_Merged_Table_Strategy.Read_Many_As_Merged_Table_Strategy
+import project.Internal.Read_Many_As_Merged_Table_Strategy.Read_Many_As_Table_Result
 import project.Match_Columns.Match_Columns
 import project.Return_As_Table.Return_As_Table
 import project.Rows_To_Read.Rows_To_Read
@@ -217,7 +217,7 @@ type Excel_Workbook
         _ = [alias]
         self.read query headers=headers
 
-    ## ALIAS get, range, sheet, worksheet, import, load, open
+    ## ALIAS get, import, load, open, range, sheet, worksheet
        GROUP Standard.Base.Input
        ICON data_input
        Read a range into a Table.
diff --git a/distribution/lib/Standard/Table/0.0.0-dev/src/Extensions/Table_Conversions.enso b/distribution/lib/Standard/Table/0.0.0-dev/src/Extensions/Table_Conversions.enso
index 8feba4e7ec18..147cc3ef1281 100644
--- a/distribution/lib/Standard/Table/0.0.0-dev/src/Extensions/Table_Conversions.enso
+++ b/distribution/lib/Standard/Table/0.0.0-dev/src/Extensions/Table_Conversions.enso
@@ -95,7 +95,7 @@ XML_Element.to_table self =
              headers = Examples.simple_table_json_headers
              Table.from_objects json headers
 @fields (Widget.Vector_Editor item_editor=Widget.Text_Input item_default='""')
-Table.from_objects : Any -> Vector | Nothing -> Boolean -> Table
+Table.from_objects : Any -> Vector | Nothing -> Table
 Table.from_objects value (fields : Vector | Nothing = Nothing) =
     Expand_Objects_Helpers.create_table_from_objects value fields treat_dictionary_as_sequence=False
 
diff --git a/distribution/lib/Standard/Table/0.0.0-dev/src/Grouping_Method.enso b/distribution/lib/Standard/Table/0.0.0-dev/src/Grouping_Method.enso
new file mode 100644
index 000000000000..de5918416be7
--- /dev/null
+++ b/distribution/lib/Standard/Table/0.0.0-dev/src/Grouping_Method.enso
@@ -0,0 +1,24 @@
+from Standard.Base import all
+import Standard.Base.Errors.Common.Missing_Argument
+
+polyglot java import org.enso.table.operations.AddGroupNumber
+
+## Specifies a method for grouping rows in `add_group_number`.
+type Grouping_Method
+    ## Group rows by the specified columns.
+
+       Arguments:
+       - on: Rows that have the same values for these columns will be grouped
+         together. At least one column must be specified.
+    Unique (on:(Vector | Text | Integer | Regex)=(Missing_Argument.throw "on"))
+
+    ## Create the specified number of groups with the same number of rows in
+       each group (except possibly the last one).
+
+       Arguments
+       - group_count: The number of groups to divide the table into.
+       - order_by: (Optional.) Specifies the order in which rows should be
+         assigned to groups. Only affects the assignment of group numbers, not
+         the ordering of the output rows. Defaults to the order of the rows in
+         the table.
+    Equal_Count (group_count:Integer=(Missing_Argument.throw "group_count")) (order_by:(Vector | Text)=[])
diff --git a/distribution/lib/Standard/Table/0.0.0-dev/src/Internal/Add_Group_Number.enso b/distribution/lib/Standard/Table/0.0.0-dev/src/Internal/Add_Group_Number.enso
new file mode 100644
index 000000000000..5aef76394447
--- /dev/null
+++ b/distribution/lib/Standard/Table/0.0.0-dev/src/Internal/Add_Group_Number.enso
@@ -0,0 +1,50 @@
+private
+
+from Standard.Base import all
+import Standard.Base.Errors.Common.Unsupported_Argument_Types
+import Standard.Base.Errors.Illegal_Argument.Illegal_Argument
+
+import project.Column.Column
+import project.Grouping_Method.Grouping_Method
+import project.Internal.Java_Problems
+import project.Internal.Problem_Builder.Problem_Builder
+import project.Internal.Table_Helpers
+import project.Set_Mode.Set_Mode
+import project.Table.Table
+from project.Internal.Add_Row_Number import rename_columns_if_needed
+
+polyglot java import java.lang.ArithmeticException
+polyglot java import org.enso.table.operations.AddGroupNumber
+
+add_group_number (table:Table) (grouping_method:Grouping_Method) (name:Text) (from:Integer) (step:Integer) (on_problems:Problem_Behavior=..Report_Warning) -> Table =
+    problem_builder = Problem_Builder.new error_on_missing_columns=True
+
+    handle_arithmetic_exception _ =
+        Error.throw (Illegal_Argument.Error "The row number has exceeded the 64-bit integer range. BigInteger numbering is currently not supported. Please use a smaller start/step.")
+
+    Panic.catch ArithmeticException handler=handle_arithmetic_exception <| Panic.catch Unsupported_Argument_Types handler=handle_arithmetic_exception <|
+        Java_Problems.with_problem_aggregator on_problems java_problem_aggregator->
+            new_storage = case grouping_method of
+                Grouping_Method.Unique group_by ->
+                    _illegal_if group_by.is_empty "..Unique requires a non-empty 'group_by'" <|
+                        grouping = _prepare_group_by table problem_builder group_by
+                        AddGroupNumber.numberGroupsUnique table.row_count from step grouping java_problem_aggregator
+                Grouping_Method.Equal_Count group_count order_by ->
+                    _illegal_if (group_count < 1) "group_count must be at least 1" <|
+                        ordering = _prepare_ordering table problem_builder order_by
+                        AddGroupNumber.numberGroupsEqualCount table.row_count group_count from step (ordering.at 0) (ordering.at 1) java_problem_aggregator
+            new_column = Column.from_storage name new_storage
+            renamed_table = rename_columns_if_needed table name on_problems Table.new
+            problem_builder.attach_problems_before on_problems <| 
+                renamed_table.set new_column name set_mode=Set_Mode.Add
+
+_prepare_group_by table problem_builder group_by =
+    table.columns_helper.select_columns_helper group_by Case_Sensitivity.Default True problem_builder . map c->c.java_column
+
+_prepare_ordering table problem_builder order_by =
+    ordering = Table_Helpers.resolve_order_by table.columns order_by problem_builder
+    ordering_columns = ordering.map c->c.column.java_column
+    directions = ordering.map c->c.associated_selector.direction.to_sign
+    [ordering_columns, directions]
+
+_illegal_if b msg ~cont = if b then Error.throw (Illegal_Argument.Error msg) else cont
diff --git a/distribution/lib/Standard/Table/0.0.0-dev/src/Internal/Expand_Objects_Helpers.enso b/distribution/lib/Standard/Table/0.0.0-dev/src/Internal/Expand_Objects_Helpers.enso
index 2c6597d803af..05aae41cc0b1 100644
--- a/distribution/lib/Standard/Table/0.0.0-dev/src/Internal/Expand_Objects_Helpers.enso
+++ b/distribution/lib/Standard/Table/0.0.0-dev/src/Internal/Expand_Objects_Helpers.enso
@@ -80,7 +80,7 @@ expand_column (table : Table) (column : Text | Integer) (fields : (Vector Text)
 
      table = Table.new [["aaa", [1, 2]], ["bbb", [[30, 31], [40, 41]]]]
      # => Table.new [["aaa", [1, 1, 2, 2]], ["bbb", [30, 31, 40, 41]]]
-expand_to_rows : Table -> Text | Integer -> Boolean -> Table ! Type_Error | No_Such_Column | Index_Out_Of_Bounds
+expand_to_rows : Table -> Text | Integer -> Boolean -> Boolean -> Table ! Type_Error | No_Such_Column | Index_Out_Of_Bounds
 expand_to_rows table column:(Text | Integer) at_least_one_row=False sequences_only=False = if column.is_a Integer then expand_to_rows table (table.at column).name at_least_one_row else
     row_expander : Any -> Vector
     row_expander value:Convertible_To_Rows =
diff --git a/distribution/lib/Standard/Table/0.0.0-dev/src/Internal/Table_Helpers.enso b/distribution/lib/Standard/Table/0.0.0-dev/src/Internal/Table_Helpers.enso
index 312c052ca6fd..8587e5449244 100644
--- a/distribution/lib/Standard/Table/0.0.0-dev/src/Internal/Table_Helpers.enso
+++ b/distribution/lib/Standard/Table/0.0.0-dev/src/Internal/Table_Helpers.enso
@@ -8,9 +8,9 @@ import project.Blank_Selector.Blank_Selector
 import project.Column.Column
 import project.Expression.Expression
 import project.Internal.Column_Naming_Helper.Column_Naming_Helper
+import project.Internal.Match_Columns_Helpers.Column_Set
 import project.Internal.Problem_Builder.Problem_Builder
 import project.Internal.Value_Type_Helpers
-import project.Internal.Match_Columns_Helpers.Column_Set
 import project.Position.Position
 import project.Set_Mode.Set_Mode
 import project.Sort_Column.Sort_Column
diff --git a/distribution/lib/Standard/Table/0.0.0-dev/src/Internal/Widget_Helpers.enso b/distribution/lib/Standard/Table/0.0.0-dev/src/Internal/Widget_Helpers.enso
index 477d1abad602..89735dc9d141 100644
--- a/distribution/lib/Standard/Table/0.0.0-dev/src/Internal/Widget_Helpers.enso
+++ b/distribution/lib/Standard/Table/0.0.0-dev/src/Internal/Widget_Helpers.enso
@@ -168,6 +168,17 @@ make_join_condition_selector table display:Display=..Always cache=Nothing =
     item_editor = Single_Choice display=display values=names
     Vector_Editor item_editor=item_editor item_default="(..Equals "+table.column_names.first.pretty+")" display=display
 
+## PRIVATE
+make_grouping_method_selector table:Table display:Display=..Always -> Widget =
+    column_selector = make_column_name_selector table display=Display.Always
+    columns_selector = Vector_Editor item_editor=column_selector item_default=table.column_names.first.pretty display=display
+
+    unique = Option "Unique" "..Unique" [["on", columns_selector]]
+    equal_count = Option "Equal Count" "..Equal_Count" [["order_by", columns_selector]]
+    names=[unique, equal_count]
+
+    Single_Choice display=display values=names
+
 ## PRIVATE
    Make a column name selector.
 make_order_by_selector : Table -> Display -> Boolean -> Widget
diff --git a/distribution/lib/Standard/Table/0.0.0-dev/src/Main.enso b/distribution/lib/Standard/Table/0.0.0-dev/src/Main.enso
index 40d3689806de..fea12a3eb9e2 100644
--- a/distribution/lib/Standard/Table/0.0.0-dev/src/Main.enso
+++ b/distribution/lib/Standard/Table/0.0.0-dev/src/Main.enso
@@ -31,6 +31,8 @@ export project.Extensions.Table_Conversions.parse_to_table
 export project.Extensions.Table_Conversions.to_table
 export project.Extensions.Table_Conversions.write_table
 
+export project.Grouping_Method.Grouping_Method
+
 export project.Headers.Headers
 
 export project.Join_Condition.Join_Condition
diff --git a/distribution/lib/Standard/Table/0.0.0-dev/src/Table.enso b/distribution/lib/Standard/Table/0.0.0-dev/src/Table.enso
index 641da532d9b1..19fa076122a4 100644
--- a/distribution/lib/Standard/Table/0.0.0-dev/src/Table.enso
+++ b/distribution/lib/Standard/Table/0.0.0-dev/src/Table.enso
@@ -8,6 +8,7 @@ import Standard.Base.Errors.Common.Additional_Warnings
 import Standard.Base.Errors.Common.Floating_Point_Equality
 import Standard.Base.Errors.Common.Incomparable_Values
 import Standard.Base.Errors.Common.Index_Out_Of_Bounds
+import Standard.Base.Errors.Common.Missing_Argument
 import Standard.Base.Errors.Common.No_Such_Method
 import Standard.Base.Errors.Common.Out_Of_Memory
 import Standard.Base.Errors.Common.Type_Error
@@ -34,6 +35,8 @@ import project.Delimited.Delimited_Format.Delimited_Format
 import project.Expression.Expression
 import project.Expression.Expression_Error
 import project.Extensions.Table_Conversions
+import project.Grouping_Method.Grouping_Method
+import project.Internal.Add_Group_Number
 import project.Internal.Add_Row_Number
 import project.Internal.Add_Running
 import project.Internal.Aggregate_Column_Helper
@@ -2322,6 +2325,99 @@ type Table
     add_row_number self (name:Text="Row") (from:Integer=0) (step:Integer=1) (group_by:(Vector | Text | Integer | Regex)=[]) (order_by:(Vector | Text)=[]) (on_problems:Problem_Behavior=..Report_Warning) =
         Incomparable_Values.handle_errors <| Add_Row_Number.add_row_number self name from step group_by order_by on_problems
 
+    ## PRIVATE add group column, group id, bucket, tile
+       GROUP Standard.Base.Values
+       ICON column_add
+       Adds a new column to the table enumerating groups of rows, assigning each
+       row to one group number. All rows in each group will get the same number.
+
+       Arguments:
+       - grouping_method: Specifies how to group the rows; see "Grouping
+         Methods", below.
+       - name: The name of the new column. Defaults to "Group".
+       - from: The starting value for the enumeration. Defaults to 0.
+       - step: The amount to increment the enumeration by. Defaults to 1.
+
+       ? Grouping Methods
+
+         The following grouping methods are supported:
+         - `Unique`: Group rows by the specified columns.
+         - Equal_Count: Create the specified number of groups with the same
+           number of rows in each group (except possibly the last one).
+
+       ? Ordering of rows
+
+         Note that the ordering of rows from the original table is preserved in
+         all cases. The grouping and ordering settings can affect how the group
+         numbers are assigned, depending on the grouping method.  The order of
+         the rows itself is not changed by this operation.
+
+       ! Error Conditions
+
+         - If the columns specified in `group_by` or `order_by` are not present
+           in the table, a `Missing_Input_Columns` error is raised.
+         - If the column with the same name as provided `name` already exists,
+           a `Duplicate_Output_Column_Names` problem is reported and the
+           existing column is renamed to avoid the clash.
+         - If grouping on floating point numbers, a `Floating_Point_Equality`
+           problem is reported.
+
+       > Example
+         Assign group numbers based on unique values of the first two columns.
+
+            ## table:
+                x | y | z
+               ---+---+---
+                1 | 0 | 2
+                0 | 1 | 0
+                1 | 2 | 0
+                0 | 1 | 1
+                1 | 0 | 1
+                1 | 2 | 1
+            table = table_builder [['x', [1, 0, 1, 0, 1, 1]], ['y', [0, 1, 2, 1, 0, 2]], ['z' [2, 0, 0, 1, 1, 1]]]
+            table2 = table.add_group_number (..Unique group_by=['x', 'y']) "g"
+            table2.at 'g' . to_vector
+            # => [0, 1, 2, 1, 0, 2]
+            ## table2:
+                x | y | z | g
+               ---+---+---+---
+                1 | 0 | 2 | 0
+                0 | 1 | 0 | 1
+                1 | 2 | 0 | 2
+                0 | 1 | 1 | 1
+                1 | 0 | 1 | 2
+                1 | 2 | 1 | 0
+
+       > Example
+         Divide rows into three groups.
+            ## table:
+                x | y
+               ---+---
+                1 | 5
+                2 | 4
+                3 | 3
+                4 | 2
+                5 | 1
+            table = table_builder [['x', [1, 2, 3, 4, 5]], ['y', [5, 4, 3, 2, 1]]]
+            table2 = tabble.add_group_number (..Equal_Count 3) "g"
+            table2.at 'g' . to_vector
+            # => [0, 0, 1, 1, 2]
+            ## table2:
+                x | y | g
+               ---+---+---
+                1 | 5 | 0
+                2 | 4 | 0
+                3 | 3 | 1
+                4 | 2 | 1
+                5 | 1 | 2
+    @grouping_method (Widget_Helpers.make_grouping_method_selector display=..Always)
+    @name (Widget.Text_Input display=..Always)
+    @from (Widget.Numeric_Input display=..Always)
+    @group_by (Widget_Helpers.make_column_name_multi_selector display=..When_Modified)
+    @order_by (Widget_Helpers.make_order_by_selector display=..When_Modified)
+    add_group_number self (grouping_method:Grouping_Method=(Missing_Argument.throw "grouping_method")) (name:Text="Group") (from:Integer=0) (step:Integer=1) (on_problems:Problem_Behavior=..Report_Warning) -> Table =
+        Incomparable_Values.handle_errors <| Add_Group_Number.add_group_number self grouping_method name from step on_problems
+
     ## ALIAS add column, expression, formula, new column, update column
        GROUP Standard.Base.Values
        ICON column_add
@@ -2665,7 +2761,7 @@ type Table
     @join_kind Widget_Helpers.make_join_kind_selector
     @on Widget_Helpers.make_join_condition_selector
     join : Table -> Join_Kind -> Vector (Join_Condition | Text) | Text -> Text -> Problem_Behavior -> Table
-    join self right:Table (join_kind : Join_Kind = ..Left_Outer) on=[Join_Condition.Equals self.column_names.first] right_prefix:Text="Right " on_problems:Problem_Behavior=..Report_Warning = Out_Of_Memory.handle_java_exception "join" <|
+    join self right:Table=(Missing_Argument.throw "right") (join_kind : Join_Kind = ..Left_Outer) on=[Join_Condition.Equals self.column_names.first] right_prefix:Text="Right " on_problems:Problem_Behavior=..Report_Warning = Out_Of_Memory.handle_java_exception "join" <|
         columns_to_keep = case join_kind of
             Join_Kind.Left_Exclusive  -> [True, False]
             Join_Kind.Right_Exclusive -> [False, True]
diff --git a/distribution/lib/Standard/Visualization/0.0.0-dev/src/Table/Visualization.enso b/distribution/lib/Standard/Visualization/0.0.0-dev/src/Table/Visualization.enso
index 8740298839eb..14c7c67f0372 100644
--- a/distribution/lib/Standard/Visualization/0.0.0-dev/src/Table/Visualization.enso
+++ b/distribution/lib/Standard/Visualization/0.0.0-dev/src/Table/Visualization.enso
@@ -137,7 +137,7 @@ make_json_for_object_matrix current vector idx=0 = if idx == vector.length then
 
 ## PRIVATE
    Render Dictionary to JSON
-make_json_for_dictionary : Dictionary -> Integer -> Text -> JS_Object
+make_json_for_dictionary : Dictionary -> Integer -> JS_Object
 make_json_for_dictionary dict max_items =
     header = ["header", ["key", "value"]]
     all_rows = ["all_rows_count", dict.size]
diff --git a/docs/language-server/protocol-language-server.md b/docs/language-server/protocol-language-server.md
index d8cde3239f02..7006d840adf4 100644
--- a/docs/language-server/protocol-language-server.md
+++ b/docs/language-server/protocol-language-server.md
@@ -238,6 +238,8 @@ transport formats, please look [here](./protocol-architecture).
   - [`ExpressionNotFoundError`](#expressionnotfounderror)
   - [`FailedToApplyEdits`](#failedtoapplyedits)
   - [`RefactoringNotSupported`](#refactoringnotsupported)
+  - [`ProjectRenameFailed`](#projectrenamefailed)
+  - [`DefinitionAlreadyExists`](#definitionalreadyexists)
 
 <!-- /MarkdownTOC -->
 
@@ -3151,7 +3153,8 @@ type RefactoringRenameProjectResult = null;
 
 #### Errors
 
-None
+- [`ProjectRenameFailed`](#projectrenamefailed) to signal that the project
+  rename operation has failed.
 
 ### `refactoring/renameSymbol`
 
@@ -3231,6 +3234,8 @@ interface RefactoringRenameSymbolResult {
   operation was not able to apply generated edits.
 - [`RefactoringNotSupported`](#refactoringnotsupported) to signal that the
   refactoring of the given expression is not supported.
+- [`DefinitionAlreadyExists`](#definitionalreadyexists) to signal that the
+  definition with the provided name already exists in scope.
 
 ### `refactoring/projectRenamed`
 
@@ -5911,6 +5916,28 @@ Signals that the refactoring of the given expression is not supported.
 }
 ```
 
+### `ProjectRenameFailed`
+
+Signals that the project rename failed.
+
+```typescript
+"error" : {
+  "code" : 9004,
+  "message" : "Project rename failed [<oldName>, <newName>]"
+}
+```
+
+### `DefinitionAlreadyExists`
+
+Signals that the definition with the provided name already exists in the scope.
+
+```typescript
+"error" : {
+  "code" : 9005,
+  "message" : "Definition [<name>] already exists"
+}
+```
+
 ### `AiHttpError`
 
 Signals about an error during the processing of AI http respnse.
diff --git a/docs/semantics/errors.md b/docs/semantics/errors.md
index 42ca7918cef5..0a64904fd669 100644
--- a/docs/semantics/errors.md
+++ b/docs/semantics/errors.md
@@ -20,8 +20,7 @@ users to deal with errors at runtime in the language.
 
 ## Asynchronous Exceptions
 
-> [!WARNING]
-> The actionables for this section are:
+> [!WARNING] The actionables for this section are:
 >
 > - Why do we call it asynchronous, when they are synchronous!?
 > - Specify the semantics of Enso's async exceptions.
@@ -32,19 +31,16 @@ There is a special [dynamic dispatch](../types/dynamic-dispatch.md) for `Error`
 values. A dataflow error dispatch first checks if it may call a method on
 `Error` type.
 
-> [!WARNING]
-> The actionables for this section are:
+> [!WARNING] The actionables for this section are:
 >
 > - Specify the semantics of Enso's broken values.
 
 ## Warnings
 
-> [!WARNING]
-> TODO
+> [!WARNING] TODO
 >
 > - Values in Enso may have warnings attached
 
 There is a special [dynamic dispatch](../types/dynamic-dispatch.md) for _values
-with warnings_. Before we pass the dispatch to the underlying value,
-we check if warning has a method 'overridden' - this is used for `remove_warnings`,
-etc.
+with warnings_. Before we pass the dispatch to the underlying value, we check if
+warning has a method 'overridden' - this is used for `remove_warnings`, etc.
diff --git a/docs/syntax/README.md b/docs/syntax/README.md
index a933dfdf370f..999e37169156 100644
--- a/docs/syntax/README.md
+++ b/docs/syntax/README.md
@@ -43,7 +43,8 @@ The various components of Enso's syntax are described below:
 - [**Functions:**](./functions.md) The syntax for writing functions in Enso.
 - [**Function Arguments:**](./function-arguments.md) The syntax for function
   arguments in Enso.
-- [**Conversions:**](./conversions.md) The syntax of special _conversion functions_ in Enso.
+- [**Conversions:**](./conversions.md) The syntax of special _conversion
+  functions_ in Enso.
 - [**Field Access:**](./projections.md) The syntax for working with fields of
   data types in Enso.
 - [**Comments:**](./comments.md) The syntax for writing comments in Enso.
diff --git a/docs/syntax/conversions.md b/docs/syntax/conversions.md
index 2a3a2881daa0..2880c1a992a9 100644
--- a/docs/syntax/conversions.md
+++ b/docs/syntax/conversions.md
@@ -8,28 +8,36 @@ order: 10
 
 # Conversions
 
-Conversions are special [functions](./functions.md) associated with a [type](../types/hierarchy.md),
-named `from` and taking single `that` argument. Following example:
+Conversions are special [functions](./functions.md) associated with a
+[type](../types/hierarchy.md), named `from` and taking single `that` argument.
+Following example:
+
 ```ruby
 type Complex
     Num re:Float im:Float
 
 Complex.from (that:Float) = Complex.Num that 0
 ```
-defines type `Complex` and a **conversion** from `Float` which uses the provided `Float` value as
-real part of a complex number while setting the imaginary part to zero.
+
+defines type `Complex` and a **conversion** from `Float` which uses the provided
+`Float` value as real part of a complex number while setting the imaginary part
+to zero.
 
 ## Type Checks
 
-Conversions are integral part of [type checking](../types/inference-and-checking.md#type-checking-algorithm)
+Conversions are integral part of
+[type checking](../types/inference-and-checking.md#type-checking-algorithm)
 during runtime. Having the right conversion in scope one can write:
+
 ```ruby
 complex_pi = 3.14:Complex
 ```
-to create a new instance of type `Complex`. The Enso runtime represents
-the `3.14` literal as `Float` value and that would fail the `Complex` type check if there was no
-conversion method available. However as there is one, the runtime uses `Complex.from` behind the
-scene and `complex_pi` then becomes `Complex.Num 3.14 0` value.
 
-Type checks may perform no, one or multiple conversions (like in case of 
+to create a new instance of type `Complex`. The Enso runtime represents the
+`3.14` literal as `Float` value and that would fail the `Complex` type check if
+there was no conversion method available. However as there is one, the runtime
+uses `Complex.from` behind the scene and `complex_pi` then becomes
+`Complex.Num 3.14 0` value.
+
+Type checks may perform no, one or multiple conversions (like in case of
 [intersection types](../types/intersection-types.md)).
diff --git a/docs/types/README.md b/docs/types/README.md
index 1b8961ec3369..62e0771b1a94 100644
--- a/docs/types/README.md
+++ b/docs/types/README.md
@@ -39,8 +39,7 @@ instrumental for ensuring that we build the right language.
 > described in the [syntax](../syntax/README.md) document makes no promises as
 > to whether said syntax will be exposed in the surface language.
 
-> [!WARNING]
-> The specification in this section is very outdated and far from
+> [!WARNING] The specification in this section is very outdated and far from
 > reality. Sections that are known to be _"off"_ are marked as _warning_.
 
 Information on the type system is broken up into the following sections:
diff --git a/docs/types/access-modifiers.md b/docs/types/access-modifiers.md
index 9102146c0ff7..fcde50cde457 100644
--- a/docs/types/access-modifiers.md
+++ b/docs/types/access-modifiers.md
@@ -8,23 +8,23 @@ order: 4
 
 # Access Modifiers
 
-> [!WARNING]
-> Everybody who ever maintained a large system knows [encapsulation is essential](../semantics/encapsulation.md).
+> [!WARNING] Everybody who ever maintained a large system knows
+> [encapsulation is essential](../semantics/encapsulation.md).
 >
-> While we don't usually like making things private in a programming language, it
-> sometimes the case that it is necessary to indicate that certain fields should
-> not be touched (as this might break invariants and such like). To this end, Enso
-> provides an explicit mechanism for access modification.
+> While we don't usually like making things private in a programming language,
+> it sometimes the case that it is necessary to indicate that certain fields
+> should not be touched (as this might break invariants and such like). To this
+> end, Enso provides an explicit mechanism for access modification.
 
 Enso targets large user base of _non-programmers_. They are mostly focused on
-getting their job done and [encapsulation](../semantics/encapsulation.md) of their own code is the last thing
-that comes to their mind.
+getting their job done and [encapsulation](../semantics/encapsulation.md) of
+their own code is the last thing that comes to their mind.
 
-On the other hand, Enso supports and encourages creation of *sharable libraries*.
-Maintainers of such libraries are likely to treat API design and its
-backward compatibility seriously. As such they need a way to [encapsulate](../semantics/encapsulation.md)
-internals of their libraries and clearly *differentiate public API* and
-implementations details.
+On the other hand, Enso supports and encourages creation of _sharable
+libraries_. Maintainers of such libraries are likely to treat API design and its
+backward compatibility seriously. As such they need a way to
+[encapsulate](../semantics/encapsulation.md) internals of their libraries and
+clearly _differentiate public API_ and implementations details.
 
 <!-- MarkdownTOC levels="2,3" autolink="true" -->
 
@@ -35,27 +35,26 @@ implementations details.
 
 ## Access Modification
 
-*By default* Enso elements (functions, types, methods) are *public*.
-One has to use an access modifier to hide and [encapsulate](../semantics/encapsulation.md) them. The
-reasoning is: those who don't care can access everything they create without
-any restriction. Those who care can make things `private` with an additional
-effort.
+_By default_ Enso elements (functions, types, methods) are _public_. One has to
+use an access modifier to hide and [encapsulate](../semantics/encapsulation.md)
+them. The reasoning is: those who don't care can access everything they create
+without any restriction. Those who care can make things `private` with an
+additional effort.
 
+Accessing any member under an access modifier is an error when performed from
+another project. Such a check is enforced during runtime.
 
-Accessing any member under an access modifier is an error when performed from another project.
-Such a check is enforced during runtime.
-
-There is a command line switch to _disable access modifier check_.
-It maybe be useful for experimentation. However the general suggestion is:
-Avoid using it in production.
+There is a command line switch to _disable access modifier check_. It maybe be
+useful for experimentation. However the general suggestion is: Avoid using it in
+production.
 
 ## Private
 
 Encapsulation is an effective _communication mechanism_ among _distributed
-groups_ of developers. The `private` modifier hides implementation details from clients of the API.
-The primary groups in the Enso case are those who *publish a library*
-and those who *consume such a library*.
+groups_ of developers. The `private` modifier hides implementation details from
+clients of the API. The primary groups in the Enso case are those who _publish a
+library_ and those who _consume such a library_.
 
-As such Enso supports _library private_ encapsulation.
-To hide any element (module, type, constructor, function) away
-from *library consumers* prefix such an element with `private` keyword.
+As such Enso supports _library private_ encapsulation. To hide any element
+(module, type, constructor, function) away from _library consumers_ prefix such
+an element with `private` keyword.
diff --git a/docs/types/contexts.md b/docs/types/contexts.md
index bccd3eeac918..e027139de2d2 100644
--- a/docs/types/contexts.md
+++ b/docs/types/contexts.md
@@ -8,21 +8,20 @@ order: 8
 
 # Monadic Contexts
 
-> [!WARNING]
-> Reword for people without Haskell background who don't know what _lifting_ is.
+> [!WARNING] Reword for people without Haskell background who don't know what
+> _lifting_ is.
 >
 > Coming from a Haskell background, we have found that Monads provide a great
 > abstraction with which to reason about program behaviour, but they have some
-> severe usability issues. The main one of these is the lack of automatic lifting,
-> requiring users to explicitly lift computations through their monad transformer
-> stack.
+> severe usability issues. The main one of these is the lack of automatic
+> lifting, requiring users to explicitly lift computations through their monad
+> transformer stack.
 
 For a language as focused on usability as Enso is importing all the _complexity
-of Haskell monads_ really isn't feasible. To
-that end, we have created the notion of a 'Monadic Context', which is a monad
-transformer based on Supermonads (see
-[references](./references.md#monadic-contexts)). These have special support in
-the compiler, and hence can be automatically lifted to aid usability.
+of Haskell monads_ really isn't feasible. To that end, we have created the
+notion of a 'Monadic Context', which is a monad transformer based on Supermonads
+(see [references](./references.md#monadic-contexts)). These have special support
+in the compiler, and hence can be automatically lifted to aid usability.
 
 > The actionables for this section are:
 >
@@ -45,63 +44,68 @@ the compiler, and hence can be automatically lifted to aid usability.
 
 ## Context Syntax
 
-> [!WARNING]
-> There used to be three main notes about the syntax of contexts:
+> [!WARNING] There used to be three main notes about the syntax of contexts:
 >
 > 1. Monadic contexts are defined using the `in` keyword (e.g. `Int in IO`).
 > 2. We have a symbol `!`, which is short-hand for putting something into the
->   `Exception` monadic context. This is related to broken values.
+>    `Exception` monadic context. This is related to broken values.
 > 3. Contexts can be combined by using the standard typeset operators, or nested
->   through repeated uses of `in`.
-
-There is no special syntax for contexts anymore.
-Since [#3828](https://github.com/enso-org/enso/pull/3828) 
-Enso is no longer relaying on a haskelly solution. 
-Rather than that _contexts_ are being manupulated by
-_standard library_ functions grouped around 
-`Standard.Base.Runtime.Context` & co.
+>    through repeated uses of `in`.
+
+There is no special syntax for contexts anymore. Since
+[#3828](https://github.com/enso-org/enso/pull/3828) Enso is no longer relaying
+on a haskelly solution. Rather than that _contexts_ are being manupulated by
+_standard library_ functions grouped around `Standard.Base.Runtime.Context` &
+co.
+
 ```ruby
 Runtime.Context.Output.with_enabled <|
     File.new "c:\trash.txt" . delete
 ```
 
 There is still the `!` symbol signaling [presence of errors](./errors.md)
-- e.g. _broken values_. However the runtime can handle _broken values_ 
-even without presence of these _exception type signatures_. Thus the
-compiler only verifies the referenced types are valid.
+
+- e.g. _broken values_. However the runtime can handle _broken values_ even
+  without presence of these _exception type signatures_. Thus the compiler only
+  verifies the referenced types are valid.
 
 ## Monadic Bind
 
-> [!WARNING]
-> Who knows what `<-` means in Haskell?
-> 
+> [!WARNING] Who knows what `<-` means in Haskell?
+>
 > It is also important to note that Enso has no equivalent to `<-` in Haskell.
-> Instead, pure computations are implicitly placed in the `Pure` monadic context,
-> and `=` acts to 'peel off' the outermost layer of contexts. As such, this means
-> that `=` _always_ acts as `bind`, greatly simplifying how the type-checker has
-> to work.
+> Instead, pure computations are implicitly placed in the `Pure` monadic
+> context, and `=` acts to 'peel off' the outermost layer of contexts. As such,
+> this means that `=` _always_ acts as `bind`, greatly simplifying how the
+> type-checker has to work.
 
 ## Inbuilt Contexts
 
-Enso standard library defines `Input`, `Output` and `Dataflow_Stack_Trace` 
+Enso standard library defines `Input`, `Output` and `Dataflow_Stack_Trace`
 contects as of Enso 2024.5.1 version. Users cannot define their own.
 
 ### State
 
-The _state_ concept is implement by standard libraries with _no support in the type system_.
+The _state_ concept is implement by standard libraries with _no support in the
+type system_.
+
+State acts as a
+[thread local](https://en.wikipedia.org/wiki/Thread-local_storage) variable of
+operating system:
 
-State acts as a [thread local](https://en.wikipedia.org/wiki/Thread-local_storage) variable
-of operating system:
 <!-- (well, it will when #7117 gets fixed)  -->
+
 - an _initializing code_ can set `State` up
 - execute some code
-- a code somewhere deep the stack (while _initializing code_ is still on the stack)
+- a code somewhere deep the stack (while _initializing code_ is still on the
+  stack)
 - may pick the state up
 - once the _initializing code_ finishes execution
 - the state is gone
 
-It is an example of _tunnelling a value_ from one side (e.g. code) of the "tunnel" to another,
-without the "tunnel" (e.g. thee code in between) knowing about it.
+It is an example of _tunnelling a value_ from one side (e.g. code) of the
+"tunnel" to another, without the "tunnel" (e.g. thee code in between) knowing
+about it.
 
 <!--
 > There has to be some Haskell monad concept for it all... but we don't need it
diff --git a/docs/types/dynamic-dispatch.md b/docs/types/dynamic-dispatch.md
index c334b832b25f..cb31b59fe9cf 100644
--- a/docs/types/dynamic-dispatch.md
+++ b/docs/types/dynamic-dispatch.md
@@ -31,45 +31,45 @@ one to select, the compiler needs to have a notion of _specificity_, which is
 effectively an algorithm for determining which candidate is more specific than
 another.
 
-> [!WARNING]
-> Static compiler selects nothing. The right method to invoke is _selected in the runtime_.
+> [!WARNING] Static compiler selects nothing. The right method to invoke is
+> _selected in the runtime_.
 >
 > - Always prefer a member function for both `x.f y` and `f y x` notations.
-> - Only member functions, current module's functions, and imported functions are
->   considered to be in scope. Local variable `f` could not be used in the `x.f y`
->   syntax.
+> - Only member functions, current module's functions, and imported functions
+>   are considered to be in scope. Local variable `f` could not be used in the
+>   `x.f y` syntax.
 > - Selecting the matching function:
 >   1. Look up the member function. If it exists, select it.
->   2. If not, find all functions with the matching name in the current module and
->      all directly imported modules. These functions are the _candidates_.
->   3. Eliminate any candidate `X` for which there is another candidate `Y` whose
->      `this` argument type is strictly more specific. That is, `Y` this type is a
->      substitution of `X` this type but not vice versa.
->   4. If not all of the remaining candidates have the same this type, the search
->      fails.
->   5. Eliminate any candidate `X` for which there is another candidate `Y` which
->      type signature is strictly more specific. That is, `Y` type signature is a
->      substitution of `X` type signature.
+>   2. If not, find all functions with the matching name in the current module
+>      and all directly imported modules. These functions are the _candidates_.
+>   3. Eliminate any candidate `X` for which there is another candidate `Y`
+>      whose `this` argument type is strictly more specific. That is, `Y` this
+>      type is a substitution of `X` this type but not vice versa.
+>   4. If not all of the remaining candidates have the same this type, the
+>      search fails.
+>   5. Eliminate any candidate `X` for which there is another candidate `Y`
+>      which type signature is strictly more specific. That is, `Y` type
+>      signature is a substitution of `X` type signature.
 >   6. If exactly one candidate remains, select it. Otherwise, the search fails.
 
-The runtime system of Enso identifies the type of a value in `obj.method_name` invocation.
-It checks the _table of virtual methods_ for given type and finds proper
-implementation of `method_name` to invoke. Should there be no method of given
-name in the value's type (or its supertypes like `Any`) to invoke,
-a `No_Such_Method` panic is raised.
+The runtime system of Enso identifies the type of a value in `obj.method_name`
+invocation. It checks the _table of virtual methods_ for given type and finds
+proper implementation of `method_name` to invoke. Should there be no method of
+given name in the value's type (or its supertypes like `Any`) to invoke, a
+`No_Such_Method` panic is raised.
 
-There is a special dispatch for [broken values & warnings](../semantics/errors.md).
+There is a special dispatch for
+[broken values & warnings](../semantics/errors.md).
 
 ## Multiple Dispatch
 
 Multiple dispatch is currently used for
 [binary operators](../syntax/functions.md#type-ascriptions-and-operator-resolution).
 
-Multiple dispatch is also used on `from` conversions, because in
-expression `T.from x` the function to use is based on both `T` and `x`.
+Multiple dispatch is also used on `from` conversions, because in expression
+`T.from x` the function to use is based on both `T` and `x`.
 
-> [!WARNING]
-> Supporting general _multiple dispatch is unlikely_
+> [!WARNING] Supporting general _multiple dispatch is unlikely_
 >
 > Supporting it for general functions remains an open question as to whether we
 > want to support proper multiple dispatch in Enso. Multiple dispatch refers to
@@ -105,5 +105,5 @@ expression `T.from x` the function to use is based on both `T` and `x`.
 >     greet 7  # I have no name
 > ```
 >
->   Here, because `Person` conforms to the `HasName` interface, the second `greet`
->   implementation is chosen because the constraints make it more specific.
+> Here, because `Person` conforms to the `HasName` interface, the second `greet`
+> implementation is chosen because the constraints make it more specific.
diff --git a/docs/types/errors.md b/docs/types/errors.md
index 1b38f4b38add..653645734301 100644
--- a/docs/types/errors.md
+++ b/docs/types/errors.md
@@ -8,12 +8,10 @@ order: 12
 
 # Errors
 
-Enso supports two notions of errors. One is the standard exceptions
-model, while the other is a theory of 'broken values' that propagate through
-computations.
+Enso supports two notions of errors. One is the standard exceptions model, while
+the other is a theory of 'broken values' that propagate through computations.
 
-> [!WARNING]
-> The actionables for this section are:
+> [!WARNING] The actionables for this section are:
 >
 > - Greatly expand on the reasoning and theory behind the two exception models.
 > - Explain why broken values serve the GUI well.
@@ -28,17 +26,17 @@ computations.
 
 ## Async Exceptions
 
-> [!WARNING]
-> The actionables for this section are:
+> [!WARNING] The actionables for this section are:
 >
-> - why is this called _"asynchronous"_ when the `Panic` is raised synchronously?
+> - why is this called _"asynchronous"_ when the `Panic` is raised
+>   synchronously?
 > - Formalise the model of async exceptions as implemented.
 
 ## Broken Values
 
 In Enso we have the notion of a 'broken' value: one which is in an invalid state
-but not an error. While these may initially seem a touch useless,
-they are actually key for the display of errors in the GUI.
+but not an error. While these may initially seem a touch useless, they are
+actually key for the display of errors in the GUI.
 
 Broken values can be thought of like checked monadic exceptions in Haskell, but
 with an automatic propagation mechanism:
@@ -64,8 +62,7 @@ with an automatic propagation mechanism:
 
 - This allows for very natural error handling in the GUI.
 
-> [!WARNING]
-> The actionables for this section are:
+> [!WARNING] The actionables for this section are:
 >
 > - Determine what kinds of APIs we want to use async exceptions for, and which
 >   broken values are more suited for.
diff --git a/docs/types/evaluation.md b/docs/types/evaluation.md
index 6e45a3b4204f..b6a947cd8d5d 100644
--- a/docs/types/evaluation.md
+++ b/docs/types/evaluation.md
@@ -14,16 +14,14 @@ design of certain APIs.
 
 To that end, Enso provides a mechanism for this through the type system.
 
-> [!WARNING]
-> Enso is using `~` and `...` to defer computations and perform them lazily
-> when needed.
+> [!WARNING] Enso is using `~` and `...` to defer computations and perform them
+> lazily when needed.
 >
-> The
-> standard library defines a `Suspend a` type which, when used in explicit type
-> signatures, will cause the corresponding expression to be suspended.
+> The standard library defines a `Suspend a` type which, when used in explicit
+> type signatures, will cause the corresponding expression to be suspended.
 >
-> - The explicit calls to `Suspend` and `force` are inserted automatically by the
->   compiler doing demand analysis.
+> - The explicit calls to `Suspend` and `force` are inserted automatically by
+>   the compiler doing demand analysis.
 > - This demand analysis process will also ensure that there are not polynomial
 >   chains of suspend and force being inserted to ensure performance.
 >
@@ -33,15 +31,15 @@ To that end, Enso provides a mechanism for this through the type system.
 
 A function argument can be prefixed by `~`. That instructs the Enso runtime
 system to provide such an arguments a thunk - a function to be evaluated later.
-Such a thunk function is they evaluated when the value of the argument
-is accessed/used. Such an evaluation is performed every time the argument value
-is used.
+Such a thunk function is they evaluated when the value of the argument is
+accessed/used. Such an evaluation is performed every time the argument value is
+used.
 
 An atom argument can be prefixed by `~`. That instructs the Enso runtime system
 to defer evaluation of the argument until it is first accessed. Then its thunk
-is evaluated and when the evaluation is over, the atom argument value is replaced
-by the computed value. Subsequent access to the atom argument will then use
-the already evaluated value.
+is evaluated and when the evaluation is over, the atom argument value is
+replaced by the computed value. Subsequent access to the atom argument will then
+use the already evaluated value.
 
 <!-- MarkdownTOC levels="2,3" autolink="true" -->
 
@@ -51,11 +49,10 @@ the already evaluated value.
 
 ## Specifying Suspension in the Type System
 
-> [!WARNING]
-> The actionables for this section are:
+> [!WARNING] The actionables for this section are:
 >
 > - Actually specify how the type system interacts with eager and lazy
 >   evaluation.
 
-Just use `~` to mark lazily computed function or atom arguments. The rest is handled
-by the Enso runtime system.
+Just use `~` to mark lazily computed function or atom arguments. The rest is
+handled by the Enso runtime system.
diff --git a/docs/types/function-types.md b/docs/types/function-types.md
index 0d06a187eaab..e95f8237393e 100644
--- a/docs/types/function-types.md
+++ b/docs/types/function-types.md
@@ -11,8 +11,7 @@ order: 3
 As a functional programming language, the type of functions in Enso (`->`) is
 key. There are a few things that should be noted about functions in Enso.
 
-> [!NOTE]
-> The actionables for this section:
+> [!NOTE] The actionables for this section:
 >
 > - Work out a full specification for function typing and behaviour.
 > - Calling a function with an upper-case letter instantiates all of its type
@@ -55,8 +54,8 @@ lexical scoping. For a detailed discussion of scoping, please see
 > ## Structural Type Shorthand
 >
 > In Enso, we want to be able to write a type-signature that represents types in
-> terms of the operations that take place on the input values. A classical example
-> is `add`:
+> terms of the operations that take place on the input values. A classical
+> example is `add`:
 >
 > ```ruby
 > add : a -> b -> b + a
@@ -69,8 +68,8 @@ lexical scoping. For a detailed discussion of scoping, please see
 >   signature that can't work, but the return type, in combination with our
 >   integrated `Convertible` mechanism gives us the tools to make it work.
 > - The return type is `a + b`. This is a shorthand expression for a detailed
->   desugaring. The desugaring provided below is what the typechecker would infer
->   based on such a signature.
+>   desugaring. The desugaring provided below is what the typechecker would
+>   infer based on such a signature.
 >
 > ```ruby
 > add : forall a b c d. ({+ : Convertible b c => a -> c -> d} <: a) => a -> b -> d
@@ -80,23 +79,23 @@ lexical scoping. For a detailed discussion of scoping, please see
 > follows:
 >
 > 1. The expression `b + a` is syntactic sugar for a method call on a: `a.+ b`.
-> 2. This means that there must be a `+` method on a that takes both an `a` and a
->    `b`, with return-type unspecified as of yet: `+ : a -> b -> ?`
+> 2. This means that there must be a `+` method on a that takes both an `a` and
+>    a `b`, with return-type unspecified as of yet: `+ : a -> b -> ?`
 > 3. However, as `Convertible` is built into the language, we have to consider
->    that for `a.+ b` to work, the `+` method can actually take any type to which
->    `b` converts. This introduces the constraint `Convertible b c`, and we get
->    `+ : a -> c -> ?`
+>    that for `a.+ b` to work, the `+` method can actually take any type to
+>    which `b` converts. This introduces the constraint `Convertible b c`, and
+>    we get `+ : a -> c -> ?`
 > 4. The return type from a function need not be determined by its arguments, so
->    hence in the general case we have to default to an unrestricted type variable
->    giving `+ a -> c -> d`.
-> 5. This method must exist on the type `a`, resulting in the constraint that the
->    row `{+ : a -> c -> d} <: a` must conform to that interface.
+>    hence in the general case we have to default to an unrestricted type
+>    variable giving `+ a -> c -> d`.
+> 5. This method must exist on the type `a`, resulting in the constraint that
+>    the row `{+ : a -> c -> d} <: a` must conform to that interface.
 > 6. We now know the return type of `a + b`, and can rewrite it in the signature
 >    as `d`.
 >
-> Please note that `a <: b` (which can be flipped as `:>`) means that `a` is a row
-> that is a sub-row contained within the row `b`. The containment relation allows
-> for the possibility that `a == b`.
+> Please note that `a <: b` (which can be flipped as `:>`) means that `a` is a
+> row that is a sub-row contained within the row `b`. The containment relation
+> allows for the possibility that `a == b`.
 >
 > The inferred type for any function should, in general, match the given type
 > signature. Cases where this break down should only exist where the type
@@ -115,8 +114,7 @@ all arguments have been applied. This operator is `>>` (and its backwards cousin
 arguments, and the result consumes `n` arguments, applies them to `f`, and then
 applies the result of that plus any additional arguments to `g`.
 
-> [!WARNING]
-> Enso does support `>>` as well as `<<` operators, but
+> [!WARNING] Enso does support `>>` as well as `<<` operators, but
 >
 > ```ruby
 > computeCoeff = (+) >> (*5)
@@ -134,8 +132,7 @@ applies the result of that plus any additional arguments to `g`.
 In addition, we have the operator `.`, which acts as standard forward function
 chaining in Enso, and its backwards chaining cousin `<|`.
 
-> [!NOTE]
-> The actionables from this section are:
+> [!NOTE] The actionables from this section are:
 >
 > - Examples for the more advanced use-cases of `>>` to decide if the type
 >   complexity is worth it.
diff --git a/docs/types/goals.md b/docs/types/goals.md
index 11b53d69b584..684049addfea 100644
--- a/docs/types/goals.md
+++ b/docs/types/goals.md
@@ -23,8 +23,7 @@ needs to be as unobtrusive as possible.
 
 The high-level goals for the Enso type system are as follows:
 
-> [!WARNING] 
-> _Not a goal anymore_: Enso is a dynamic language. Static type
+> [!WARNING] _Not a goal anymore_: Enso is a dynamic language. Static type
 > inference is _not needed for execution_. As such _static typing_ is an
 > optional component - more a _linter_ than essential part of the system.
 >
diff --git a/docs/types/hierarchy.md b/docs/types/hierarchy.md
index 20af64e05f0f..a1f96f21c102 100644
--- a/docs/types/hierarchy.md
+++ b/docs/types/hierarchy.md
@@ -14,8 +14,7 @@ most generic type is `Any`. If a value has no better (more specific) type, it
 has the type `Any`. All operations defined on type `Any` can be performed on any
 value in the system.
 
-> [!WARNING] 
-> _Typeset theory is far from current state of affairs_:
+> [!WARNING] _Typeset theory is far from current state of affairs_:
 >
 > Enso is a statically typed language based upon a theory of set-based typing,
 > what we call `typesets`. This is a novel approach, and it is key to our intent
@@ -39,8 +38,7 @@ A value in Enso can have multiple different types attributed to it. It is
 possible to query/inspect these types during runtime and thus decide what
 operations are available for a particular value at hand.
 
-> [!WARNING]
-> _Probably not true in current system at all_
+> [!WARNING] > _Probably not true in current system at all_
 >
 > A brief note on naming (for more, please see the
 > [naming syntax](../syntax/naming.md)):
@@ -87,8 +85,7 @@ v:Maybe
 v.value:Text
 ```
 
-> [!WARNING]
-> There are no _Typesets_ in Enso anymore
+> [!WARNING] There are no _Typesets_ in Enso anymore
 >
 > Typesets in Enso are an entity unique to Enso's type system. They are a
 > fundamental recognition of types as 'sets of values' in Enso, and while they
@@ -144,8 +141,7 @@ They are as follows:
 - **Intersection - `&`:** This operator creates a typeset that contains the
   members in the [intersection of its operands](./intersection-types.md).
 
-> [!WARNING]
-> These operators _don't seem to be supported_. There is no plan to
+> [!WARNING] These operators _don't seem to be supported_. There is no plan to
 > support following operators now:
 >
 > - **Subsumption - `<:`:** This operator asserts that the left hand operand is
@@ -160,8 +156,7 @@ For information on the syntactic usage of these operators, please see the
 section on [type operators](#../syntax/types.md#type-operators) in the syntax
 design documentation.
 
-> [!NOTE]
-> The actionables for this section are:
+> [!NOTE] The actionables for this section are:
 >
 > - When necessary, we need to _explicitly formalise_ the semantics of all of
 >   these operators.
@@ -169,8 +164,7 @@ design documentation.
 >   generative) types?
 > - Are `<:` and `:` equivalent in the surface syntax?
 
-> [!WARNING]
-> _Typeset Subsumption_ isn't relevant
+> [!WARNING] > _Typeset Subsumption_ isn't relevant
 >
 > For two typesets `a` and `b`, `a` is said to be subsumed by `b` (written using
 > the notation `a <: b`) if the following hold recursively. This can be thought
@@ -244,11 +238,11 @@ Historically interfaces used to be defined by _duck typing_. As Enso is a
 dynamic language, having two types with the same operations means they can be
 used interchangingly.
 
-> [!NOTE]
-> A work on [type classes](https://github.com/orgs/enso-org/discussions/11366) support is under way
+> [!NOTE] A work on
+> [type classes](https://github.com/orgs/enso-org/discussions/11366) support is
+> under way
 
-> [!WARNING]
->  _Doesn't match reality:_
+> [!WARNING] _Doesn't match reality:_
 >
 > Because typesets can be matched _structurally_, all typesets implicitly define
 > interfaces. A type `t` conforming to an interface `i` in Enso is as simple as
@@ -305,8 +299,7 @@ _finalizers_.
 An expression `a : b` says that the expression denoted by `a` has the type
 denoted by the expression `b`.
 
-> [!WARNING]
-> No support for Scoping in Type Ascription
+> [!WARNING] No support for Scoping in Type Ascription
 >
 > Enso intends to support some form of mutual scoping between the left and right
 > sides of the type ascription operator. This introduces some complexity into
@@ -323,8 +316,7 @@ denoted by the expression `b`.
 >   bindings in groups, and the desugaring needs to depend on combinations of
 >   `>>=` and `fix`.
 
-> [!WARNING]
-> There are _no projections_ right now and none are planned
+> [!WARNING] There are _no projections_ right now and none are planned
 >
 > In order to work efficiently with typesets, we need the ability to seamlessly
 > access and modify (immutably) their properties. In the context of our type
diff --git a/docs/types/inference-and-checking.md b/docs/types/inference-and-checking.md
index f2c877ab638e..d33d0e7eb16a 100644
--- a/docs/types/inference-and-checking.md
+++ b/docs/types/inference-and-checking.md
@@ -8,8 +8,8 @@ order: 13
 
 # Inference and Checking
 
-In spite of being dynamically-typed language, Enso is built with a sophisticated type checker
-capable of reasoning about Enso typed system. However, a type
+In spite of being dynamically-typed language, Enso is built with a sophisticated
+type checker capable of reasoning about Enso typed system. However, a type
 checker on its own is quite useless. For Enso to truly be usable, it must also
 have a powerful type inference engine.
 
@@ -43,8 +43,7 @@ In order to make Enso's type inference as helpful and friendly as possible to
 our users, we want the ability to infer the _maximal subset_ of the types that
 Enso can express.
 
-> [!WARNING]
-> The actionables for this section are:
+> [!WARNING] The actionables for this section are:
 >
 > - How do we do inference for higher-rank and impredicative instantiations.
 > - How do we infer contexts, and how do we make that inference granular (e.g.
@@ -59,21 +58,18 @@ Enso can express.
 
 ## Type Inference Algorithm
 
-> [!WARNING]
-> The actionables for this section are:
+> [!WARNING] The actionables for this section are:
 >
 > - Specify the inference algorithm.
 
 ### Inferring Dependency
 
-> [!WARNING]
-> The actionables for this section are:
+> [!WARNING] The actionables for this section are:
 >
 > - Specify how (if at all) we can infer dependent quantifiers.
 
 ## Type Checking Algorithm
 
-> [!WARNING]
-> The actionables for this section are:
+> [!WARNING] The actionables for this section are:
 >
 > - Specify the type checking algorithm.
diff --git a/docs/types/intersection-types.md b/docs/types/intersection-types.md
index 919e138a0cc1..dd053d845709 100644
--- a/docs/types/intersection-types.md
+++ b/docs/types/intersection-types.md
@@ -8,50 +8,60 @@ order: 2
 
 # Intersection Types
 
-Intersection types play an important role in Enso [type hierarchy](./hierarchy.md)
-and its visual representation. Having a value that can play _multiple roles_
-at once is essential for smooth _live programming_ manipulation of such a value.
-
-Intersections types are created with the use of [`&` operator](./hierarchy.md#typeset-operators).
-In an attempt to represent `Complex` numbers (with real and imaginary component)
-one may decide to create a type that is both `Complex` and `Float` when the
-imaginary part is `0`:
+Intersection types play an important role in Enso
+[type hierarchy](./hierarchy.md) and its visual representation. Having a value
+that can play _multiple roles_ at once is essential for smooth _live
+programming_ manipulation of such a value.
+
+Intersections types are created with the use of
+[`&` operator](./hierarchy.md#typeset-operators). In an attempt to represent
+`Complex` numbers (with real and imaginary component) one may decide to create a
+type that is both `Complex` and `Float` when the imaginary part is `0`:
+
 ```ruby
 type Complex
     Num re:Float im:Float
-    
-    plain_or_both self = 
+
+    plain_or_both self =
         if self.im != 0 then self else
             both = self.re : Complex&Float
             both # value with both types: Complex and Float
-```   
+```
+
 Having a value with such _intersection type_ allows the IDE to offer operations
 available on all individual types.
 
 ## Creating
 
-Creating a value of _intersection types_ is as simple as performing a type check:
+Creating a value of _intersection types_ is as simple as performing a type
+check:
+
 ```ruby
 self : Complex&Float
 ```
-However such a _type check_ is closely associated with [conversions](../syntax/conversions.md).
-If the value doesn't represent all the desired types yet, then the system looks 
-for [conversion methods](../syntax/conversions.md) being available in the scope like:
+
+However such a _type check_ is closely associated with
+[conversions](../syntax/conversions.md). If the value doesn't represent all the
+desired types yet, then the system looks for
+[conversion methods](../syntax/conversions.md) being available in the scope
+like:
+
 ```
 Complex.from (that:Float) = Complex.Num that 0
 ```
+
 and uses them to create all the values the _intersection type_ represents.
 
-> [!NOTE]
-> Note that if a `Float.from (that:Complex)` conversion were available in the scope, 
-> any `Complex` instance would be convertible to `Float` regardless of how it was constructed. 
-> To ensure that such mix-ins are only available on values that opt-in to being 
-> an intersection type (like in the `Complex` example above where we include 
-> the `Float` mix-in only if `self.im == 0`), we need to ensure that the conversion 
-> used to create the intersection type is not available in the default 
-> conversion resolution scope. Thus it cannot be defined in the same module 
-> as `Complex` or `Float` types, but instead it should be defined in a separate 
-> module that is only imported in the place that will be constructing the multi-values.
+> [!NOTE] Note that if a `Float.from (that:Complex)` conversion were available
+> in the scope, any `Complex` instance would be convertible to `Float`
+> regardless of how it was constructed. To ensure that such mix-ins are only
+> available on values that opt-in to being an intersection type (like in the
+> `Complex` example above where we include the `Float` mix-in only if
+> `self.im == 0`), we need to ensure that the conversion used to create the
+> intersection type is not available in the default conversion resolution scope.
+> Thus it cannot be defined in the same module as `Complex` or `Float` types,
+> but instead it should be defined in a separate module that is only imported in
+> the place that will be constructing the multi-values.
 
 <!--
 Just as demonstrated at
@@ -60,94 +70,113 @@ https://github.com/enso-org/enso/commit/3d8a0e1b90b20cfdfe5da8d2d3950f644a4b45b8
 
 ## Narrowing Type Check
 
-When an _intersection type_ value is being downcast to _some of the types it already represents_,
-these types become its _visible_ types. Any additional types it represents become _hidden_.
+When an _intersection type_ value is being downcast to _some of the types it
+already represents_, these types become its _visible_ types. Any additional
+types it represents become _hidden_.
 
 The following operations consider only the _visible_ part of the type:
+
 - [dynamic dispatch](../types/dynamic-dispatch.md)
 - cases when value is passed as an argument
 
 However the value still keeps internal knowledge of all the types it represents.
 
-Thus, after casting a value `cf:Complex&Float` to just `Complex`, e.g. `c = cf:Complex`:
+Thus, after casting a value `cf:Complex&Float` to just `Complex`, e.g.
+`c = cf:Complex`:
+
 - method calls on `c` will only consider methods defined on `Complex`
-- the value `c` can only be passed as argument to methods expecting `Complex` type
+- the value `c` can only be passed as argument to methods expecting `Complex`
+  type
 - a type error is raised when a `Float` parameter is expected
 
-As such a _static analysis_ knows the type a value _has been cast to_ (the _visible_ part)
-and  can deduce the set of operations that can be performed with it. Moreover, any
-method calls will also only accept the value if it satisfies the type it 
-_has been cast to_. Any additional remaining _hidden_ types
-can only be brought back through an _explicit_ cast.
-To perform an explicit cast that can uncover the 'hidden' part of a type write
-`f = c:Float` or inspect the types in a `case` expression, e.g.
+As such a _static analysis_ knows the type a value _has been cast to_ (the
+_visible_ part) and can deduce the set of operations that can be performed with
+it. Moreover, any method calls will also only accept the value if it satisfies
+the type it _has been cast to_. Any additional remaining _hidden_ types can only
+be brought back through an _explicit_ cast. To perform an explicit cast that can
+uncover the 'hidden' part of a type write `f = c:Float` or inspect the types in
+a `case` expression, e.g.
+
 ```ruby
 case c of
     f : Float -> f.sqrt
     _ -> "Not a float"
 ```
-Remember to use `f.sqrt` and not `c.sqrt`. `f` in the case branch _has been cast to_ `Float` while
-`c` in the case branch only _can be cast to_.
 
-> [!WARNING]
-> Keep in mind that while both argument type check in method definitions and a 
-> 'type asserting' expression look similarly, they have slightly different behaviour.
+Remember to use `f.sqrt` and not `c.sqrt`. `f` in the case branch _has been cast
+to_ `Float` while `c` in the case branch only _can be cast to_.
+
+> [!WARNING] Keep in mind that while both argument type check in method
+> definitions and a 'type asserting' expression look similarly, they have
+> slightly different behaviour.
+>
 > ```
 > f a:Float = a
 > g a = a:Float
 > ```
-> These two functions, while very similar, will have different behaviour when 
-> passed a value like the value `c` above. The function `f` will fail with 
-> a type error, because the visible type of `c` is just `Complex` (assuming 
-> the conversion to `Float` is not available in the current scope). 
-> However, the function `g` will accept the same value and return it as 
-> a `Float` value, based on the 'hidden' part of its type.
-
-> [!NOTE]
-> In the **object oriented terminology** we can think of
-> a type `Complex&Float` as being a subclass of `Complex` and subclass of `Float` types.
-> As such a value of type `Complex&Float` may be used wherever `Complex` or `Float` types
-> are used. Let there, for example, be a function:
+>
+> These two functions, while very similar, will have different behaviour when
+> passed a value like the value `c` above. The function `f` will fail with a
+> type error, because the visible type of `c` is just `Complex` (assuming the
+> conversion to `Float` is not available in the current scope). However, the
+> function `g` will accept the same value and return it as a `Float` value,
+> based on the 'hidden' part of its type.
+
+> [!NOTE] In the **object oriented terminology** we can think of a type
+> `Complex&Float` as being a subclass of `Complex` and subclass of `Float`
+> types. As such a value of type `Complex&Float` may be used wherever `Complex`
+> or `Float` types are used. Let there, for example, be a function:
+>
 > ```ruby
 > use_complex c:Complex callback:(Any -> Any) = callback c
 > ```
-> that accepts `Complex` value and passes it back to a provided callback function.
-> It is possible to pass a value of `Complex&Float` type to such a function. Only
-> operations available on type `Complex` can be performed on value in variable `c`.
 >
-> However the `callback` function may still explicitly cast the value to `Float`.
-> E.g. the following is valid:
+> that accepts `Complex` value and passes it back to a provided callback
+> function. It is possible to pass a value of `Complex&Float` type to such a
+> function. Only operations available on type `Complex` can be performed on
+> value in variable `c`.
+>
+> However the `callback` function may still explicitly cast the value to
+> `Float`. E.g. the following is valid:
+>
 > ```ruby
 > both = v : Complex&Float
 > use_complex both (v-> v:Float . sqrt)
 > ```
-> This behavior is often described as being **open to subclasses**. E.g. the `c:Complex` 
-> check allows values with _intersection types_ that include `Complex` to pass thru with
-> all their runtime information available,
-> but one has to perform an explicit cast to extract the other types associated with
+>
+> This behavior is often described as being **open to subclasses**. E.g. the
+> `c:Complex` check allows values with _intersection types_ that include
+> `Complex` to pass thru with all their runtime information available, but one
+> has to perform an explicit cast to extract the other types associated with
 > such a value.
 
-This behavior allows creation of values with types like `Table&Column` to represent a table
-with a single column - something the users of visual _live programming_ environment of Enso find
-very useful.
+This behavior allows creation of values with types like `Table&Column` to
+represent a table with a single column - something the users of visual _live
+programming_ environment of Enso find very useful.
+
 ```ruby
 Table.join self right:Table -> Table = ...
 ```
-Such a `Table&Column` value can be returned from the above `Table.join` function and while
-having only `Table` behavior by default, still being able to be explicitly casted by the visual environment
-to `Column`. 
+
+Such a `Table&Column` value can be returned from the above `Table.join` function
+and while having only `Table` behavior by default, still being able to be
+explicitly casted by the visual environment to `Column`.
 
 ## Converting Type Check
 
-When an _intersection type_ is being checked against a type it doesn't represent,
-any of its component types can be used for [conversion](../syntax/conversions.md).
-Should there be a `Float` to `Text` conversion:
+When an _intersection type_ is being checked against a type it doesn't
+represent, any of its component types can be used for
+[conversion](../syntax/conversions.md). Should there be a `Float` to `Text`
+conversion:
+
 ```ruby
 Text.from (that:Float) = Float.to_text
 ```
-then `Complex&Float` value `cf` can be typed as `cf:Text`. The value can also
-be converted to another _intersection type_ like `ct = cf:Complex&Text`. In such case
-it looses its `Float` type and `ct:Float` would fail.
 
-In short: when a [conversion](../syntax/conversions.md) is needed to satisfy a type check
-a new value is created to satisfy just the types requested in the check.
+then `Complex&Float` value `cf` can be typed as `cf:Text`. The value can also be
+converted to another _intersection type_ like `ct = cf:Complex&Text`. In such
+case it looses its `Float` type and `ct:Float` would fail.
+
+In short: when a [conversion](../syntax/conversions.md) is needed to satisfy a
+type check a new value is created to satisfy just the types requested in the
+check.
diff --git a/docs/types/modules.md b/docs/types/modules.md
index 564caff5da0b..80a003f53206 100644
--- a/docs/types/modules.md
+++ b/docs/types/modules.md
@@ -26,21 +26,20 @@ types).
 
 ## Resolving Name Clashes
 
-> [!WARNING]
-> There is no `here` keyword anymore and the clash resultion is probably also
-> not working.
+> [!WARNING] There is no `here` keyword anymore and the clash resultion is
+> probably also not working.
 >
 > Enso modules employ the following rules in order to avoid name clashes:
 >
 > - Where the module name clashes with a member contained in the module, the
->   member is preferred. If you need the module you must import it qualified under
->   another name.
-> - We provide the alias `here` as a way to access the name of the current module.
+>   member is preferred. If you need the module you must import it qualified
+>   under another name.
+> - We provide the alias `here` as a way to access the name of the current
+>   module.
 
 ## Scoping and Imports
 
-> [!WARNING]
-> Review by an _imports expert_ is needed!
+> [!WARNING] Review by an _imports expert_ is needed!
 
 To use the contents of a module we need a way to bring them into scope. Like
 most languages, Enso provides an _import_ mechanism for this. Enso has four
diff --git a/docs/types/parallelism.md b/docs/types/parallelism.md
index 4c4930f75961..392c148d71aa 100644
--- a/docs/types/parallelism.md
+++ b/docs/types/parallelism.md
@@ -21,15 +21,13 @@ by the compiler to automatically parallelise some sections of Enso programs.
 
 ## Supporting Parallelism Analysis with Types
 
-> [!WARNING]
-> The actionables for this section are:
+> [!WARNING] The actionables for this section are:
 >
 > - Work out how the type checker can support parallelism analysis.
 
 ## Constructs That Can Be Parallelised
 
-> [!WARNING]
-> The actionables for this section are:
+> [!WARNING] The actionables for this section are:
 >
 > - Provide an analysis of the language constructs that could automatically be
 >   parallelised, and the typing predicates that make them so.
diff --git a/docs/types/pattern-matching.md b/docs/types/pattern-matching.md
index 5580b6e5c28f..d19ee80c62c0 100644
--- a/docs/types/pattern-matching.md
+++ b/docs/types/pattern-matching.md
@@ -48,8 +48,7 @@ case v of
   v3:Vector -> print v3.x
 ```
 
-> [!WARNING]
-> **Unsupported:** Name Matching on Labels
+> [!WARNING] > **Unsupported:** Name Matching on Labels
 >
 > Matching on the labels defined within a type for both atoms and typesets, with
 > renaming.
diff --git a/docs/types/type-directed-programming.md b/docs/types/type-directed-programming.md
index 11e6027ed112..6de9a54db8b6 100644
--- a/docs/types/type-directed-programming.md
+++ b/docs/types/type-directed-programming.md
@@ -14,8 +14,7 @@ based on types. This is an _advanced_ feature and is not expected to be used by
 the novice, but it is nonetheless an important feature for working with a
 powerful type system.
 
-> [!WARNING]
-> The actionables for this section are:
+> [!WARNING] The actionables for this section are:
 >
 > - Just _delete it all_!?
 > - Examine what other ways we can exploit type information to aid development.
@@ -31,30 +30,26 @@ powerful type system.
 
 ## Typed Holes
 
-> [!WARNING]
-> The actionables for this section are:
+> [!WARNING] The actionables for this section are:
 >
 > - Determine how we want to support typed holes.
 > - Determine the syntax for typed holes.
 
 ## Case Splitting
 
-> [!WARNING]
-> The actionables for this section are:
+> [!WARNING] The actionables for this section are:
 >
 > - Determine how we want to support case splitting.
 > - Determine the tooling for case splitting.
 
 ## Row Manipulation
 
-> [!WARNING]
-> The actionables for this section are:
+> [!WARNING] The actionables for this section are:
 >
 > - Determine how we want to support row manipulation.
 
 ## Dependent Sum Manipulation
 
-> [!WARNING]
-> The actionables for this section are:
+> [!WARNING] The actionables for this section are:
 >
 > - Determine how we want to support dependent sum manipulation.
diff --git a/engine/language-server/src/main/scala/org/enso/languageserver/refactoring/RefactoringApi.scala b/engine/language-server/src/main/scala/org/enso/languageserver/refactoring/RefactoringApi.scala
index f31f5d7fd6b4..566afe90388f 100644
--- a/engine/language-server/src/main/scala/org/enso/languageserver/refactoring/RefactoringApi.scala
+++ b/engine/language-server/src/main/scala/org/enso/languageserver/refactoring/RefactoringApi.scala
@@ -77,4 +77,7 @@ object RefactoringApi {
   case class ProjectRenameFailed(oldName: String, newName: String)
       extends Error(9004, s"Project rename failed [$oldName, $newName]")
 
+  case class DefinitionAlreadyExists(name: String)
+      extends Error(9005, s"Definition [$name] already exists")
+
 }
diff --git a/engine/language-server/src/main/scala/org/enso/languageserver/refactoring/RenameFailureMapper.scala b/engine/language-server/src/main/scala/org/enso/languageserver/refactoring/RenameFailureMapper.scala
index e6e2ec460784..a092c38b75fa 100644
--- a/engine/language-server/src/main/scala/org/enso/languageserver/refactoring/RenameFailureMapper.scala
+++ b/engine/language-server/src/main/scala/org/enso/languageserver/refactoring/RenameFailureMapper.scala
@@ -15,6 +15,9 @@ object RenameFailureMapper {
       case error: Api.SymbolRenameFailed.ExpressionNotFound =>
         RefactoringApi.ExpressionNotFoundError(error.expressionId)
 
+      case error: Api.SymbolRenameFailed.DefinitionAlreadyExists =>
+        RefactoringApi.DefinitionAlreadyExists(error.name)
+
       case error: Api.SymbolRenameFailed.FailedToApplyEdits =>
         RefactoringApi.FailedToApplyEdits(error.module)
 
diff --git a/engine/polyglot-api/src/main/scala/org/enso/polyglot/runtime/Runtime.scala b/engine/polyglot-api/src/main/scala/org/enso/polyglot/runtime/Runtime.scala
index 47ad311a518d..9d9ab4ccab90 100644
--- a/engine/polyglot-api/src/main/scala/org/enso/polyglot/runtime/Runtime.scala
+++ b/engine/polyglot-api/src/main/scala/org/enso/polyglot/runtime/Runtime.scala
@@ -1330,11 +1330,18 @@ object Runtime {
         *
         * @param expressionId the id of expression
         */
-
       @named("symbolRenameFailedExpressionNotFound")
       final case class ExpressionNotFound(expressionId: ExpressionId)
           extends SymbolRenameFailed.Error
 
+      /** Signals that the definition with the provided name already exists in the scope.
+        *
+        * @param name the definition name
+        */
+      @named("symbolRenameFailedDefinitionAlreadyExists")
+      final case class DefinitionAlreadyExists(name: String)
+          extends SymbolRenameFailed.Error
+
       /** Signals that it was unable to apply edits to the current module contents.
         *
         * @param module the module name
diff --git a/engine/runtime-compiler/src/main/scala/org/enso/compiler/refactoring/IRUtils.scala b/engine/runtime-compiler/src/main/scala/org/enso/compiler/refactoring/IRUtils.scala
index d2112a03aecd..a319085cbdf3 100644
--- a/engine/runtime-compiler/src/main/scala/org/enso/compiler/refactoring/IRUtils.scala
+++ b/engine/runtime-compiler/src/main/scala/org/enso/compiler/refactoring/IRUtils.scala
@@ -2,8 +2,9 @@ package org.enso.compiler.refactoring
 
 import org.enso.compiler.core.Implicits.AsMetadata
 import org.enso.compiler.core.{ExternalID, IR, Identifier}
-import org.enso.compiler.core.ir.Name
+import org.enso.compiler.core.ir.{Expression, Name}
 import org.enso.compiler.core.ir.expression.Application
+import org.enso.compiler.core.ir.module.scope.definition.Method
 import org.enso.compiler.data.BindingsMap
 import org.enso.compiler.pass.analyse.DataflowAnalysis
 import org.enso.compiler.pass.resolve.MethodCalls
@@ -31,6 +32,69 @@ trait IRUtils {
     None
   }
 
+  /** Find definitions with the provided name.
+    *
+    * @param ir the IR where to search the definition
+    * @param name the definition name to look for
+    * @return the list of definitions with the provided name
+    */
+  def findModuleDefinitions(ir: IR, name: String): Set[IR] = {
+    val builder = Set.newBuilder[IR]
+    IR.preorder(
+      ir,
+      {
+        case methodExplicit: Method.Explicit
+            if methodExplicit.methodName.name == name =>
+          builder.addOne(methodExplicit)
+        case _ =>
+      }
+    )
+    builder.result()
+  }
+
+  /** Find definitions with the provided name.
+    *
+    * @param scope the IR where to search the definition
+    * @param name the definition name to look for
+    * @return the list of definitions with the provided name
+    */
+  def findLocalDefinitions(scope: IR, name: String): Set[IR] = {
+    val builder = Set.newBuilder[IR]
+    IR.preorder(
+      scope,
+      {
+        case expressionBinding: Expression.Binding
+            if expressionBinding.name.name == name =>
+          builder.addOne(expressionBinding)
+        case _ =>
+      }
+    )
+    builder.result()
+  }
+
+  /** Get the [[Expression.Block]] containing the provided expression.
+    *
+    * @param scope the scope where to look
+    * @param expression the expression to look for
+    * @return the block containing the provided expression
+    */
+  def getExpressionBlock(
+    scope: IR,
+    expression: IR
+  ): Option[Expression.Block] = {
+    val blocksBuilder = Set.newBuilder[Expression.Block]
+    IR.preorder(
+      scope,
+      {
+        case block: Expression.Block => blocksBuilder.addOne(block)
+        case _                       =>
+      }
+    )
+    val blocks = blocksBuilder.result()
+
+    blocks.find(block => findById(block, expression.getId).isDefined)
+  }
+
   /** Find usages of a local defined in the body block.
     *
     * @param ir the syntax tree
@@ -63,7 +127,7 @@ trait IRUtils {
     node: Name
   ): Option[Set[Name.Literal]] =
     for {
-      usages <- findDynamicUsages(ir, node)
+      usages <- findDynamicUsages(ir, node.name)
     } yield {
       usages.collect {
         case Application.Prefix(function: Name.Literal, args, _, _, _)
@@ -117,16 +181,16 @@ trait IRUtils {
   /** Find usages of a dynamic dependency in the [[DataflowAnalysis]] metadata.
     *
     * @param ir the syntax tree
-    * @param node the name to look for
+    * @param name the name to look for
     * @return the list of usages of the given name in the `ir`
     */
   private def findDynamicUsages(
     ir: IR,
-    node: Name
+    name: String
   ): Option[Set[IR]] = {
     for {
       metadata <- ir.getMetadata(DataflowAnalysis)
-      key = DataflowAnalysis.DependencyInfo.Type.Dynamic(node.name, None)
+      key = DataflowAnalysis.DependencyInfo.Type.Dynamic(name, None)
       dependents <- metadata.dependents.get(key)
     } yield {
       dependents
diff --git a/engine/runtime-instrument-common/src/main/scala/org/enso/interpreter/instrument/job/RefactoringRenameJob.scala b/engine/runtime-instrument-common/src/main/scala/org/enso/interpreter/instrument/job/RefactoringRenameJob.scala
index dec4f9e0914e..06cc180b90d1 100644
--- a/engine/runtime-instrument-common/src/main/scala/org/enso/interpreter/instrument/job/RefactoringRenameJob.scala
+++ b/engine/runtime-instrument-common/src/main/scala/org/enso/interpreter/instrument/job/RefactoringRenameJob.scala
@@ -58,6 +58,13 @@ final class RefactoringRenameJob(
               )
             )
             Seq()
+          case ex: RefactoringRenameJob.DefinitionAlreadyExists =>
+            reply(
+              Api.SymbolRenameFailed(
+                Api.SymbolRenameFailed.DefinitionAlreadyExists(ex.name)
+              )
+            )
+            Seq()
           case ex: RefactoringRenameJob.FailedToApplyEdits =>
             reply(
               Api.SymbolRenameFailed(
@@ -95,6 +102,26 @@ final class RefactoringRenameJob(
         throw new RefactoringRenameJob.OperationNotSupported(expressionId)
       )
 
+    // check if global definition exists
+    methodDefinition.foreach { _ =>
+      val moduleDefs =
+        IRUtils.findModuleDefinitions(module.getIr, newSymbolName)
+      if (moduleDefs.nonEmpty) {
+        throw new RefactoringRenameJob.DefinitionAlreadyExists(newSymbolName)
+      }
+    }
+
+    // check if local definition exists
+    local.foreach { symbol =>
+      val scopeOpt = IRUtils.getExpressionBlock(module.getIr, symbol)
+      scopeOpt.foreach { scope =>
+        val localDefs = IRUtils.findLocalDefinitions(scope, newSymbolName)
+        if (localDefs.nonEmpty) {
+          throw new RefactoringRenameJob.DefinitionAlreadyExists(newSymbolName)
+        }
+      }
+    }
+
     def localUsages = local.flatMap(IRUtils.findLocalUsages(module.getIr, _))
     def methodDefinitionUsages = methodDefinition.flatMap(
       IRUtils.findModuleMethodUsages(module.getName, module.getIr, _)
@@ -179,6 +206,9 @@ object RefactoringRenameJob {
   final private class ExpressionNotFound(val expressionId: UUID @ExternalID)
       extends Exception(s"Expression was not found by id [$expressionId].")
 
+  final private class DefinitionAlreadyExists(val name: String)
+      extends Exception(s"Definition [$name] already exists in scope")
+
   final private class FailedToApplyEdits(val module: String)
       extends Exception(s"Failed to apply edits to module [$module]")
 
diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/compiler/test/passes/MethodCallsTest.java b/engine/runtime-integration-tests/src/test/java/org/enso/compiler/test/passes/MethodCallsTest.java
index e4b5b79acf19..c79ad1fedccb 100644
--- a/engine/runtime-integration-tests/src/test/java/org/enso/compiler/test/passes/MethodCallsTest.java
+++ b/engine/runtime-integration-tests/src/test/java/org/enso/compiler/test/passes/MethodCallsTest.java
@@ -3,7 +3,11 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.instanceOf;
 import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertSame;
 
+import org.enso.compiler.core.ir.MetadataStorage;
 import org.enso.compiler.core.ir.Module;
 import org.enso.compiler.core.ir.Name;
 import org.enso.compiler.core.ir.expression.Application;
@@ -11,6 +15,7 @@
 import org.enso.compiler.pass.resolve.MethodCalls$;
 import org.enso.test.utils.ContextUtils;
 import org.junit.Test;
+import scala.Option;
 
 public class MethodCallsTest {
   @Test
@@ -44,4 +49,20 @@ private Application.Prefix findMethodCall(Module ir, String methodName) {
     assertThat(res.isDefined(), is(true));
     return (Application.Prefix) res.get();
   }
+
+  @Test
+  public void interningNameLiteralStrings() {
+    var interned = "same_name";
+    var n1 = new String(interned);
+    var n2 = new String(interned);
+    assertNotSame(n1, n2);
+
+    var meta = new MetadataStorage();
+    var l1 = new Name.Literal(n1, false, null, Option.empty(), meta);
+    var l2 = new Name.Literal(n2, false, null, Option.empty(), meta);
+
+    assertEquals("Literals are structurally equal", l1, l2);
+    assertSame("Literals share the same name string", l1.name(), l2.name());
+    assertSame("It is the interned string", l1.name(), interned);
+  }
 }
diff --git a/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/instrument/RuntimeRefactoringTest.scala b/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/instrument/RuntimeRefactoringTest.scala
index c82dde5108ec..9ed928d90fd1 100644
--- a/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/instrument/RuntimeRefactoringTest.scala
+++ b/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/instrument/RuntimeRefactoringTest.scala
@@ -1067,4 +1067,235 @@ class RuntimeRefactoringTest
     )
     context.consumeOut shouldEqual List()
   }
+
+  it should "fail to rename module method when module definition exists" in {
+    val contextId  = UUID.randomUUID()
+    val requestId  = UUID.randomUUID()
+    val moduleName = "Enso_Test.Test.Main"
+
+    val metadata    = new Metadata
+    val idFunction1 = metadata.addItem(31, 9)
+    val code =
+      """from Standard.Base import all
+        |
+        |function1 x = x + 1
+        |
+        |function2 = Nothing
+        |
+        |main =
+        |    operator1 = 41
+        |    operator2 = x -> Main.function1 x
+        |    IO.println (operator2 operator1)
+        |""".stripMargin.linesIterator.mkString("\n")
+    val contents = metadata.appendToCode(code)
+    val mainFile = context.writeMain(contents)
+
+    // create context
+    context.send(Api.Request(requestId, Api.CreateContextRequest(contextId)))
+    context.receive shouldEqual Some(
+      Api.Response(requestId, Api.CreateContextResponse(contextId))
+    )
+
+    // open file
+    context.send(
+      Api.Request(requestId, Api.OpenFileRequest(mainFile, contents))
+    )
+    context.receive shouldEqual Some(
+      Api.Response(Some(requestId), Api.OpenFileResponse)
+    )
+
+    // push main
+    context.send(
+      Api.Request(
+        requestId,
+        Api.PushContextRequest(
+          contextId,
+          Api.StackItem.ExplicitCall(
+            Api.MethodPointer(moduleName, moduleName, "main"),
+            None,
+            Vector()
+          )
+        )
+      )
+    )
+
+    context.receiveNIgnoreStdLib(2) should contain theSameElementsAs Seq(
+      Api.Response(requestId, Api.PushContextResponse(contextId)),
+      context.executionComplete(contextId)
+    )
+    context.consumeOut shouldEqual List("42")
+
+    // rename operator1
+    val newName = "function2"
+    context.send(
+      Api.Request(requestId, Api.RenameSymbol(moduleName, idFunction1, newName))
+    )
+    context.receiveNIgnoreStdLib(1) should contain theSameElementsAs Seq(
+      Api.Response(
+        requestId,
+        Api.SymbolRenameFailed(
+          Api.SymbolRenameFailed.DefinitionAlreadyExists(newName)
+        )
+      )
+    )
+    context.consumeOut shouldEqual List()
+  }
+
+  it should "fail to rename operator when local definition exists" in {
+    val contextId  = UUID.randomUUID()
+    val requestId  = UUID.randomUUID()
+    val moduleName = "Enso_Test.Test.Main"
+
+    val metadata    = new Metadata
+    val idOperator1 = metadata.addItem(42, 9)
+    val code =
+      """from Standard.Base import all
+        |
+        |main =
+        |    operator1 = 41
+        |    operator2 = operator1 + 1
+        |    IO.println operator2
+        |""".stripMargin.linesIterator.mkString("\n")
+    val contents = metadata.appendToCode(code)
+    val mainFile = context.writeMain(contents)
+
+    // create context
+    context.send(Api.Request(requestId, Api.CreateContextRequest(contextId)))
+    context.receive shouldEqual Some(
+      Api.Response(requestId, Api.CreateContextResponse(contextId))
+    )
+
+    // open file
+    context.send(
+      Api.Request(requestId, Api.OpenFileRequest(mainFile, contents))
+    )
+    context.receive shouldEqual Some(
+      Api.Response(Some(requestId), Api.OpenFileResponse)
+    )
+
+    // push main
+    context.send(
+      Api.Request(
+        requestId,
+        Api.PushContextRequest(
+          contextId,
+          Api.StackItem.ExplicitCall(
+            Api.MethodPointer(moduleName, moduleName, "main"),
+            None,
+            Vector()
+          )
+        )
+      )
+    )
+
+    context.receiveNIgnoreStdLib(2) should contain theSameElementsAs Seq(
+      Api.Response(requestId, Api.PushContextResponse(contextId)),
+      context.executionComplete(contextId)
+    )
+    context.consumeOut shouldEqual List("42")
+
+    // rename operator1
+    val newName = "operator2"
+    context.send(
+      Api.Request(requestId, Api.RenameSymbol(moduleName, idOperator1, newName))
+    )
+    context.receiveNIgnoreStdLib(1) should contain theSameElementsAs Seq(
+      Api.Response(
+        requestId,
+        Api.SymbolRenameFailed(
+          Api.SymbolRenameFailed.DefinitionAlreadyExists(newName)
+        )
+      )
+    )
+    context.consumeOut shouldEqual List()
+  }
+
+  it should "rename operator if the same definition exists in different method body" in {
+    val contextId  = UUID.randomUUID()
+    val requestId  = UUID.randomUUID()
+    val moduleName = "Enso_Test.Test.Main"
+    val newName    = "foobarbaz"
+
+    val metadata    = new Metadata
+    val idOperator1 = metadata.addItem(42, 9)
+    val code =
+      s"""from Standard.Base import all
+         |
+         |main =
+         |    operator1 = 41
+         |    operator2 = operator1 + 1
+         |    IO.println operator2
+         |
+         |test =
+         |    $newName = 42
+         |    $newName
+         |""".stripMargin.linesIterator.mkString("\n")
+    val contents = metadata.appendToCode(code)
+    val mainFile = context.writeMain(contents)
+
+    // create context
+    context.send(Api.Request(requestId, Api.CreateContextRequest(contextId)))
+    context.receive shouldEqual Some(
+      Api.Response(requestId, Api.CreateContextResponse(contextId))
+    )
+
+    // open file
+    context.send(
+      Api.Request(requestId, Api.OpenFileRequest(mainFile, contents))
+    )
+    context.receive shouldEqual Some(
+      Api.Response(Some(requestId), Api.OpenFileResponse)
+    )
+
+    // push main
+    context.send(
+      Api.Request(
+        requestId,
+        Api.PushContextRequest(
+          contextId,
+          Api.StackItem.ExplicitCall(
+            Api.MethodPointer(moduleName, moduleName, "main"),
+            None,
+            Vector()
+          )
+        )
+      )
+    )
+
+    context.receiveNIgnoreStdLib(2) should contain theSameElementsAs Seq(
+      Api.Response(requestId, Api.PushContextResponse(contextId)),
+      context.executionComplete(contextId)
+    )
+    context.consumeOut shouldEqual List("42")
+
+    // rename operator1
+    val expectedEdits = Vector(
+      TextEdit(
+        model.Range(model.Position(3, 4), model.Position(3, 13)),
+        newName
+      ),
+      TextEdit(
+        model.Range(model.Position(4, 16), model.Position(4, 25)),
+        newName
+      )
+    )
+    val expectedFileEdit = Api.FileEdit(
+      context.pkg.mainFile,
+      expectedEdits,
+      versionCalculator.evalVersion(contents).toHexString,
+      versionCalculator
+        .evalVersion(contents.replaceAll("operator1", newName))
+        .toHexString
+    )
+    context.send(
+      Api.Request(requestId, Api.RenameSymbol(moduleName, idOperator1, newName))
+    )
+    context.receiveNIgnoreStdLib(4) should contain theSameElementsAs Seq(
+      Api.Response(requestId, Api.SymbolRenamed(newName)),
+      Api.Response(None, expectedFileEdit),
+      TestMessages.pending(contextId, idOperator1),
+      context.executionComplete(contextId)
+    )
+    context.consumeOut shouldEqual List("42")
+  }
 }
diff --git a/engine/runtime-parser/src/main/scala/org/enso/compiler/core/ir/Name.scala b/engine/runtime-parser/src/main/scala/org/enso/compiler/core/ir/Name.scala
index 6509ae2179ee..ebf73ac24217 100644
--- a/engine/runtime-parser/src/main/scala/org/enso/compiler/core/ir/Name.scala
+++ b/engine/runtime-parser/src/main/scala/org/enso/compiler/core/ir/Name.scala
@@ -477,16 +477,34 @@ object Name {
     * @param originalName the name which this literal has replaced, if any
     * @param passData the pass metadata associated with this node
     */
-  sealed case class Literal(
+  sealed case class Literal private (
     override val name: String,
     override val isMethod: Boolean,
     override val identifiedLocation: IdentifiedLocation,
-    originalName: Option[Name]             = None,
-    override val passData: MetadataStorage = new MetadataStorage()
+    private val origName: Name,
+    override val passData: MetadataStorage
   ) extends Name
       with LazyDiagnosticStorage
       with LazyId {
 
+    def this(
+      name: String,
+      isMethod: Boolean,
+      identifiedLocation: IdentifiedLocation,
+      originalName: Option[Name] = None,
+      passData: MetadataStorage  = new MetadataStorage()
+    ) = {
+      this(
+        name.intern(),
+        isMethod,
+        identifiedLocation,
+        originalName.orNull,
+        passData
+      )
+    }
+
+    def originalName: Option[Name] = Option(this.origName)
+
     /** Creates a copy of `this`.
       *
       * @param name        the literal text of the name
@@ -517,7 +535,7 @@ object Name {
         || id != this.id
       ) {
         val res =
-          Literal(name, isMethod, location.orNull, originalName, passData)
+          new Literal(name, isMethod, location.orNull, originalName, passData)
         res.diagnostics = diagnostics
         res.id          = id
         res
@@ -568,6 +586,16 @@ object Name {
     override def showCode(indent: Int): String = name
   }
 
+  object Literal {
+    def apply(
+      name: String,
+      isMethod: Boolean,
+      identifiedLocation: IdentifiedLocation,
+      originalName: Option[Name] = None,
+      passData: MetadataStorage  = new MetadataStorage()
+    ) = new Literal(name, isMethod, identifiedLocation, originalName, passData)
+  }
+
   /** Base trait for annotations. */
   sealed trait Annotation extends Name with module.scope.Definition {
 
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/runtime/warning/SetWarningsNode.java b/engine/runtime/src/main/java/org/enso/interpreter/runtime/warning/SetWarningsNode.java
index b6653e76ed88..eddb8f9ae086 100644
--- a/engine/runtime/src/main/java/org/enso/interpreter/runtime/warning/SetWarningsNode.java
+++ b/engine/runtime/src/main/java/org/enso/interpreter/runtime/warning/SetWarningsNode.java
@@ -1,6 +1,5 @@
 package org.enso.interpreter.runtime.warning;
 
-import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Cached.Shared;
 import com.oracle.truffle.api.dsl.GenerateUncached;
@@ -91,9 +90,7 @@ Object doSetInteropArray(
       } else {
         return new WithWarnings(object, maxWarns, isLimitReached, warnMap);
       }
-    } catch (UnsupportedMessageException | InvalidArrayIndexException e) {
-      throw CompilerDirectives.shouldNotReachHere(e);
-    } catch (ClassCastException e) {
+    } catch (ClassCastException | UnsupportedMessageException | InvalidArrayIndexException e) {
       throw ctx.raiseAssertionPanic(this, "Expected Warning, got something else", e);
     }
   }
@@ -106,7 +103,7 @@ protected static boolean isEmpty(Object warns, InteropLibrary interop) {
       try {
         return interop.getArraySize(warns) == 0;
       } catch (UnsupportedMessageException e) {
-        throw CompilerDirectives.shouldNotReachHere(e);
+        return false;
       }
     }
     return false;
diff --git a/lib/java/persistance-dsl/src/main/java/org/enso/persist/impl/PersistableProcessor.java b/lib/java/persistance-dsl/src/main/java/org/enso/persist/impl/PersistableProcessor.java
index 933a3c1c5402..54e8d687b15b 100644
--- a/lib/java/persistance-dsl/src/main/java/org/enso/persist/impl/PersistableProcessor.java
+++ b/lib/java/persistance-dsl/src/main/java/org/enso/persist/impl/PersistableProcessor.java
@@ -139,12 +139,14 @@ && isVisibleFrom(e, orig))
       if (constructors.size() > 1) {
         var snd = (ExecutableElement) constructors.get(1);
         if (richerConstructor.compare(cons, snd) == 0) {
-          processingEnv
-              .getMessager()
-              .printMessage(
-                  Kind.ERROR,
-                  "There should be exactly one 'richest' constructor in " + typeElem,
-                  orig);
+          var sb = new StringBuilder();
+          sb.append("There should be exactly one 'richest' constructor in ")
+              .append(typeElem)
+              .append(". Found:");
+          for (var c : constructors) {
+            sb.append("\n  ").append(c);
+          }
+          processingEnv.getMessager().printMessage(Kind.ERROR, sb.toString(), orig);
           return false;
         }
       }
@@ -288,8 +290,12 @@ private int countInlineRef(List<? extends VariableElement> parameters) {
     var cnt = 0;
     for (var p : parameters) {
       var type = tu.asElement(tu.erasure(p.asType()));
-      if (type != null && type.getSimpleName().toString().equals("Reference")) {
-        cnt++;
+      if (type != null) {
+        switch (type.getSimpleName().toString()) {
+          case "Reference" -> cnt++;
+          case "Option" -> cnt++;
+          default -> {}
+        }
       }
     }
     return cnt;
diff --git a/lib/scala/pkg/src/main/resources/default/src/Main.enso b/lib/scala/pkg/src/main/resources/default/src/Main.enso
index 7ca2e86a8126..0cab68b6dbb2 100644
--- a/lib/scala/pkg/src/main/resources/default/src/Main.enso
+++ b/lib/scala/pkg/src/main/resources/default/src/Main.enso
@@ -3,7 +3,9 @@ from Standard.Table import all
 from Standard.Database import all
 from Standard.AWS import all
 from Standard.Google_Api import all
+from Standard.Microsoft import all
 from Standard.Snowflake import all
+from Standard.Tableau import all
 import Standard.Examples
 import Standard.Visualization
 
@@ -13,5 +15,5 @@ main =
 
 
 #### METADATA ####
-[[{"index":{"value":270},"size":{"value":26}},"fcf199e6-d2b1-44b7-be92-a47545d6a593"]]
-{"ide":{"node":{"fcf199e6-d2b1-44b7-be92-a47545d6a593":{"position":{"vector":[-388,282]},"visualization":{"show":true,"width":1027.671875,"height":193}}},"import":{}}}
\ No newline at end of file
+[[{"index":{"value":338},"size":{"value":26}},"fcf199e6-d2b1-44b7-be92-a47545d6a593"]]
+{"ide":{"node":{"fcf199e6-d2b1-44b7-be92-a47545d6a593":{"position":{"vector":[-388,282]},"visualization":{"show":true,"width":1129.671875,"height":252}}},"widget":{},"import":{},"snapshot":"eJyFkEEKwjAURPc5xT9BwQN0UVFcuaroskzbRD7+5JckpeLpRVBRpHU38B4DMy6qpzoj9Ih9sUayxH7QmAkixn3RA1pZwBtktIsF1amehzvVs9imGnje2XMXNanL80oddHKCy78dGD+FZ3wr2yv8IDb9gCOnEcI3ZNZgjAcHKg0RkWOxKyrpcUMRLXp6lRSTlU69NXf7xIOE"}}
\ No newline at end of file
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 721e4b97fc7a..95232e097053 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -459,8 +459,8 @@ importers:
         specifier: ^21.1.1
         version: 21.1.7
       '@types/mapbox-gl':
-        specifier: ^2.7.13
-        version: 2.7.21
+        specifier: ^3.4.1
+        version: 3.4.1
       '@types/node':
         specifier: ^22.9.0
         version: 22.9.0
@@ -3220,8 +3220,8 @@ packages:
   '@types/linkify-it@5.0.0':
     resolution: {integrity: sha512-sVDA58zAw4eWAffKOaQH5/5j3XeayukzDk+ewSsnv3p4yJEZHCCzMDiZM8e0OUrRvmpGZ85jf4yDHkHsgBNr9Q==}
 
-  '@types/mapbox-gl@2.7.21':
-    resolution: {integrity: sha512-Dx9MuF2kKgT/N22LsMUB4b3acFZh9clVqz9zv1fomoiPoBrJolwYxpWA/9LPO/2N0xWbKi4V+pkjTaFkkx/4wA==}
+  '@types/mapbox-gl@3.4.1':
+    resolution: {integrity: sha512-NsGKKtgW93B+UaLPti6B7NwlxYlES5DpV5Gzj9F75rK5ALKsqSk15CiEHbOnTr09RGbr6ZYiCdI+59NNNcAImg==}
 
   '@types/markdown-it@12.2.3':
     resolution: {integrity: sha512-GKMHFfv3458yYy+v/N8gjufHO6MSZKCOXpZc5GXIWWy8uldwfmPn98vp81gZ5f9SVw8YYBctgfJ22a2d7AOMeQ==}
@@ -11374,7 +11374,7 @@ snapshots:
 
   '@types/linkify-it@5.0.0': {}
 
-  '@types/mapbox-gl@2.7.21':
+  '@types/mapbox-gl@3.4.1':
     dependencies:
       '@types/geojson': 7946.0.14
 
diff --git a/std-bits/base/src/main/java/org/enso/base/cache/ReloadDetector.java b/std-bits/base/src/main/java/org/enso/base/cache/ReloadDetector.java
index 5328c8003a16..d1f308353cd8 100644
--- a/std-bits/base/src/main/java/org/enso/base/cache/ReloadDetector.java
+++ b/std-bits/base/src/main/java/org/enso/base/cache/ReloadDetector.java
@@ -32,7 +32,7 @@ private void resetEnsoReloadDetector() {
             "Standard.Base.Network.Reload_Detector", "create_reload_detector");
   }
 
-  void simulateReloadTestOnly() {
+  public void simulateReloadTestOnly() {
     EnsoMeta.callStaticModuleMethod(
         "Standard.Base.Network.Reload_Detector", "simulate_reload_test_only", ensoReloadDetector);
   }
diff --git a/std-bits/table/src/main/java/org/enso/table/excel/ExcelConnectionPool.java b/std-bits/table/src/main/java/org/enso/table/excel/ExcelConnectionPool.java
index 92f4db31721a..af8a43263ac3 100644
--- a/std-bits/table/src/main/java/org/enso/table/excel/ExcelConnectionPool.java
+++ b/std-bits/table/src/main/java/org/enso/table/excel/ExcelConnectionPool.java
@@ -20,6 +20,7 @@
 import org.apache.poi.poifs.filesystem.POIFSFileSystem;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.enso.base.cache.ReloadDetector;
 import org.enso.table.excel.xssfreader.XSSFReaderWorkbook;
 
 public class ExcelConnectionPool {
@@ -36,6 +37,8 @@ public ReadOnlyExcelConnection openReadOnlyConnection(File file, ExcelFileFormat
                 + "written to. This is a bug in the Table library.");
       }
 
+      clearOnReload();
+
       if (!file.exists()) {
         throw new FileNotFoundException(file.toString());
       }
@@ -209,6 +212,29 @@ void release(ReadOnlyExcelConnection excelConnection) throws IOException {
   private final HashMap<String, ConnectionRecord> records = new HashMap<>();
   private boolean isCurrentlyWriting = false;
 
+  /** Used to clear the ConnectionRecord on reload. */
+  private final ReloadDetector reloadDetector = new ReloadDetector();
+
+  /** If a reload has just happened, clear the ConnectionRecord cache. */
+  private void clearOnReload() throws IOException {
+    if (reloadDetector.hasReloadOccurred()) {
+      for (var record : records.values()) {
+        record.close();
+      }
+      records.clear();
+    }
+  }
+
+  /** Public for testing. */
+  public int getConnectionRecordCount() {
+    return records.size();
+  }
+
+  /** Public for testing. */
+  public void simulateReloadTestOnly() {
+    reloadDetector.simulateReloadTestOnly();
+  }
+
   static class ConnectionRecord {
     private int refCount;
     private File file;
diff --git a/std-bits/table/src/main/java/org/enso/table/excel/xssfreader/XSSFReaderSheetXMLHandler.java b/std-bits/table/src/main/java/org/enso/table/excel/xssfreader/XSSFReaderSheetXMLHandler.java
index f3ea10bcbba3..9b6dba021e57 100644
--- a/std-bits/table/src/main/java/org/enso/table/excel/xssfreader/XSSFReaderSheetXMLHandler.java
+++ b/std-bits/table/src/main/java/org/enso/table/excel/xssfreader/XSSFReaderSheetXMLHandler.java
@@ -131,6 +131,7 @@ public void startElement(String uri, String localName, String qName, Attributes
           break;
         case "is": // Inline String
           isIsOpen = true;
+          value.setLength(0);
           break;
       }
     }
diff --git a/std-bits/table/src/main/java/org/enso/table/operations/AddGroupNumber.java b/std-bits/table/src/main/java/org/enso/table/operations/AddGroupNumber.java
new file mode 100644
index 000000000000..1899130f25d0
--- /dev/null
+++ b/std-bits/table/src/main/java/org/enso/table/operations/AddGroupNumber.java
@@ -0,0 +1,122 @@
+package org.enso.table.operations;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.IntStream;
+import org.enso.base.text.TextFoldingStrategy;
+import org.enso.table.data.column.storage.Storage;
+import org.enso.table.data.column.storage.numeric.LongStorage;
+import org.enso.table.data.column.storage.type.IntegerType;
+import org.enso.table.data.index.OrderedMultiValueKey;
+import org.enso.table.data.index.UnorderedMultiValueKey;
+import org.enso.table.data.table.Column;
+import org.enso.table.problems.ColumnAggregatedProblemAggregator;
+import org.enso.table.problems.ProblemAggregator;
+import org.enso.table.util.ConstantList;
+
+public class AddGroupNumber {
+  public static Storage<?> numberGroupsUnique(
+      long numRows,
+      long start,
+      long step,
+      Column[] groupingColumns,
+      ProblemAggregator problemAggregator) {
+    if (groupingColumns.length == 0) {
+      throw new IllegalArgumentException("At least one grouping column is required.");
+    }
+
+    var groupNumberIterator = new StepIterator(start, step);
+
+    long[] numbers = new long[Math.toIntExact(numRows)];
+
+    Storage<?>[] groupingStorages =
+        Arrays.stream(groupingColumns).map(Column::getStorage).toArray(Storage[]::new);
+    ColumnAggregatedProblemAggregator groupingProblemAggregator =
+        new ColumnAggregatedProblemAggregator(problemAggregator);
+    List<TextFoldingStrategy> textFoldingStrategy =
+        ConstantList.make(TextFoldingStrategy.unicodeNormalizedFold, groupingStorages.length);
+    Map<UnorderedMultiValueKey, Long> groupNumbers = new HashMap<>();
+
+    for (int i = 0; i < numRows; i++) {
+      var key = new UnorderedMultiValueKey(groupingStorages, i, textFoldingStrategy);
+      key.checkAndReportFloatingEquality(
+          groupingProblemAggregator, columnIx -> groupingColumns[columnIx].getName());
+      var groupNumber = groupNumbers.computeIfAbsent(key, k -> groupNumberIterator.next());
+      numbers[i] = groupNumber;
+    }
+
+    return new LongStorage(numbers, IntegerType.INT_64);
+  }
+
+  public static Storage<?> numberGroupsEqualCount(
+      long numRows,
+      int groupCount,
+      long start,
+      long step,
+      Column[] orderingColumns,
+      int[] directions,
+      ProblemAggregator problemAggregator) {
+    long[] numbers = new long[Math.toIntExact(numRows)];
+
+    var equalCountGenerator = new EqualCountGenerator(start, step, numRows, groupCount);
+
+    if (orderingColumns.length == 0) {
+      for (int i = 0; i < numRows; ++i) {
+        numbers[i] = equalCountGenerator.next();
+      }
+    } else {
+      Storage<?>[] orderingStorages =
+          Arrays.stream(orderingColumns).map(Column::getStorage).toArray(Storage[]::new);
+      List<OrderedMultiValueKey> keys =
+          new ArrayList<>(
+              IntStream.range(0, Math.toIntExact(numRows))
+                  .mapToObj(i -> new OrderedMultiValueKey(orderingStorages, i, directions))
+                  .toList());
+      keys.sort(null);
+      for (var key : keys) {
+        var i = key.getRowIndex();
+        numbers[i] = equalCountGenerator.next();
+      }
+    }
+
+    return new LongStorage(numbers, IntegerType.INT_64);
+  }
+
+  private static class StepIterator {
+    private final long step;
+    private long current;
+
+    public StepIterator(long start, long step) {
+      this.step = step;
+      this.current = start;
+    }
+
+    public long next() {
+      var toReturn = current;
+      current = Math.addExact(current, step);
+      return toReturn;
+    }
+  }
+
+  private static class EqualCountGenerator {
+    private final long start;
+    private final long step;
+    private long currentIndex = 0;
+    private final long groupSize;
+
+    public EqualCountGenerator(long start, long step, long totalCount, long numgroups) {
+      this.start = start;
+      this.step = step;
+      groupSize = (long) Math.ceil((double) totalCount / (double) numgroups);
+    }
+
+    public long next() {
+      long toReturn = Math.addExact(start, Math.multiplyExact(step, (currentIndex / groupSize)));
+      currentIndex = Math.addExact(currentIndex, 1L);
+      return toReturn;
+    }
+  }
+}
diff --git a/test/Base_Tests/src/Semantic/Warnings_Spec.enso b/test/Base_Tests/src/Semantic/Warnings_Spec.enso
index aca9c4778eac..7e9969f1ca4b 100644
--- a/test/Base_Tests/src/Semantic/Warnings_Spec.enso
+++ b/test/Base_Tests/src/Semantic/Warnings_Spec.enso
@@ -451,6 +451,11 @@ add_specs suite_builder = suite_builder.group "Dataflow Warnings" group_builder-
         res2 . should_equal True
         Warning.get_all res2 . map .value . should_equal ["WARNING2"]
 
+    group_builder.specify "warning & panic" <|
+        panic_text = Panic.catch Standard.Base.Errors.Common.Type_Error (Warning.set 1 2) caught_panic->
+            caught_panic.payload.to_text
+        panic_text . should_equal "Type error: expected `warnings` to be Vector, but got Integer."
+
 main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
diff --git a/test/Base_Tests/src/System/File_Spec.enso b/test/Base_Tests/src/System/File_Spec.enso
index f6d6ff9d7452..4f56688efa4f 100644
--- a/test/Base_Tests/src/System/File_Spec.enso
+++ b/test/Base_Tests/src/System/File_Spec.enso
@@ -910,8 +910,8 @@ add_specs suite_builder =
 
         group_builder.specify "should list files in a directory" <|
             root = enso_project.data / "tree"
-            immediate = root.list.map .to_text . sort
-            expected = [root / "sample.csv", root / "sample.txt", root / "subdirectory"].map .to_text . sort
+            immediate = root.list.map .to_text
+            expected = [root / "sample.csv", root / "sample.txt", root / "subdirectory"].map .to_text
             immediate.should_equal expected
 
             filtered1 = root.list name_filter="s[a-cw]mple.{t?t,md}"
@@ -920,35 +920,49 @@ add_specs suite_builder =
             filtered2 = Data.list root name_filter="*di*"
             filtered2.should_equal [root / "subdirectory"]
 
+        group_builder.specify "File.list should sort its result" <|
+            dir = enso_project.data / "list_sort"
+            dir.delete_if_exists recursive=True
+            dir.create_directory
+
+            nums = (0.up_to 10 . to_vector) + (30.down_to 20 . to_vector)
+            nums.each i->
+                f = dir / i.to_text
+                "abcd".write f
+                lst = dir.list
+                lst . should_equal (lst.sort on=.path)
+
+            dir.delete recursive=True . should_succeed
+
         group_builder.specify "should list files in a directory recursively" <|
             root = enso_project.data / "tree"
             resolve files = files.map str-> (root / str) . to_text
 
             all = root.list recursive=True . map .to_text
-            all.sort.should_equal (resolve ["", "sample.csv", "sample.txt", "subdirectory", "subdirectory/a.txt", "subdirectory/nested", "subdirectory/nested/b.txt"])
+            all.should_equal (resolve ["", "sample.csv", "sample.txt", "subdirectory", "subdirectory/a.txt", "subdirectory/nested", "subdirectory/nested/b.txt"])
 
             filtered1 = root.list name_filter="**.txt" recursive=True . map .to_text
-            filtered1.sort.should_equal (resolve ["sample.txt", "subdirectory/a.txt", "subdirectory/nested/b.txt"])
+            filtered1.should_equal (resolve ["sample.txt", "subdirectory/a.txt", "subdirectory/nested/b.txt"])
 
             filtered1b = root.list name_filter="*.txt" recursive=True . map .to_text
-            filtered1b.sort.should_equal (resolve ["sample.txt", "subdirectory/a.txt", "subdirectory/nested/b.txt"])
+            filtered1b.should_equal (resolve ["sample.txt", "subdirectory/a.txt", "subdirectory/nested/b.txt"])
 
             # It should also work if more complicated pattern is used
             filtered1c = root.list name_filter="{*.txt,foobarbaz}" recursive=True . map .to_text
-            filtered1c.sort.should_equal (resolve ["sample.txt", "subdirectory/a.txt", "subdirectory/nested/b.txt"])
+            filtered1c.should_equal (resolve ["sample.txt", "subdirectory/a.txt", "subdirectory/nested/b.txt"])
 
             # And correctly match file 'starts with' condition in recursive mode
             filtered1d = root.list name_filter="a*.txt" recursive=True . map .to_text
-            filtered1d.sort.should_equal (resolve ["subdirectory/a.txt"])
+            filtered1d.should_equal (resolve ["subdirectory/a.txt"])
 
             filtered2 = root.list name_filter="*/*/*" recursive=True . map .to_text
             filtered2.should_equal (resolve ["subdirectory/nested/b.txt"])
 
             filtered3 = root.list name_filter="a.txt" recursive=True . map .to_text
-            filtered3.sort.should_equal (resolve ["subdirectory/a.txt"])
+            filtered3.should_equal (resolve ["subdirectory/a.txt"])
 
             filtered4 = root.list name_filter="nested/*.txt" recursive=True . map .to_text
-            filtered4.sort.should_equal (resolve ["subdirectory/nested/b.txt"])
+            filtered4.should_equal (resolve ["subdirectory/nested/b.txt"])
 
         add_create_and_delete_directory_specs group_builder (enso_project.data / "transient")
 
diff --git a/test/Table_Tests/data/Sales_Sample_Data.xlsx b/test/Table_Tests/data/Sales_Sample_Data.xlsx
new file mode 100644
index 000000000000..c0ad6987020c
Binary files /dev/null and b/test/Table_Tests/data/Sales_Sample_Data.xlsx differ
diff --git a/test/Table_Tests/src/Common_Table_Operations/Add_Group_Number_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Add_Group_Number_Spec.enso
new file mode 100644
index 000000000000..57ea0cb3b498
--- /dev/null
+++ b/test/Table_Tests/src/Common_Table_Operations/Add_Group_Number_Spec.enso
@@ -0,0 +1,152 @@
+from Standard.Base import all
+import Standard.Base.Errors.Common.Floating_Point_Equality
+import Standard.Base.Errors.Common.Missing_Argument
+import Standard.Base.Errors.Illegal_Argument.Illegal_Argument
+
+import Standard.Database.Feature.Feature
+from Standard.Database.Errors import all
+
+from Standard.Table import all
+from Standard.Table.Errors import Missing_Input_Columns, Duplicate_Output_Column_Names
+
+from Standard.Test import all
+
+from project.Common_Table_Operations.Util import run_default_backend
+import project.Util
+
+polyglot java import java.lang.Long as Java_Long
+
+main filter=Nothing = run_default_backend add_specs filter
+
+add_specs suite_builder setup =
+    if setup.is_database.not then (add_group_number_specs suite_builder setup) else
+        suite_builder.group setup.prefix+"Table.add_group_number" group_builder->
+            group_builder.specify "add_group_number should report unsupported" <|
+                table_builder = setup.light_table_builder
+                t = table_builder [['x', [1, 2, 3, 4, 5]], ['y', [5, 4, 3, 2, 1]], ['z', [1, 5, 4, 2, 3]]]
+                t.add_group_number (..Equal_Count 3) "g" . should_fail_with (Unsupported_Database_Operation.Error "add_group_number")
+
+add_group_number_specs suite_builder setup =
+    prefix = setup.prefix
+    # materialize = setup.materialize
+    # create_connection_fn = setup.create_connection_func
+
+    suite_builder.group prefix+"Table.add_group_number (common)" group_builder->
+        table_builder = setup.table_builder
+        table_builder_from_rows column_names rows = table_builder (column_names.zip rows.transpose c-> col-> [c, col])
+
+        group_builder.specify "should add group number by unique values" <|
+            t = table_builder_from_rows ['x', 'y', 'z'] [[1, 0, 2], [0, 1, 0], [1, 2, 0], [0, 1, 1], [1, 0, 1], [1, 2, 1]]
+
+            g0 = t.add_group_number (..Unique on=['x', 'y']) "g"
+            g0.at 'g' . to_vector . should_equal [0, 1, 2, 1, 0, 2]
+
+            g1 = t.add_group_number (..Unique on=['x', 'z']) "g"
+            g1.at 'g' . to_vector . should_equal [0, 1, 2, 3, 4, 4]
+
+            g2 = t.add_group_number (..Unique on=['y', 'z']) "g"
+            g2.at 'g' . to_vector . should_equal [0, 1, 2, 3, 4, 5]
+
+        group_builder.specify "should add group number by equal counts" <|
+            t = table_builder [['x', [1, 2, 3, 4, 5]], ['y', [5, 4, 3, 2, 1]], ['z', [1, 5, 4, 2, 3]]]
+
+            g0 = t.add_group_number (..Equal_Count 3) "g"
+            g0.at 'g' . to_vector . should_equal [0, 0, 1, 1, 2]
+
+            g1 = t.add_group_number (..Equal_Count 3 order_by=['x']) "g"
+            g1.at 'g' . to_vector . should_equal [0, 0, 1, 1, 2]
+
+            g2 = t.add_group_number (..Equal_Count 3 order_by=['y']) "g"
+            g2.at 'g' . to_vector . should_equal [2, 1, 1, 0, 0]
+
+            g3 = t.add_group_number (..Equal_Count 3 order_by='z') "g"
+            g3.at 'g' . to_vector . should_equal [0, 2, 1, 0, 1]
+
+            g4 = t.add_group_number (..Equal_Count 2) "g"
+            g4.at 'g' . to_vector . should_equal [0, 0, 0, 1, 1]
+
+            g5 = t.add_group_number (..Equal_Count 2 order_by=['x']) "g"
+            g5.at 'g' . to_vector . should_equal [0, 0, 0, 1, 1]
+
+            g6 = t.add_group_number (..Equal_Count 2 order_by=['y']) "g"
+            g6.at 'g' . to_vector . should_equal [1, 1, 0, 0, 0]
+
+            g7 = t.add_group_number (..Equal_Count 2 order_by='z') "g"
+            g7.at 'g' . to_vector . should_equal [0, 1, 1, 0, 0]
+
+            g8 = t.add_group_number (..Equal_Count 1) "g"
+            g8.at 'g' . to_vector . should_equal [0, 0, 0, 0, 0]
+
+            g9 = t.add_group_number (..Equal_Count 1 order_by=['x']) "g"
+            g9.at 'g' . to_vector . should_equal [0, 0, 0, 0, 0]
+
+            g10 = t.add_group_number (..Equal_Count 1 order_by=['y']) "g"
+            g10.at 'g' . to_vector . should_equal [0, 0, 0, 0, 0]
+
+
+        group_builder.specify "should add group number by unique values" <|
+            t = table_builder_from_rows ['x', 'y', 'z'] [[1, 0, 2], [0, 1, 0], [1, 2, 0], [0, 1, 1], [1, 0, 1], [1, 2, 1]]
+
+            g0 = t.add_group_number (..Unique on=['x', 'y'])
+            g0.at 'Group' . to_vector . should_equal [0, 1, 2, 1, 0, 2]
+
+        group_builder.specify "should add group number by unique values, with from and step" <|
+            t = table_builder_from_rows ['x', 'y', 'z'] [[1, 0, 2], [0, 1, 0], [1, 2, 0], [0, 1, 1], [1, 0, 1], [1, 2, 1]]
+
+            g0 = t.add_group_number (..Unique on=['x', 'y']) "g" from=10 step=3
+            g0.at 'g' . to_vector . should_equal [10, 13, 16, 13, 10, 16]
+
+        group_builder.specify "should add group number by equal counts, with from and step" <|
+            t = table_builder [['x', [1, 2, 3, 4, 5]], ['y', [5, 4, 3, 2, 1]], ['z', [1, 5, 4, 2, 3]]]
+
+            g0 = t.add_group_number (..Equal_Count 3) "g" from=10 step=3
+            g0.at 'g' . to_vector . should_equal [10, 10, 13, 13, 16]
+
+        group_builder.specify "must specify group_by with Unique" <|
+            t = table_builder_from_rows ['x', 'y', 'z'] [[1, 0, 2], [0, 1, 0], [1, 2, 0], [0, 1, 1], [1, 0, 1], [1, 2, 1]]
+
+            t.add_group_number ..Unique "g" . should_fail_with Missing_Argument
+
+        group_builder.specify "must specify nonempty group_by with Unique" <|
+            t = table_builder_from_rows ['x', 'y', 'z'] [[1, 0, 2], [0, 1, 0], [1, 2, 0], [0, 1, 1], [1, 0, 1], [1, 2, 1]]
+
+            t.add_group_number (..Unique on=[]) "g" . should_fail_with Illegal_Argument
+
+        group_builder.specify "must specify one or more groups with Equal_Count" <|
+            t = table_builder [['x', [1, 2, 3, 4, 5]], ['y', [5, 4, 3, 2, 1]], ['z', [1, 5, 4, 2, 3]]]
+            t.add_group_number (..Equal_Count 0) "g" . should_fail_with Illegal_Argument
+            t.add_group_number (..Equal_Count -1) "g" . should_fail_with Illegal_Argument
+
+        group_builder.specify "should report floating point equality warning when grouping on float columns" <|
+            t = table_builder_from_rows ['x', 'y', 'z'] [[1.0, 0.0, 2.0], [0.0, 1.0, 0.0], [1.0, 2.0, 0.0], [0.0, 1.0, 1.0], [1.0, 0.0, 1.0], [1.0, 2.0, 1.0]]
+            g0 = t.add_group_number (..Unique on=['x', 'y']) "g"
+            Problems.expect_warning Floating_Point_Equality g0
+
+        group_builder.specify "should fail if columns provided in group_by do not exist" <|
+            t = table_builder_from_rows ['x', 'y', 'z'] [[1, 0, 2], [0, 1, 0], [1, 2, 0], [0, 1, 1], [1, 0, 1], [1, 2, 1]]
+
+            t.add_group_number (..Unique on=['x', 'q']) . should_fail_with Missing_Input_Columns
+
+        group_builder.specify "should fail if columns provided in order_by do not exist" <|
+            t = table_builder [['x', [1, 2, 3, 4, 5]], ['y', [5, 4, 3, 2, 1]], ['z', [1, 5, 4, 2, 3]]]
+
+            t.add_group_number (..Equal_Count 3 order_by=['q']) "g" . should_fail_with Missing_Input_Columns
+
+        group_builder.specify "will fail if the row number exceeds Long range" <|
+            max_long = Java_Long.MAX_VALUE
+
+            t = table_builder_from_rows ['x', 'y', 'z'] [[1, 0, 2], [0, 1, 0], [1, 2, 0], [0, 1, 1], [1, 0, 1], [1, 2, 1]]
+
+            Problems.assume_no_problems <| t.add_group_number (..Unique on=['x', 'y']) "g" from=(max_long - 10)
+
+            t2 = t.add_group_number (..Unique on=['x', 'y']) "g" from=(max_long - 1)
+            t2.should_fail_with Illegal_Argument
+            t2.catch.to_display_text . should_contain "The row number has exceeded the 64-bit integer range"
+
+        group_builder.specify "should rename existing column upon a name clash, and attach a warning" <|
+            t = table_builder_from_rows ['x', 'y', 'z'] [['b', 'a', 'c'], ['a', 'b', 'a'], ['b', 'b', 'a'], ['a', 'b', 'b'], ['b', 'a', 'b'], ['b', 'b', 'b']]
+
+            g0 = t.add_group_number (..Unique on=['x', 'y']) "y"
+            g0.at 'y' . to_vector . should_equal [0, 1, 2, 1, 0, 2]
+            g0.at 'y 1' . to_vector . should_equal ['a', 'b', 'b', 'b', 'a', 'b']
+            Problems.expect_warning Duplicate_Output_Column_Names g0
diff --git a/test/Table_Tests/src/Common_Table_Operations/Main.enso b/test/Table_Tests/src/Common_Table_Operations/Main.enso
index e963e1c051eb..c5aeabe281e9 100644
--- a/test/Table_Tests/src/Common_Table_Operations/Main.enso
+++ b/test/Table_Tests/src/Common_Table_Operations/Main.enso
@@ -4,6 +4,7 @@ import Standard.Database.Internal.Replace_Params.Replace_Params
 
 from Standard.Test import Test
 
+import project.Common_Table_Operations.Add_Group_Number_Spec
 import project.Common_Table_Operations.Add_Row_Number_Spec
 import project.Common_Table_Operations.Aggregate_Spec
 import project.Common_Table_Operations.Coalesce_Spec
@@ -141,6 +142,7 @@ add_specs suite_builder setup =
     Distinct_Spec.add_specs suite_builder setup
     Cross_Tab_Spec.add_specs suite_builder setup
     Transpose_Spec.add_specs suite_builder setup
+    Add_Group_Number_Spec.add_specs suite_builder setup
     Add_Row_Number_Spec.add_specs suite_builder setup
     Integration_Tests.add_specs suite_builder setup
     Temp_Column_Spec.add_specs suite_builder setup
diff --git a/test/Table_Tests/src/IO/Excel_Spec.enso b/test/Table_Tests/src/IO/Excel_Spec.enso
index 0a14e2c546da..9e3f417ab1e0 100644
--- a/test/Table_Tests/src/IO/Excel_Spec.enso
+++ b/test/Table_Tests/src/IO/Excel_Spec.enso
@@ -24,6 +24,7 @@ from project.Common_Table_Operations.Util import within_table
 from project.IO.Read_Many_Spec import with_temp_dir
 
 polyglot java import org.enso.table_test_helpers.RandomHelpers
+polyglot java import org.enso.table.excel.ExcelConnectionPool
 
 spec_fmt suite_builder header file read_method sheet_count=5 =
     suite_builder.group header group_builder->
@@ -1151,6 +1152,26 @@ add_specs suite_builder =
                 r3.at "Value" . at 0 . should_be_a Table
                 r3.at "Value" . at 1 . should_be_a Excel_Workbook
 
+        group_builder.specify "should clear cache on simulated reload" <|
+            ExcelConnectionPool.INSTANCE.simulateReloadTestOnly
+            check_workbook <| xlsx_sheet.read
+            ExcelConnectionPool.INSTANCE.getConnectionRecordCount . should_equal 1
+            check_workbook <| xlsx_sheet.read
+            ExcelConnectionPool.INSTANCE.getConnectionRecordCount . should_equal 1
+            check_workbook <| xls_sheet.read
+            ExcelConnectionPool.INSTANCE.getConnectionRecordCount . should_equal 2
+            check_workbook <| xls_sheet.read
+            ExcelConnectionPool.INSTANCE.getConnectionRecordCount . should_equal 2
+            ExcelConnectionPool.INSTANCE.simulateReloadTestOnly
+            check_workbook <| xlsx_sheet.read
+            ExcelConnectionPool.INSTANCE.getConnectionRecordCount . should_equal 1
+            check_workbook <| xlsx_sheet.read
+            ExcelConnectionPool.INSTANCE.getConnectionRecordCount . should_equal 1
+            check_workbook <| xls_sheet.read
+            ExcelConnectionPool.INSTANCE.getConnectionRecordCount . should_equal 2
+            check_workbook <| xls_sheet.read
+            ExcelConnectionPool.INSTANCE.getConnectionRecordCount . should_equal 2
+
     suite_builder.group "Problems" group_builder->
         group_builder.specify "should report a user-friendly error message when format is missing a required argument" <|
             r = xlsx_sheet.read (..Range)
@@ -1218,6 +1239,29 @@ add_specs suite_builder =
             workbook.close . should_equal Nothing
             workbook.read "Sheet1" . should_fail_with Illegal_State
 
+        group_builder.specify "should be able to read a XLSX with inline strings" <|
+            workbook = (enso_project.data / "Sales_Sample_Data.xlsx") . read
+            workbook.sheet_count . should_equal 29
+            workbook.sheet_names . should_equal ['202201', '202202', '202203', '202204', '202205', '202206', '202207', '202208', '202209', '202210', '202211', '202212', '202301', '202302', '202303', '202304', '202305', '202306', '202307', '202308', '202309', '202310', '202311', '202312', '202401', '202402', '202403', '202404', '202405']
+
+            column_names = ['TERRITORY', 'DEALSIZE', 'PRODUCTLINE', 'OrderCount', 'SALES']
+
+            first_sheet = workbook.read '202201'
+            first_sheet.column_names . should_equal column_names
+            first_sheet.at 'TERRITORY' . to_vector . should_equal ['EMEA', 'NA', 'EMEA', 'EMEA', 'EMEA', 'EMEA', 'NA', 'EMEA', 'EMEA', 'EMEA']
+            first_sheet.at 'DEALSIZE' . to_vector . should_equal ['Medium', 'Medium', 'Small', 'Small', 'Small', 'Medium', 'Small', 'Medium', 'Small', 'Medium']
+            first_sheet.at 'PRODUCTLINE' . to_vector . should_equal ['Classic Cars', 'Vintage Cars', 'Classic Cars', 'Vintage Cars', 'Trucks and Buses', 'Trains', 'Vintage Cars', 'Vintage Cars', 'Trains', 'Trucks and Buses']
+            first_sheet.at 'OrderCount' . to_vector . should_equal [7, 3, 3, 7, 2, 1, 3, 3, 1, 9]
+            first_sheet.at 'SALES' . to_vector . should_equal [34585.61, 13349.31, 6606.17, 15482.34, 2856.68, 3227.63, 5647.99, 12347.2, 1705.92, 33944.75]
+
+            last_sheet = workbook.read '202405'
+            last_sheet.column_names . should_equal column_names
+            last_sheet.at 'TERRITORY' . to_vector . should_equal ['NA', 'EMEA', 'EMEA', 'NA', 'EMEA', 'EMEA', 'NA', 'EMEA', 'EMEA', 'EMEA', 'NA', 'NA', 'EMEA', 'EMEA', 'EMEA', 'NA', 'EMEA', 'NA']
+            last_sheet.at 'DEALSIZE' . to_vector . should_equal ['Large', 'Medium', 'Small', 'Medium', 'Medium', 'Small', 'Small', 'Medium', 'Medium', 'Small', 'Medium', 'Small', 'Small', 'Small', 'Large', 'Medium', 'Large', 'Small']
+            last_sheet.at 'PRODUCTLINE' . to_vector . should_equal ['Classic Cars', 'Planes', 'Trucks and Buses', 'Classic Cars', 'Trucks and Buses', 'Vintage Cars', 'Vintage Cars', 'Classic Cars', 'Motorcycles', 'Classic Cars', 'Trucks and Buses', 'Trains', 'Planes', 'Motorcycles', 'Classic Cars', 'Trains', 'Trucks and Buses', 'Trucks and Buses']
+            last_sheet.at 'OrderCount' . to_vector . should_equal [2, 4, 2, 5, 3, 2, 1, 10, 1, 6, 3, 1, 6, 1, 3, 1, 1, 2]
+            last_sheet.at 'SALES' . to_vector . should_equal [16914.55, 17742.36, 3838.83, 22429.29, 14910.28, 3513.13, 2095.45, 46915.8, 4764.6, 8776.53, 14680.72, 1193.04, 12686.65, 2803.2, 28823.4, 3256.35, 8498.0, 4772.04]
+
         group_builder.specify "should be able to read a mixed Date and DateTime column" <|
             table = (enso_project.data / "MixedExcel.xlsx") . read ..Sheet
             table.row_count . should_equal 5
diff --git a/test/Table_Tests/src/IO/Fetch_Spec.enso b/test/Table_Tests/src/IO/Fetch_Spec.enso
index b1c33445065f..0e27747890c4 100644
--- a/test/Table_Tests/src/IO/Fetch_Spec.enso
+++ b/test/Table_Tests/src/IO/Fetch_Spec.enso
@@ -228,16 +228,16 @@ add_specs suite_builder =
         group_builder.specify "Cache policy should work for HTTP.fetch" pending=pending_has_url <| Test.with_retries <|
             with_default_cache <|
                 expect_counts [0, 0] <|
-                    HTTP.fetch url0 cache_policy=Cache_Policy.No_Cache
-                    HTTP.fetch url1 cache_policy=Cache_Policy.No_Cache
+                    HTTP.fetch url0 cache_policy=Cache_Policy.No_Cache . decode_as_text
+                    HTTP.fetch url1 cache_policy=Cache_Policy.No_Cache . decode_as_text
                 expect_counts [0, 2] <|
-                    HTTP.fetch url0 cache_policy=Cache_Policy.Use_Cache
-                    HTTP.fetch url1 cache_policy=Cache_Policy.Use_Cache
+                    HTTP.fetch url0 cache_policy=Cache_Policy.Use_Cache . decode_as_text
+                    HTTP.fetch url1 cache_policy=Cache_Policy.Use_Cache . decode_as_text
 
             with_default_cache <|
                 expect_counts [0, 2] <|
-                    HTTP.fetch url0
-                    HTTP.fetch url1
+                    HTTP.fetch url0 . decode_as_text
+                    HTTP.fetch url1 . decode_as_text
 
         group_builder.specify "Cache policy should work for Data.fetch" pending=pending_has_url <| Test.with_retries <|
             with_default_cache <|
@@ -412,11 +412,11 @@ add_specs suite_builder =
 
         group_builder.specify "Should not cache if the request fails" pending=pending_has_url <| Test.with_retries <|
             with_default_cache <|
-                HTTP.fetch url0
+                HTTP.fetch url0 . decode_as_text
                 get_num_response_cache_entries . should_equal 1
-                HTTP.fetch base_url_with_slash+'crash'
+                HTTP.fetch base_url_with_slash+'crash' . decode_as_text
                 get_num_response_cache_entries . should_equal 1
-                HTTP.fetch base_url_with_slash+'nonexistent_endpoint'
+                HTTP.fetch base_url_with_slash+'nonexistent_endpoint' . decode_as_text
                 get_num_response_cache_entries . should_equal 1
 
         cloud_setup = Cloud_Tests_Setup.prepare
@@ -437,9 +437,9 @@ add_specs suite_builder =
                         . add_query_argument "arg1" secret2
                         . add_query_argument "arg2" "plain value"
 
-                    HTTP.fetch url1
+                    HTTP.fetch url1 . decode_as_text
                     get_num_response_cache_entries . should_equal 1
-                    HTTP.fetch uri2
+                    HTTP.fetch uri2 . decode_as_text
                     get_num_response_cache_entries . should_equal 2
 
         group_builder.specify "Should work with secrets in the headers" pending=pending_has_url <| Test.with_retries <|
@@ -455,9 +455,9 @@ add_specs suite_builder =
                     headers1 = [Header.new "A-Header" secret1]
                     headers2 = [Header.new "A-Header" secret2]
 
-                    HTTP.fetch headers=headers1 uri
+                    HTTP.fetch headers=headers1 uri . decode_as_text
                     get_num_response_cache_entries . should_equal 1
-                    HTTP.fetch headers=headers2 uri
+                    HTTP.fetch headers=headers2 uri . decode_as_text
                     get_num_response_cache_entries . should_equal 2
 
         group_builder.specify "Does not attempt to make room for the maximum file size when that is larger than the total cache size" pending=pending_has_url <| Test.with_retries <|
@@ -545,24 +545,24 @@ add_specs suite_builder =
                 LRUCache.new . getSettings . getTotalCacheLimit . should_equal (TotalCacheLimit.Percentage.new 0.2)
 
         group_builder.specify "Cache should be cleared when a reload is detected" <|
-            HTTP.fetch base_url_with_slash+'test_download?length=10'
-            HTTP.fetch base_url_with_slash+'test_download?length=11'
-            HTTP.fetch base_url_with_slash+'test_download?length=12'
+            HTTP.fetch base_url_with_slash+'test_download?length=10' . decode_as_text
+            HTTP.fetch base_url_with_slash+'test_download?length=11' . decode_as_text
+            HTTP.fetch base_url_with_slash+'test_download?length=12' . decode_as_text
             get_num_response_cache_entries . should_equal 3
 
             fake_reload
 
             get_num_response_cache_entries . should_equal 3  # Cleaning is not triggered until the next request
-            HTTP.fetch base_url_with_slash+'test_download?length=10'
+            HTTP.fetch base_url_with_slash+'test_download?length=10' . decode_as_text
             get_num_response_cache_entries . should_equal 1
-            HTTP.fetch base_url_with_slash+'test_download?length=14'
-            HTTP.fetch base_url_with_slash+'test_download?length=15'
+            HTTP.fetch base_url_with_slash+'test_download?length=14' . decode_as_text
+            HTTP.fetch base_url_with_slash+'test_download?length=15' . decode_as_text
             get_num_response_cache_entries . should_equal 3
 
             fake_reload
 
             get_num_response_cache_entries . should_equal 3  # Cleaning is not triggered until the next request
-            HTTP.fetch base_url_with_slash+'test_download?length=16'
+            HTTP.fetch base_url_with_slash+'test_download?length=16' . decode_as_text
             get_num_response_cache_entries . should_equal 1
 
         group_builder.specify "Reissues the request if the cache file disappears" pending=pending_has_url <| Test.with_retries <|