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.