Merge branch 'bc/blame-doc-fix'