Port to new connect api

Authored by mlaurent on Oct 3 2017, 4:54 AM.