[DF-4056] Review comments fixed