Protobuf serialization of cluster messages. See #1910
Fixes according to comments. See #1910