Merge branch 'rs/commit-parsing-optim' into maint