Merge remote-tracking branch 'upstream/master' into bitlocker_ldap
Merge remote-tracking branch 'upstream/master' into bitlocker_ldap
Remove max search