Merge branch 'jk/blame-fixes'