[DF-3866] Review fixes