Merge branch 'main' into ci/be-pre-test