Merge branch 'jc/blame-boundary'