Merge branch 'main' into 96-longer-test-files-for-longer-ci-jobs-are-missing