fixes build errors with clang

91 jobs for !8547 with fix-clang-build in 10 seconds (queued for 7 seconds)
latest merge request