+ bugfixes after rebase to develop