Merge "Modify proto"