Merge dev. Support jedi/khuno