sync with develop

impossible to review, but only conflicts in the unit tests modules were resolved, no other changes compared to `develop`