Forward port #15 (Shorten long lines) from 7.0

So the long lines are cut the same way in 7.0 and 8.0 (reduce conflicts)