Merge "Convert "var" to uint64_t" into nextgenv2