Port to new connect api

Authored by mlaurent on Oct 30 2017, 8:00 AM.