Merge branch 'jc/maint-blame-minimal' into maint