KRACOEUS-7369: code review comments