Merge "Fix integer overflow abort" into rvc-dev