Optimize grids removing many push_back
Merge branch 'optimize-grid' into v2.0

After Max validation I feel I can merge on release branch