Task/feature 322 merged with develop

### Description
Merged <i>develop</i> into the feature/322 branch.
All changes were revised before they were merged into develop, so, no special care is needed for this PR - but at least, have a look at the list of commits.