[DF-2446] [DF-2607] Review fix