SIGN IN SIGN UP

Issue 21069: merge from 3.4

N
Ned Deily committed
d43bf79b5e62d0f5c60145e34876ff34ab6a6665