Cleanup/minor changes

Merged Dennis Gläser requested to merge cleanup/minor-changes into next

Merge request reports