Make ensure_server async
Merge remote-tracking branch 'chiiph-github/bug/ensure_server_async' into develop