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