fix countFrom value calculations
Merge branch 'feature/fix-minor-grid-bugs' into develop