Merge "Fix build on ToT Clang" into main