Merge "Add explict conversion from int64_t to int" into nextgenv2