Merge branch 'sr/blame-incomplete' into maint