SIGN IN SIGN UP

Issue #28480: Merge multithreading fixes from 3.6

M
Martin Panter committed
812f6e1f234f5a601202e81c78f7b172fe9a263a