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