Fixed the messy layout when use rowspan.
Merge branch