Server improvement to support encrypted by clients messages.
Merge remote-tracking branch 'origin/master'