Merge "Increased the timeout from 5 to 30 seconds"