Fix extra line deletion logic.
Merge branch 'develop' into test/run