Port to new connect api

Authored by mlaurent on Apr 22 2019, 4:02 PM.