Merge branch 'release/r1' into develop
for better multi line support newlines are replaced with <br>
Merge branch 'release/r2'