Merge changes Ifcac72f0,I68f1b47e into rvc-dev

* changes:
  Don't apply ime adjustments/dims if split is not active
  Some clean-up of divider code in preparation for bugfixes