recompose this grid

testing results for: ctest

win2k22
Mic-Win-i64
total 2.196 
b68c34bbd171 (ordered-set-aggregates)