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