Feature/improve staggered

Merged Kilian Weishaupt requested to merge feature/improve-staggered into next

Merge request reports