Wrap into block
Merge pull request #1133 from nlegoff/helpt-text

[3.8.6] Wrap into block