Merge branch 'main' into ci/fix-selection-be-ref-creation