Add enforce to check for integer overflow (backport #3514)

Add enforce to check for integer overflow (backport #3514) #2395