Merge "It may be outside the range of type int. Change to uint64_t." into devel/master