HCSVLAB-153: added word wrap
Merge branch 'HCSVLAB-153'