Attempt to fix the ldap stakeholder issue
Merge branch 'master' into production