merge TXT bugfix with local changes for easier LDAP handling