Merge branch 'fix_row_size' into 'master'

Fix row size

See merge request !18
7 jobs for master in 6 minutes and 40 seconds