Merge branch 'iu-ldap-cybergateway-group' into develop