Merge branch 'rs/maint-tformat-foldline' into maint