Merge branch 'main' into basop-2294-clang-18-encoder-clang18-warnings