KRACOUES-7597:more data override fixes