Merge branch 'development' into feature/ModelValidator

* finished merge -conflicts resolved
* first cleanup