chore: Merge branch 'main' into update-branch-for-main-into-experimental

Conflicts:
	.github/workflows/test.yml

Author: BenHenning

.github/workflows/test.yml

@@ -63,4 +63,4 @@ jobs:
       - name: Run tests
         run: |
           cd main
-          npm run test
+          npm run test:ci