SIGN IN SIGN UP

Issue #21226: Merge from 3.4.

E
Eric Snow committed
12c5247be9f30052733d4cda26af5344292582ec