Feature/subgrid

Merged Kilian Weishaupt requested to merge feature/subgrid into master

Merge request reports