[XC-87] Session Timeout occurs randomly - FIX