Merge pull request #2938 from actiontech/fix-proto-destructive-changes

fix destructive changes in proto numbering

Author: iwanghc