Port to new connect api

Authored by mlaurent on Sep 25 2017, 9:20 PM.