KRACOEUS-7251:Updates based on PR comments

Fix for KRACOEUS-7251: Updates based on PR comments