Merge branch 'es/blame-commit-info-fix' into maint