Merge branch 'rs/shortlog-cleanup'