KRACOEUS-7270: code review comments