Merge branch 'clib1'