diff --git a/.editorconfig b/.editorconfig
index f833f74d..78135c43 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -13,8 +13,11 @@ max_line_length = off
 trim_trailing_whitespace = true
 # Trailing comma language feature requires Kotlin plugin 1.4+, at the moment the compilation is done with Kotlin 1.3.
 # This helps IDEA to format the code properly, see also spotless { } in build.gradle.kts.
-ij_kotlin_allow_trailing_comma = false # Only used for declaration site 
+ij_kotlin_allow_trailing_comma = false # Only used for declaration site
 ij_kotlin_allow_trailing_comma_on_call_site = false
 
 [*.bat]
 end_of_line = crlf
+
+[*.yml]
+indent_size = 2
diff --git a/.github/workflows/gradle-latest-versions.yml b/.github/workflows/gradle-latest-versions.yml
new file mode 100644
index 00000000..6c18ab9f
--- /dev/null
+++ b/.github/workflows/gradle-latest-versions.yml
@@ -0,0 +1,41 @@
+name: Gradle latest versions tests
+
+on:
+  schedule:
+    - cron: "0 7 * * MON"
+  workflow_dispatch:
+
+jobs:
+  gradle-compatTest:
+    name: "Compatibility tests with latest Gradle versions"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
+        with:
+          java-version: 11
+          distribution: 'zulu'
+
+      - name: Fetch latest available Gradle versions
+        run: |
+          GRADLE_VERSIONS_TYPES_TO_FETCH="current release-candidate nightly release-nightly"
+          GRADLE_VERSIONS_OUTPUT_FILE=latest-gradle-versions.txt
+
+          for gv in $GRADLE_VERSIONS_TYPES_TO_FETCH; do
+            echo "Fetching latest Gradle version for '$gv'"
+            curl --silent --show-error "https://services.gradle.org/versions/$gv" | jq -r '.version | select( . != null )' >> latest-gradle-versions.txt
+          done
+
+          echo -e "\nGradle versions configured for compatibility tests (in $GRADLE_VERSIONS_OUTPUT_FILE):"
+          cat $GRADLE_VERSIONS_OUTPUT_FILE
+
+          echo "GRADLE_VERSIONS_OUTPUT_FILE=$GRADLE_VERSIONS_OUTPUT_FILE" >> $GITHUB_ENV
+
+      - name: Set latest Gradle versions to test with
+        run: |
+          cp "${{ env.GRADLE_VERSIONS_OUTPUT_FILE }}" .stutter/java11.lock
+          echo "Gradle versions configured for compatibility tests:"
+          cat .stutter/java11.lock
+
+      - name: Run compatTest
+        run: ./gradlew --continue test compatTest
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 75767422..7015e1e9 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -9,6 +9,7 @@ on:
   pull_request:
     branches:
       - '*'
+  merge_group:
 
 jobs:
   gradle: