Merge "Delay vold connectors until published, fix NPE." into nyc-dev