proto changes: comments and WithFields