KRACOEUS-7251:Updated based on comments