Adjusted timeouts
Merge origin/master