Merge branch 'bld/clang' into next