KRACOEUS-7521: Rice upgrade.

Most PRs out there will need to be rebased after these changes so please beware. db export will also need to be run.
it was't removed when I checked out the code. Strange.  I'm fixing that though in my PR for your branch