SIGN IN SIGN UP

Merge with 3.2 for issue #16262

R
Ross Lagerwall committed
646eb1e8566821bd0129ce1ef5d300168856010e