Merge branch 'develop' into fix/ldap-auth-issues