Port to new connect api

Authored by mlaurent on Oct 5 2017, 6:09 AM.