Merge branch 'dk/blame-reorg'