Upgrade ejc-connect.
Merge.