line split adapted to new tgp
Merge branch 'master' into unit-tests