using the latest varint
Merge branch 'substack-upgrade-varint'
2.2.2