Merge branch 'rs/shortlog-cleanup' into maint