add test for grid_row_major
Merge remote-tracking branch 'origin/develop' into develop