Merge branch 'ab/blame-textconv'