Ice rtype split (temp)

Temporary PR until my latest commit can be cherry-picked to #2965.