[SR-Users] Timeout Handling (update)