Cleanup/parameters

Merged Kilian Weishaupt requested to merge cleanup/parameters into master

Merge request reports