9 Commits (bugfix/timeout-logging)