Port to new connect api

Authored by mlaurent on May 10 2019, 5:59 AM.