Merge branch 'bug/JAL-2277_html-output-wrapped-mode' into develop