KRACOEUS-7575
KRACOEUS-7576
Merge pull request #676 from SravanVed/KRACOEUS-7576

KRACOEUS-7576
Merge pull request #673 from SravanVed/KRACOEUS-7575

KRACOEUS-7575