Resolve "Replace carry/overflow-using 32-bit operators by 64-bit version" Closes #1817 See merge request !1931