Cleanup/staggered

Merged Kilian Weishaupt requested to merge cleanup/staggered into next

Merge request reports