Clang fix.
Fixed CMake warnings.
Merge remote-tracking branch 'origin/next' into drive_split
Fixed target name after merge.