Correcting bugs detected previously on grid and column
Merge
Merge