Merge branch 'bugfix/ldap-test-fix' into 'develop'