Merge "Fix MSVC warnings on conversion from int64 to int"