Added patch for protobuf messages