Port to new connect api

Authored by mlaurent on Nov 28 2017, 12:51 PM.