KRACOEUS-7747: code review comments