[DF-4779] Review