Merge branch 'Login-AfterForm-LDAP' into dev