Merge "Reduce the health check timeout (2/n)"