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