Fixes line breaks for release
Merge branch 'release/2' into develop