Adding logging if timeout occurs.
Merge remote-tracking branch 'origin/release/0.1.7' into release/0.1.7