Merge branch 'main' into ci/update-test-be-to-release-ci-job