Cleanup/staggered

Merged Kilian Weishaupt requested to merge cleanup/staggered into feature/staggered-grid

Merge request reports