Merge branch 'jk/more-comments-on-textconv'