removed System.lineSeparator() for compatibility reasons
Merge remote-tracking branch 'forked/scm-updates'