Increased timeouts, added more detail timed out messages
Merge branch 'hotfix/timeouts'