Closed #135: start_retries support