Whoops introduced an infinite recursion bug.
Merge branch 'resi-changes' into rea-changes