Merge "Some clean-up of divider code in preparation for bugfixes" into rvc-dev