Fix for TRQ-1447: Deadlock in server under load...