Merge "fix(clang): fix clang-tidy-18 errors" into integration