Better debugging on write timeouts.
Merge branch 'test' into dev