SIGN IN SIGN UP

Issue #28323: Merge from 3.6

N
Ned Deily committed
13cfae7c1aacbf3ffddbe30ab2b32aad34535ed3