Merge branch 'wip-libc'