Merge branch 'jc/blame' into next