[SJS-107]: Fixed bugs related to timeout connection issues