Merge branch 'main' into ci/improve-be-and-regression-checks