Fix row size

Merged Max Lyon requested to merge fix_row_size into master

Merge request reports