Upgrade to Connected 0.3.*
Merge changes