merge from lisp-utils - removed CI from it