[MIG-90] Connection management fixed