SIGN IN SIGN UP

Issue #21092: Merge from 3.4.

M
Mark Dickinson committed
cc8617b93a34f8dfcff9e686ee91d8fb1802bc2b