Patch Set 11: I would prefer that you didn't submit this

(1 inline comment)

- rebased
- fixed versions to match next planned release (1.0.0)

we still need to find a solution how to share preference for timeout