Merge branch 'sr/blame-incomplete'