recompose this grid

testing results for: sql
lab03
Int-Win-i32
sql/test/BugTracker-201099.584 
heap_combine_crash.SF-2947763 O X2.341 
huge_nr_of_columns.Bug-2609 X X7.459 
70158 (Nov2019)