SIGN IN SIGN UP

Issue #17128: Merge / update from 3.4

N
Ned Deily committed
a4158a0408d816d692ea288c27344274f00895c7