Use same int 64 type
Merge branch 'master' into builds
7.588