Add message subsystem to client.
Merge remote-tracking branch 'main/master'