Merge branch 'connections_config' into v0.10