SIGN IN SIGN UP

Issue #16698: merge from 3.2

N
Ned Deily committed
6d29628d6bb083f63b94efeba6103522681bc872