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