@unihorn Keep both working. Add warning if the user use `timeout` one. I think we have similar warning in the current codebase, just do the same thing. Thanks!