Make request timeouts modifiable
Merge remote-tracking branch 'remotes/chiiph/bug/modifiable_timeout' into develop