SIGN IN SIGN UP

Issue #21629: Merge from 3.4.

L
Larry Hastings committed
d9d7567eacd2e8340da0470fe74ce8dae2e00f9b