KRACOEUS-7582: code review comments