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