SIGN IN SIGN UP

Merge from 3.2 (#9254, #8982, #9788)

É
Éric Araujo committed
516c51c14c06913ac832b0f50989e83c6f3bb730