Merge "[CS] Remove timeout event after first available"