Merge branch 'ldap-filter' into 6-8-custom