(ITS#8732) LDAP_CIRCLEQ improvements