Merge "Do not allow division by 0" into rvc-dev