Merge remote-tracking branch 'origin/main' into ci/selection-be-test