[LDAP-9] Applying updated patch #resolve