Merge "Fix signed integer overflow"