Changed the timeout default value from 5 to 30 seconds