Merge branch 'fk/blame' into next