Make pb connect timeout configurable
Merge branch 'feature/configurable-pb-connect-timeout' into develop