#1234 some future
Merge branch '1234-bug-login' into dev