[fix] Fix connection
Merge remote-tracking branch 'origin/develop'