BUG-956 deadlock by rpc invocation - phase2