Use client_message instead of client_result.

[merge]