Port to new connect api

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