Notes after merge ldap_support branch.