Merge "Rephrase to avoid integer overflow" into rvc-qpr-dev