Merge branch 'jk/blame-fixes' into maint