Merge "change the timeout to 4 hours"