SUG-344 wrap long lines
Merge branch '4.8'