Sync with LDAP 1.21