Merge branch 'hotfix/hotfix'
LDAP fix
Merge branch 'hotfix/hotfix' into develop