KRACOEUS-6955: code review comments