Serverd deadlock fix 3.6.x