[DF-3520] Review fixes