Develop

Carsten Kemena-Rinkerequested to merge
develop into master

No functoinal changes of existing code, mostly cleaning up and adding test

Merge request reports