Merge branch 'main' into ci/fix-generate-scripts-from-regressions