Don't use andalso here, it breaks LDAP when compiled under R12.
merge bug25573 into stable
merge stable into default