Cleanup/next

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

merge / rebase the following merge requests first:

Edited by Timo Koch

Merge request reports