Merge branch 'hotfix/formatvalues'
Fix ticket#246
Merge branch 'hotfix/ticket#246'
Merge branch 'hotfix/ticket#246' into develop
Fix escaping
Merge branch 'hotfix/fixescaping' into develop