KRACOEUS-7251:Updates based on PR comments
Merge pull request #285 from SravanVed/KRACOEUS-7251

KRACOEUS-7251:Updates based on PR comments