Code

Merge branch 'rs/optim-text-wrap' into maint-1.6.6