[DF-5030] review fixes