Port to new connect api

Authored by mlaurent on Oct 27 2017, 9:57 PM.