Merge branch 'mg/more-textconv'