Add more options for controlling timeouts in replay
Fix timeouts