Port to new connect api

Authored by mlaurent on Dec 12 2017, 10:02 PM.