fix client connection to server issue.
Merge remote-tracking branch 'origin/dev'