SIGN IN SIGN UP

Issue #14245: Merge changes from 3.2.

M
Mark Dickinson committed
a9d9d17f8bde2529cff36096c6f548ebcf0d2ad3