Merge "Extra protobuf-related support"