Code

Merge branch 'rs/optim-text-wrap'