RED-36520 Fixed threading problems by queueing