Merge branch 'jk/no-textconv-symlink' into maint