Merge remote-tracking branch 'origin/main' into basop-2332-clang18-asan-heap-buffer-overflow-in-lib_com-tools_fx-c-5450-25
