1998: S8_LayoutCells() update
Merge branch 'v1.7errs' into v1.7