/subnet_cmds_messages.cc         -diff merge=ours
/subnet_cmds_messages.h          -diff merge=ours
