This PR raised a concern that startup time might not work under certain conditions. It probably means that the timeout should be increased a bit but would like to profile startup times to have a good number.