Task/merge feature 581 with develop

### Description
merged the feature 581 branch with develop.
8 conflicts and a number of compilation errors, but all unit and functional tests work.
I forgotted this...

Probably we should complete #585 as part of this sprint, before releasing 0.16.0 (to not having issues "haft done" between releases).