Merge "Convert to int before adding negative numbers" into nextgenv2