=rem #16428 optimize protobuf serializer for master

#16428 for master
getOrElse can be replaced by `match Some/None`