Merge branch 'rs/blame-refactor'