merge with jedi4ever master