Fix/grid includes

Merged Timo Koch requested to merge fix/grid-includes into master

Merge request reports