Reset extra_row - Related to #3037
Merge branch 'michel_3037_next' into next