merge refactor/use-clib-package