AW-1851 #comment readd automated line breaks