Merge branches 'clib' and 'cpplib' into next2