Merge branch 'main' into ci/be-test-against-accepted-release