fix jedi backward incompatiblity
Merge develop into develop2 and fix conflicts