KRACOUES-7597:more data override fixes
Merge pull request #970 from jwillia/KRACOEUS_7597_6

KRACOUES-7597:more data override fixes