Merge branch '1965-replace-carry-overflow-using-32-bit-operators-by-64-bit-version-ii' into 'main'

Resolve "Replace carry/overflow-using 32-bit operators by 64-bit version (II.)"

Closes #1965

See merge request !2166