SIGN IN SIGN UP

Issue #22854: Merge UnsupportedOperation fixes from 3.5

M
Martin Panter committed
047f3b737608c799764f5e7d083764f42c9a1b42