KRACOEUS-8371: Fixing PR comments