recompose this grid

testing results for: sql
win2k12r2
Mic-Win-i32
sql/test/mapi21.610 
utf8test X X1.703 
70158 (Nov2019)