Port to new connect api

Authored by mlaurent on Apr 23 2019, 11:19 AM.