SIGN IN SIGN UP

Issue #25221: merge from 3.5.

M
Mark Dickinson committed
82cb124300fe85bcd3108993158e3cbe0e2e623a