SIGN IN SIGN UP

Issue #24808: Merge 3.5 into 3.6

M
Martin Panter committed
ccf426e7e77472b1ff1a919791aa3dd402836b83