add logging and fix some race conditions
Merge branch 'timeoutManagerFix' into testingOnMessageV2.5