Port to new connect api

Authored by mlaurent on Aug 8 2016, 6:00 PM.