KRACOEUS-8598: rice upgrade
Merge pull request #1349 from leoherbie/KRACOEUS-8598

KRACOEUS-8598: rice upgrade
fixing non-destructive NPE
Merge pull request #1350 from jhulslander/KRACOEUS-8482-PDIP

fixing non-destructive NPE