Use 'infinity' or really long timeouts instead of default 5 seconds
Merge branch 'gh267-gen_server-call-review' into develop