merging in data.proto changes