KRACOEUS-7521: Rice upgrade
Merge pull request #520 from gathreya/riceUpgradeClean

KRACOEUS-7521: Rice upgrade