Merge remote-tracking branch 'origin/main' into ci/improve-basop-clang-format