Merge "Controls - Large ranges improperly calculated" into rvc-qpr-dev