SIGN IN SIGN UP

Issue #17654: merge from 3.4

N
Ned Deily committed
c318288f69e11c537baeca6799c212e8dd294b85