Merge branch 'jk/pickaxe-textconv'