Port to new connect api

Authored by mlaurent on Oct 2 2017, 9:11 PM.