SIGN IN SIGN UP

Merge from 3.2 (#10318, #12255, #12043, #12417 and other fixes)

É
Éric Araujo committed
2527796a22404d5b8cb0e498a965c6b4a743caac