remove empty grid rows before appending empty grid row.
Merge branch 'master' into develop