Use int64 instead of uint64, which breaks the code.
Merge branch 'master' into feature-grade