k3
Merge with clang
Complete merge