Start to use new connect api for it too

Authored by mlaurent on Sep 19 2017, 5:56 AM.